CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-19 23:14:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rationalize CSS classes

Browse Source
This commit is contained in:
John Firebaugh
2013-05-26 14:06:53 -07:00
parent d943a92ec5
commit d6211b35b6
6 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+14 -11
View File
@@ -658,13 +658,16 @@ a:hover .icon.out-link { background-position: -500px -14px;}
right: 0;
left: 0;
bottom: 0;
top: 60px;
}
.pane:first-child .inspector-body {
.preset-list-pane .inspector-body {
top: 120px;
}
.entity-editor-pane .inspector-body {
top: 60px;
}
.inspector-inner {
padding: 20px;
position: relative;
@@ -812,7 +815,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
top: -3px;
}
.grid-pane .preset-search-icon {
.preset-list-pane .preset-search-icon {
display: block;
position: absolute;
left: 10px;
@@ -820,7 +823,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
pointer-events: none;
}
.grid-pane .preset-search-input {
.preset-list-pane .preset-search-input {
position: absolute;
top: 60px;
border-radius: 0;
@@ -882,12 +885,12 @@ a:hover .icon.out-link { background-position: -500px -14px;}
/* preset form basics */
.tag-wrap .preset-icon-wrap {
.entity-editor-pane .preset-icon-wrap {
border-bottom: 1px solid #CCC;
background-color: #F6F6F6;
}
.tag-wrap .preset-icon-wrap::after {
.entity-editor-pane .preset-icon-wrap::after {
content: "";
position: absolute;
height: 0;
@@ -901,7 +904,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
border-bottom-color: #CCC;
}
.tag-wrap .preset-icon-wrap > div {
.entity-editor-pane .preset-icon-wrap > div {
height: 60px;
width: 60px;
margin: auto;
@@ -964,7 +967,7 @@ a:hover .icon.out-link { background-position: -500px -14px;}
border-radius: 0 0 4px 0;
}
.tag-wrap .inspector-external-links {
.entity-editor-pane .inspector-external-links {
border-top: 1px solid #ccc;
}
@@ -1057,15 +1060,15 @@ button.preset-add-field:nth-last-child(8) ~ button.preset-add-field {
width: 12.5%;
}
.tag-wrap .tooltip.top .tooltip-arrow {
.entity-editor-pane .tooltip.top .tooltip-arrow {
border-top-color: #000;
}
.tag-wrap .tooltip.left .tooltip-arrow {
.entity-editor-pane .tooltip.left .tooltip-arrow {
border-left-color: #000;
}
.tag-wrap .tooltip-inner {
.entity-editor-pane .tooltip-inner {
background: #000;
color: #ccc;
}
js/id/ui/entity_editor.js
+1 -1
View File
@@ -49,7 +49,7 @@ iD.ui.EntityEditor = function(context) {
// Enter
$enter = $body.enter().append('div')
.attr('class', 'tag-wrap inspector-body fillL2');
.attr('class', 'inspector-body');
$enter.append('div')
.attr('class', 'preset-icon-wrap inspector-inner col12')
js/id/ui/inspector.js
+4 -4
View File
@@ -14,18 +14,18 @@ iD.ui.Inspector = function(context) {
.attr('class', 'panewrap');
$enter.append('div')
.attr('class', 'grid-pane pane');
.attr('class', 'preset-list-pane pane');
$enter.append('div')
.attr('class', 'tag-pane pane');
.attr('class', 'entity-editor-pane pane');
var $presetPane = $wrap.select('.grid-pane')
var $presetPane = $wrap.select('.preset-list-pane')
.call(presetList
.entityID(entityID)
.autofocus(newFeature)
.on('choose', setPreset));
var $editorPane = $wrap.select('.tag-pane')
var $editorPane = $wrap.select('.entity-editor-pane')
.call(entityEditor
.entityID(entityID)
.on('choose', showList));
js/id/ui/intro/navigation.js
+1 -1
View File
@@ -63,7 +63,7 @@ iD.ui.intro.navigation = function(context, reveal) {
context.on('enter.intro', null);
context.map().on('move.intro', null);
set(function() {
reveal('.tag-pane', 'intro.navigation.pane');
reveal('.entity-editor-pane', 'intro.navigation.pane');
context.on('exit.intro', event.done);
}, 700);
}
js/id/ui/intro/point.js
+2 -2
View File
@@ -70,7 +70,7 @@ iD.ui.intro.point = function(context, reveal) {
function closeEditor() {
d3.select('.preset-search-input').on('keydown.intro', null);
context.history().on('change.intro', null);
reveal('.tag-pane', 'intro.points.close');
reveal('.entity-editor-pane', 'intro.points.close');
}
function selectPoint() {
@@ -93,7 +93,7 @@ iD.ui.intro.point = function(context, reveal) {
context.on('enter.intro', null);
setTimeout(function() {
reveal('.tag-pane', 'intro.points.fixname');
reveal('.entity-editor-pane', 'intro.points.fixname');
context.on('exit.intro', deletePoint);
}, 500);
}
js/id/ui/preset_list.js
+1 -1
View File
@@ -90,7 +90,7 @@ iD.ui.PresetList = function(context) {
}
var listWrap = selection.append('div')
.attr('class', 'fillL2 inspector-body');
.attr('class', 'inspector-body');
var list = listWrap.append('div')
.attr('class', 'preset-list fillL cf')