From 0246f2c5dd759b5d8a83fa989ee7885ac7288129 Mon Sep 17 00:00:00 2001 From: saman bb Date: Fri, 18 Jan 2013 01:17:08 -0500 Subject: [PATCH] style / layout refactoring --- css/app.css | 179 +++--- img/source/sprite.svg | 1155 +++++++++++++------------------------ img/sprite.png | Bin 15999 -> 12910 bytes js/id/id.js | 3 +- js/id/ui/inspector.js | 2 +- js/id/ui/layerswitcher.js | 6 +- 6 files changed, 484 insertions(+), 861 deletions(-) diff --git a/css/app.css b/css/app.css index 53eec9933..8b46887f5 100644 --- a/css/app.css +++ b/css/app.css @@ -18,7 +18,7 @@ body { } .limiter { - max-width: 1400px; + max-width: 1200px; } div, textarea, input, span, ul, li, ol, a, button { @@ -164,24 +164,15 @@ ul li { list-style: none;} ul.toggle-list li a { font-weight: bold; padding: 10px; - border-top: 1px solid #CCC; + border-top: 1px solid white; display:block; } -ul.toggle-list li a:hover { - background: #ececec; -} - ul.toggle-list .icon { float: left; margin-right: 5px; } -a.selected { - color:#222; -} - - ul.link-list li { float: left; display: inline-block; @@ -199,11 +190,10 @@ ul.link-list li:first-child { /* Utility Classes ------------------------------------------------------- */ -.fillL { background-color: white;} +.fillL { background: white;} .fillL2 { background: #f7f7f7 url(../img/background-pattern-1.png) repeat;} .fillD { - background-color: #222222; - background-color: rgba(0,0,0,.8); + background: rgba(0,0,0,.7); color: white; } @@ -216,9 +206,8 @@ form.hide { } .content { - background-color:#fff; + background:#fff; border-radius: 4px; - border: 1px solid #ccc; } .pad1 {padding: 10px;} @@ -230,8 +219,7 @@ form.hide { button { line-height:20px; - border:1px solid #aaa; - box-shadow: inset 0 0 0px 1px #fff; + border:0; color:#222; background: white; font-weight:bold; @@ -242,17 +230,20 @@ button { } button:hover { - background-color: #ececec; + background: #ececec; +} + +button.col3:hover { + background: #bde5aa; } button.active { - box-shadow: inset 0 0 0px 1px #fff, inset 0 0 6px 1px rgba(0,0,0,.35); cursor:url(../img/cursor-pointing.png) 6 1, auto; } button.active:not([disabled]) { - background-color: #ececec; - box-shadow: inset 0 0 0px 1px #fff, inset 0 0 6px 1px rgba(0,0,0,.25); + background: #6bc641; + color: white; } button.wide, @@ -282,14 +273,15 @@ button.centered { .button-wrap { display: inline-block; - padding:10px 0 10px 10px; + padding-right:10px; margin: 0; } .button-wrap button:only-child { width: 100%;} +.button-wrap:last-child { padding-right: 0; } .joined button { - border-right-width: 0; + border-right: 1px solid rgba(0,0,0,.5); border-radius:0; } @@ -298,15 +290,16 @@ button.centered { } .joined button:last-child { - border-right-width: 1px; + border-right-width: 0px; border-radius:0 4px 4px 0; } button.action { - background: #444; + color: white; + background: #7092ff; } button.action:hover { - background: #222; + background: #597BE7; } button.delete { @@ -328,15 +321,9 @@ button.save .count { } button.save.has-count .count { - display: block; - color: #444; - background: #fff; - border-radius: 0 3px 3px 0; - padding: 9px; - float: right; - margin-left: 10px; - margin-top: -9px; - margin-right: -8px; + display: inline-block; + color: rgba(255,255,255,.5); + padding-left: 5px; } button.close { @@ -346,22 +333,22 @@ button.close { } button .label { - margin-right: 3px; + display: none; } -button.action .label { +button.save .label { + display: inline-block; color: white; - text-shadow: 0 -1px 0 rgba(0,0,0,.25); } button[disabled] { cursor:auto; - background: white; + background: #cecece; pointer-events:none; } button[disabled] .label { - color:#ccc; + color:#999999; text-shadow: none; } @@ -386,18 +373,13 @@ button[disabled]:hover { height: 40px; } -.icon.icon-pre-text { - margin-right: 3px; -} - /* Definitions for every icon */ - -.icon.browse { background-position: 0px 0px;} -.icon.add-point { background-position: -20px 0px;} -.icon.add-line { background-position: -40px 0px;} -.icon.add-area { background-position: -60px 0px;} -.icon.undo { background-position: -80px 0px;} -.icon.redo { background-position: -100px 0px;} +button.active:not([disabled]) .icon.browse { background-position: 0px -20px;} +button.active:not([disabled]) .icon.add-point { background-position: -20px -20px;} +button.active:not([disabled]) .icon.add-line { background-position: -40px -20px;} +button.active:not([disabled]) .icon.add-area { background-position: -60px -20px;} +button.active:not([disabled]) .icon.undo { background-position: -80px -20px;} +button.active:not([disabled]) .icon.redo { background-position: -100px -20px;} .icon.apply { background-position: -120px 0px;} .icon.save { background-position: -140px 0px;} .icon.close { background-position: -160px 0px;} @@ -411,10 +393,13 @@ button[disabled]:hover { .icon.avatar { background-position: -320px 0px;} .icon.nearby { background-position: -340px 0px;} -.fillD .icon.browse { background-position: 0px -20px;} -.fillD .icon.add-point { background-position: -20px -20px;} -.fillD .icon.add-line { background-position: -40px -20px;} -.fillD .icon.add-area { background-position: -60px -20px;} +.icon.browse { background-position: 0px 0px;} +.icon.add-point { background-position: -20px 0px;} +.icon.add-line { background-position: -40px 0px;} +.icon.add-area { background-position: -60px 0px;} +.icon.undo { background-position: -80px 0px;} +.icon.redo { background-position: -100px 0px;} + .fillD .icon.undo { background-position: -80px -20px;} .fillD .icon.redo { background-position: -100px -20px;} .fillD .icon.apply { background-position: -120px -20px;} @@ -422,11 +407,11 @@ button[disabled]:hover { .fillD .icon.close { background-position: -160px -20px;} .fillD .icon.delete { background-position: -180px -20px;} .fillD .icon.remove { background-position: -200px -20px;} -.fillD .icon.inspect { background-position: -220px -20px;} -.fillD .icon.zoom-in { background-position: -240px -20px;} -.fillD .icon.zoom-out { background-position: -260px -20px;} -.fillD .icon.geocode { background-position: -280px -20px;} -.fillD .icon.layers { background-position: -300px -20px;} +.map-control .icon.inspect { background-position: -220px -20px;} +.map-control .icon.zoom-in { background-position: -240px -20px;} +.map-control .icon.zoom-out { background-position: -260px -20px;} +.map-control .icon.geocode { background-position: -280px -20px;} +.map-control .icon.layers { background-position: -300px -20px;} .fillD .icon.avatar { background-position: -320px -20px;} .fillD .icon.nearby { background-position: -340px -20px;} @@ -465,12 +450,12 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} ------------------------------------------------------- */ #bar { - border-bottom:1px solid #ccc; position:absolute; left:0px; top:0px; right:0; height:60px; + background: rgba(0,0,0,.8); } /* Status box */ @@ -485,12 +470,10 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} opacity:0; display:none; padding-left: 10px; - max-width: 600px; + max-width: 500px; } .inspector { - border-left: 1px solid #ccc; - border-bottom: 1px solid #ccc; min-height: 60px; position: relative; } @@ -500,7 +483,6 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} } .inspector-inner.head { - border-bottom: 1px solid #ccc; background:#fff; z-index:1; position:relative; @@ -580,13 +562,14 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} right: 30px; } -.inspector-buttons { - border-top: 1px solid #ccc; -} - .inspector-buttons .button-wrap { width: 20%; } +.inspector-buttons .button-wrap:first-child { padding-right: 5px;} + +.inspector-buttons .button-wrap:last-child { + padding-left: 5px; +} .inspector-inner .add-tag-row { width: 100%; @@ -604,12 +587,22 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} /* Map Controls */ .map-control { - left:10px; + left:0px; position:absolute; } .map-control button { width: 40px; + border-radius: 0 4px 4px 0; + background: rgba(0, 0, 0, .8); +} + +.map-control button:hover { + background: rgba(0, 0, 0, .9); +} + +.map-control button.active:hover { + background: #6bc641; } .map-overlay { @@ -618,6 +611,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} left:50px; top:0; display: block; + border-radius: 4px; } /* Zoomer */ @@ -628,12 +622,13 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} } .zoombuttons button.zoom-in { - border-radius:4px 4px 0 0; + border-radius:0 4px 0 0; + border-bottom: 1px solid rgba(0, 0, 0, .5); } .zoombuttons button.zoom-out { border-top:0; - border-radius:0 0 4px 4px; + border-radius:0 0 4px 0; } /* Layer Switcher */ @@ -642,28 +637,24 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} top:210px; } -.layerswitcher-control .adjustments { - padding:5px; - opacity:0.2; -} - -.layerswitcher-control .adjustments:hover { - opacity:1; -} - -.layerswitcher-control .adjustments .reset { +.layerswitcher-control .adjustments button { + opacity:0.5; height:20px; font-size:10px; font-weight:normal; - padding:0 5px; + padding:0 5px 3px 5px; + background: white; + border: 1px solid #ddd; + border-radius: 0; +} + +.layerswitcher-control .adjustments button:hover { + opacity: 1; } .layerswitcher-control .nudge { - height:20px; width:20px; - font-size:10px; margin-right:2px; - font-weight:normal; } .opacity-options-wrapper { @@ -735,7 +726,7 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;} display:block; position:absolute; overflow:hidden; - top:60px; + top:0px; left:0; right:0; bottom:0; @@ -860,9 +851,6 @@ div.typeahead a:first-child { text-align: center; } -.modal button { margin-bottom: 0;} -.modal button:first-child { margin-left: 0;} - .modal button.close-modal { float:right; margin-right:10px; @@ -912,11 +900,14 @@ div.typeahead a:first-child { } .modal-section { - padding: 20px; - border-bottom: 1px solid #ccc; + padding: 10px; } -.modal-section:last-child { border-bottom: 0;} + +.body .modal-section:last-child { + border-bottom: 0; + border-radius: 0 0 4px 4px; +} .modal-section img.wiki-image { max-width: 400px; diff --git a/img/source/sprite.svg b/img/source/sprite.svg index f239c672f..c3fdcf407 100644 --- a/img/source/sprite.svg +++ b/img/source/sprite.svg @@ -13,7 +13,7 @@ height="200" id="svg12393" version="1.1" - inkscape:version="0.48.2 r9819" + inkscape:version="0.48.1 r9760" sodipodi:docname="sprite.svg" inkscape:export-filename="/Users/saman/work_repos/iD/img/sprite.png" inkscape:export-xdpi="90" @@ -39,8 +39,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="150.66428" - inkscape:cy="90.493266" + inkscape:cx="54.93799" + inkscape:cy="205.49862" inkscape:document-units="px" inkscape:current-layer="layer12" showgrid="false" @@ -165,7 +165,7 @@ image/svg+xml - + @@ -175,110 +175,6 @@ id="layer1" transform="translate(-25,-62.362183)" style="display:inline"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:1" /> @@ -935,26 +464,6 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1260,30 +548,12 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/sprite.png b/img/sprite.png index 2f933d9f8a00da49db90ff2fb02c237dac4d9d75..8a536fa47d550a09c705367d8441a5eb2ba1ea2f 100644 GIT binary patch literal 12910 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 Teg1&|8v;C5)q+*4SV#U3d7R4z literal 15999 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 S$pE?#g4C3>kmZP{A^#6j{Kzx_ diff --git a/js/id/id.js b/js/id/id.js index 2edc7fd23..b1beb425f 100644 --- a/js/id/id.js +++ b/js/id/id.js @@ -22,7 +22,8 @@ window.iD = function(container) { .call(map); var bar = container.append('div') - .attr('id', 'bar').attr('class', 'fillL2'); + .attr('id', 'bar') + .attr('class','pad1'); var limiter = bar.append('div') .attr('class', 'limiter'); diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js index b1d26a53b..1724e8ed4 100644 --- a/js/id/ui/inspector.js +++ b/js/id/ui/inspector.js @@ -47,7 +47,7 @@ iD.ui.inspector = function() { drawTags(entity.tags); inspectorbody.append('div') - .attr('class', 'inspector-buttons') + .attr('class', 'inspector-buttons pad1') .call(drawButtons); } diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js index a2acad1b5..4556fbe19 100644 --- a/js/id/ui/layerswitcher.js +++ b/js/id/ui/layerswitcher.js @@ -56,7 +56,7 @@ iD.ui.layerswitcher = function(map) { var opa = content .append('div') - .attr('class', 'opacity-options-wrapper fillL2'); + .attr('class', 'opacity-options-wrapper'); opa.append('h4').text('Layers'); @@ -102,7 +102,7 @@ iD.ui.layerswitcher = function(map) { content .append('ul') - .attr('class', 'toggle-list') + .attr('class', 'toggle-list fillL2') .selectAll('a.layer') .data(sources) .enter() @@ -135,7 +135,7 @@ iD.ui.layerswitcher = function(map) { var adjustments = content .append('div') - .attr('class', 'adjustments'); + .attr('class', 'adjustments pad1'); var directions = [ ['←', [-1, 0]],