basic styling of layer switcher done.

This commit is contained in:
Saman Bemel-Benrud
2012-12-10 16:45:43 -05:00
parent c9f5cf736c
commit 5e19661ced
5 changed files with 408 additions and 178 deletions

View File

@@ -2,7 +2,7 @@
------------------------------------------------------- */
body {
font:normal 14px/20px 'Helvetica Neue', Arial, sans-serif;
font:normal 12px/20px 'Helvetica Neue', Arial, sans-serif;
margin:0;
padding:0;
color:#222;
@@ -36,6 +36,10 @@ p {
padding:0;
}
em {
font-style: italic;
}
a:visited, a {
color: #b0b0b0;
}
@@ -75,10 +79,16 @@ ul.toggle-list li a:hover {
background: #ececec;
}
ul.toggle-list .icon {
float: left;
margin-right: 5px;
}
a.selected {
color:#222;
}
/* Utility Classes
------------------------------------------------------- */
@@ -241,6 +251,7 @@ button.action .label {
.save.icon { background-position: -140px 0px;}
.close.icon { background-position: -160px 0px;}
.delete.icon { background-position: -180px 0px;}
.toggle.icon { background-position: 0px -180px;}
.active .icon.browse { background-position: 0px -20px;}
.active .icon.add-place { background-position: -20px -20px;}
@@ -253,6 +264,10 @@ button.action .label {
.active .close.icon { background-position: -160px -20px;}
.active .delete.icon { background-position: -180px -20px;}
a:hover .toggle.icon { background-position: -20px -180px;}
.selected .toggle.icon,
a.selected:hover .toggle.icon { background-position: -40px -180px;}
button[disabled] .icon.browse { background-position: 0px -40px;}
button[disabled] .icon.add-place { background-position: -20px -40px;}
@@ -295,6 +310,8 @@ button.Browse .label {
position:absolute;
right: 0;
left: 530px;
border-left: 1px solid #ccc;
border-bottom: 1px solid #ccc;
min-height: 60px;
opacity:0;
display:none;
@@ -403,16 +420,26 @@ button.Browse .label {
}
.opacity-options {
border:1px solid #000;
height:15px;
width:100px;
border:1px solid #b0b0b0;
background: url(../img/background-pattern-opacity.png) 0 0 repeat;
height:20px;
width:62px;
right: 10px;
top: 10px;
float: right;
}
.opacity-options li {
height: 100%;
display: block;
float: left;
}
.layerswitcher-control a.opacity {
background:#000;
background:#4672ff;
display:inline-block;
width:15px;
height:15px;
width:20px;
height:18px;
}
/* Geocoder */
@@ -560,53 +587,93 @@ div.typeahead a {
/* Tooltips
------------------------------------------------------- */
#bar button .tooltip {
white-space: normal;
}
.tooltip {
white-space: normal;
position: absolute;
z-index: 1030;
padding: 5px;
font-size: 11px;
opacity: 0;
display: none;
display: block;
filter: alpha(opacity=0);
visibility: visible;
}
.tooltip.in {
display: block;
opacity: 0.8;
filter: alpha(opacity=80);
}
.tooltip.top {
margin-top: -5px;
}
.tooltip.right {
margin-left: 5px;
}
.tooltip.bottom {
margin-top: 5px;
}
.tooltip.left {
margin-left: -5px;
}
.tooltip-inner {
max-width: 200px;
padding: 3px 8px;
min-width: 100px;
font-size: 11px;
font-weight: bold;
line-height: 20px;
padding: 5px 10px;
color: #ffffff;
text-align: center;
text-decoration: none;
background-color: #000000;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.tooltip-arrow {
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
position: absolute;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
.tooltip.top .tooltip-arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
border-top-color: #000000;
border-width: 5px 5px 0;
}
.tooltip.right .tooltip-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-right-color: #000000;
border-width: 5px 5px 5px 0;
}
.tooltip.left .tooltip-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-left-color: #000000;
border-width: 5px 0 5px 5px;
}
.tooltip.bottom .tooltip-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-bottom-color: #000000;
border-width: 0 5px 5px;
top: 0;
left: 50%;
margin-left: -5px;
border-bottom-color: #000000;
border-width: 0 5px 5px;
}
/* Mobile Tweaks

View File

@@ -329,19 +329,19 @@
borderopacity="1.0"
inkscape:pageopacity="1"
inkscape:pageshadow="2"
inkscape:zoom="8"
inkscape:cx="-55.068441"
inkscape:cy="832.46552"
inkscape:zoom="1"
inkscape:cx="315.10272"
inkscape:cy="734.82658"
inkscape:document-units="px"
inkscape:current-layer="layer1"
inkscape:current-layer="layer11"
showgrid="false"
inkscape:window-width="1660"
inkscape:window-height="971"
inkscape:window-x="238"
inkscape:window-y="15"
inkscape:window-x="981"
inkscape:window-y="59"
inkscape:window-maximized="0"
inkscape:snap-bbox="true"
inkscape:snap-nodes="true"
inkscape:snap-nodes="false"
showguides="false"
inkscape:guide-bbox="true"
inkscape:object-paths="true"
@@ -544,7 +544,7 @@
<rect
ry="4"
rx="3.9999998"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#b0b0b0;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaaa;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect9199"
width="104"
height="39"
@@ -2282,10 +2282,10 @@
inkscape:groupmode="layer"
id="layer8"
inkscape:label="layer-switcher"
style="display:inline">
style="display:none">
<rect
y="220.50002"
x="10.500001"
x="70.5"
height="278.99997"
width="149"
id="rect5303"
@@ -2302,7 +2302,7 @@
id="rect7661"
width="149"
height="278.99997"
x="10.500001"
x="70.5"
y="220.50002"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2310,10 +2310,10 @@
<g
style="display:inline"
id="g5301"
transform="matrix(3.8187791,0,0,4.7029385,-2129.8919,348.44168)" />
transform="matrix(3.8187791,0,0,4.7029385,-2069.8919,348.44168)" />
<path
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999988;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 10.5,260.5 0,58.75625 0,44.625 0,15.61875 149,0 0,-15.61875 0,-44.625 0,-58.75625 z"
d="m 70.5,260.5 0,58.75625 0,44.625 0,15.61875 149,0 0,-15.61875 0,-44.625 0,-58.75625 z"
id="rect6307"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc"
@@ -2324,25 +2324,25 @@
sodipodi:linespacing="167%"
id="text5392"
y="245"
x="20"
x="80"
style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Italic"
xml:space="preserve"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="245"
x="20"
x="80"
id="tspan5394"
sodipodi:role="line">Baselayers</tspan></text>
<g
transform="matrix(3.8187791,0,0,3.6908716,-2129.8919,360.5546)"
transform="matrix(3.8187791,0,0,3.6908716,-2069.8919,360.5546)"
id="g6305"
style="fill:#f7f7f7;fill-opacity:1;display:inline" />
<path
sodipodi:nodetypes="ccccccccc"
inkscape:connector-curvature="0"
id="path7360"
d="m 10.5,420.5 0,-0.5 0,116 4,3.5 141,0 4,-4.5 0,-115 0,0.5 z"
d="m 70.5,420.5 0,-0.5 0,116 4,3.5 141,0 4,-4.5 0,-115 0,0.5 z"
style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999988;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2354,7 +2354,7 @@
id="rect7142"
width="149"
height="318.99997"
x="10.500001"
x="70.5"
y="220.5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2362,7 +2362,7 @@
<path
inkscape:connector-curvature="0"
id="path7144"
d="m 11,260 0,1 149,0 0,-1 -149,0 z"
d="m 71,260 0,1 149,0 0,-1 -149,0 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2371,19 +2371,19 @@
sodipodi:linespacing="167%"
id="text6292"
y="323"
x="50"
x="110"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
xml:space="preserve"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="323"
x="50"
x="110"
id="tspan6294"
sodipodi:role="line">OpenStreetMap</tspan></text>
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="m 12,300 0,1 146,0 0,-1 -146,0 z"
d="m 72,300 0,1 146,0 0,-1 -146,0 z"
id="path7225"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2392,7 +2392,7 @@
<path
inkscape:connector-curvature="0"
id="path7227"
d="m 11,380 0,1 148,0 0,-1 -148,0 z"
d="m 71,380 0,1 148,0 0,-1 -148,0 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2400,7 +2400,7 @@
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
x="50"
x="110"
y="283"
id="text6288"
sodipodi:linespacing="167%"
@@ -2409,27 +2409,15 @@
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan6290"
x="50"
x="110"
y="283">Bing Satellite</tspan></text>
<rect
style="color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:#222222;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7320"
width="19"
height="19"
x="20.5"
y="270.5"
rx="9.5"
ry="9.5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<g
id="g7330"
transform="translate(0,-20)" />
transform="translate(60,-20)" />
<text
xml:space="preserve"
style="font-size:12px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Italic"
x="20"
x="80"
y="405"
id="text7352"
sodipodi:linespacing="167%"
@@ -2438,11 +2426,11 @@
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan7354"
x="20"
x="80"
y="405">Overlays</tspan></text>
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="m 11,420 0,1 149,0 0,-1 -149,0 z"
d="m 71,420 0,1 149,0 0,-1 -149,0 z"
id="path7356"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2451,7 +2439,7 @@
<path
inkscape:connector-curvature="0"
id="path7366"
d="m 13,460 0,1 145,0 0,-1 -145,0 z"
d="m 73,460 0,1 145,0 0,-1 -145,0 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2460,33 +2448,21 @@
sodipodi:linespacing="167%"
id="text7372"
y="483"
x="50"
x="110"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
xml:space="preserve"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="483"
x="50"
x="110"
id="tspan7374"
sodipodi:role="line">TIGER roads</tspan></text>
<rect
style="color:#000000;fill:#f7f7f7;fill-opacity:1;stroke:#b0b0b0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7407"
width="19"
height="19"
x="20.5"
y="310.5"
rx="9.5"
ry="9.5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
ry="3.9999995"
rx="4"
y="470.5"
x="20.5"
x="80.5"
height="19"
width="19"
id="rect7425"
@@ -2498,47 +2474,35 @@
sodipodi:linespacing="167%"
id="text7368"
y="443"
x="50"
x="110"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
xml:space="preserve"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><tspan
y="443"
x="50"
x="110"
id="tspan7370"
sodipodi:role="line">Standard</tspan></text>
<rect
ry="3.9999995"
rx="4"
y="430.5"
x="20.5"
x="80.5"
height="19"
width="19"
id="rect7409"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#222222;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
ry="9.5"
rx="9.5"
y="271"
x="21"
height="18"
width="18"
id="rect7439"
style="color:#000000;fill:#e2e9ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#7092ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="color:#000000;fill:#e2e9ff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7486"
width="16"
height="16"
x="22"
y="432"
width="14"
height="14"
x="83"
y="433"
rx="3"
ry="3"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2546,7 +2510,7 @@
inkscape:export-ydpi="90" />
<path
style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 25,439 -1,1 0,1 4,4 1,0 1,-1 0,-1 -4,-4 z"
d="m 85,439 -1,1 0,1 4,4 1,0 1,-1 0,-1 -4,-4 z"
id="path4961-2-6"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc"
@@ -2557,38 +2521,92 @@
sodipodi:nodetypes="ccccccccc"
inkscape:connector-curvature="0"
id="path7538"
d="m 35,436 1,1 0,1 -7,7 -1,0 -1,-1 0,-1 7,-7 z"
d="m 95,436 1,1 0,1 -7,7 -1,0 -1,-1 0,-1 7,-7 z"
style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7542"
width="13"
height="13"
x="23.5"
y="313.5"
rx="9.5"
ry="9.5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
style="color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7681"
width="10"
height="10"
x="25"
y="275"
rx="9.5"
ry="9.5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<g
id="g32533">
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="9.5"
rx="9.5"
y="311.5"
x="81.5"
height="17"
width="17"
id="rect7407"
style="color:#000000;fill:#f7f7f7;fill-opacity:1;stroke:#b0b0b0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="9.5"
rx="9.5"
y="314.5"
x="84.5"
height="11"
width="11"
id="rect7542"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<g
id="g32491">
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="9.5"
rx="9.5"
y="271.5"
x="81.5"
height="17"
width="17"
id="rect7320"
style="color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:#7092ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7439"
width="16"
height="16"
x="82"
y="272"
rx="9.5"
ry="9.5" />
<rect
style="color:#000000;fill:#e2e9ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect32489"
width="12"
height="12"
x="84"
y="274"
rx="7.0000005"
ry="7.0000005"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="5"
rx="5"
y="276"
x="86"
height="8"
width="8"
id="rect7681"
style="color:#000000;fill:#7092ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<g
id="g7952"
transform="translate(0,140)"
transform="translate(60,140)"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
@@ -2611,7 +2629,7 @@
<path
inkscape:connector-curvature="0"
id="path8024"
d="m 12,340 0,1 146,0 0,-1 -146,0 z"
d="m 72,340 0,1 146,0 0,-1 -146,0 z"
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
@@ -2619,7 +2637,7 @@
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
x="50"
x="110"
y="363"
id="text8026"
sodipodi:linespacing="167%"
@@ -2628,13 +2646,13 @@
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan8028"
x="50"
x="110"
y="363">Cycle Map</tspan></text>
<rect
ry="9.5"
rx="9.5"
y="350.5"
x="20.5"
x="80.5"
height="19"
width="19"
id="rect8030"
@@ -2646,7 +2664,7 @@
ry="9.5"
rx="9.5"
y="353.5"
x="23.5"
x="83.5"
height="13"
width="13"
id="rect8032"
@@ -2657,7 +2675,7 @@
<text
xml:space="preserve"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:166.99999571%;letter-spacing:0px;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#b0b0b0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
x="50"
x="110"
y="523"
id="text8329"
sodipodi:linespacing="167%"
@@ -2666,14 +2684,14 @@
inkscape:export-ydpi="90"><tspan
sodipodi:role="line"
id="tspan8331"
x="50"
x="110"
y="523">GPS Tracks</tspan></text>
<rect
style="color:#000000;fill:none;stroke:#b0b0b0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect8333"
width="19"
height="19"
x="20.5"
x="80.5"
y="510.5"
rx="4"
ry="3.9999995"
@@ -2682,7 +2700,7 @@
inkscape:export-ydpi="90" />
<path
style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#cccccc;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8013-4);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
d="m 13,500 0,1 145,0 0,-1 -145,0 z"
d="m 73,500 0,1 145,0 0,-1 -145,0 z"
id="path8337"
inkscape:connector-curvature="0"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
@@ -2693,7 +2711,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
id="g8339"
transform="translate(0,-20)">
transform="translate(60,-20)">
<rect
y="250.5"
x="130.5"
@@ -2715,7 +2733,7 @@
inkscape:groupmode="layer"
id="layer11"
inkscape:label="layer-switcher-simple"
style="display:none">
style="display:inline">
<g
style="display:inline"
id="g9148"

Before

Width:  |  Height:  |  Size: 273 KiB

After

Width:  |  Height:  |  Size: 273 KiB

View File

@@ -10,7 +10,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="220"
height="160"
height="200"
id="svg12393"
version="1.1"
inkscape:version="0.48.2 r9819"
@@ -27,23 +27,25 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6568542"
inkscape:cx="147.84941"
inkscape:cy="137.77091"
inkscape:zoom="1"
inkscape:cx="45.744362"
inkscape:cy="88.952248"
inkscape:document-units="px"
inkscape:current-layer="layer12"
showgrid="false"
inkscape:window-width="1612"
inkscape:window-height="795"
inkscape:window-x="76"
inkscape:window-y="123"
inkscape:window-x="281"
inkscape:window-y="6"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
showguides="true"
inkscape:guide-bbox="true">
showguides="false"
inkscape:guide-bbox="true"
inkscape:snap-bbox="true"
inkscape:snap-nodes="false">
<inkscape:grid
type="xygrid"
id="grid12420"
@@ -53,72 +55,76 @@
snapvisiblegridlinesonly="true" />
<sodipodi:guide
orientation="1,0"
position="0,160"
position="0,200"
id="guide12508" />
<sodipodi:guide
orientation="1,0"
position="20,160"
position="20,200"
id="guide12512" />
<sodipodi:guide
orientation="1,0"
position="40,160"
position="40,200"
id="guide12514" />
<sodipodi:guide
orientation="1,0"
position="60,160"
position="60,200"
id="guide12516" />
<sodipodi:guide
orientation="1,0"
position="80,160"
position="80,200"
id="guide12518" />
<sodipodi:guide
orientation="0,1"
position="0,140"
position="0,180"
id="guide12520" />
<sodipodi:guide
orientation="1,0"
position="100,160"
position="100,200"
id="guide12522" />
<sodipodi:guide
orientation="1,0"
position="120,160"
position="120,200"
id="guide12590" />
<sodipodi:guide
orientation="1,0"
position="140,160"
position="140,200"
id="guide12592" />
<sodipodi:guide
orientation="1,0"
position="160,160"
position="160,200"
id="guide12647" />
<sodipodi:guide
orientation="1,0"
position="180,160"
position="180,200"
id="guide12649" />
<sodipodi:guide
orientation="1,0"
position="200,160"
position="200,200"
id="guide12672" />
<sodipodi:guide
orientation="1,0"
position="220,160"
position="220,200"
id="guide14109" />
<sodipodi:guide
orientation="0,1"
position="195,120"
position="195,160"
id="guide14199" />
<sodipodi:guide
orientation="0,1"
position="15,160"
position="15,200"
id="guide14589" />
<sodipodi:guide
orientation="0,1"
position="145,100"
position="145,140"
id="guide15519" />
<sodipodi:guide
orientation="0,1"
position="90,80"
position="90,120"
id="guide15521" />
<sodipodi:guide
orientation="0,1"
position="15,20"
id="guide32247" />
</sodipodi:namedview>
<metadata
id="metadata12398">
@@ -141,19 +147,18 @@
<rect
style="color:#000000;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect16629"
width="250"
height="165"
x="-15"
y="-10"
transform="translate(25,62.362183)"
rx="3.9999998"
ry="4" />
width="220"
height="200"
x="25"
y="62.362183"
rx="0"
ry="0" />
</g>
<g
inkscape:groupmode="layer"
id="layer12"
inkscape:label="sprite"
transform="translate(-25,1.1484375e-6)">
transform="translate(-25,1.53125e-6)">
<path
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
@@ -828,5 +833,140 @@
d="m 210,2.999999 -1,1 0,1 1,1 9,0 1,-1 0,-1 -1,-1 z m 0,4 0,9 1,1 7,0 1,-1 0,-9 z m 2,2 1,0 0,6 -1,0 0,-1 z m 2,0 1,0 0,5 0,1 -1,0 z m 2,0 1,0 0,5 0,1 -1,0 z"
id="path22366"
sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
<g
transform="translate(-55,-130)"
style="display:inline"
id="g32533">
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="9.5"
rx="9.5"
y="312.5"
x="82.5"
height="15.000003"
width="15.000003"
id="rect7407"
style="color:#000000;fill:#f7f7f7;fill-opacity:1;stroke:#b0b0b0;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="9.5"
rx="9.5"
y="315.5"
x="85.5"
height="9.0000029"
width="9.0000029"
id="rect7542"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<g
transform="translate(-35,-90.000001)"
style="display:inline"
id="g32491">
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="9.5"
rx="9.5"
y="272.5"
x="82.5"
height="15"
width="15"
id="rect7320-0"
style="color:#000000;fill:#aaaaaa;fill-opacity:1;fill-rule:nonzero;stroke:#aaaaaa;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
style="color:#000000;fill:#f7f7f7;fill-opacity:1;stroke:none;stroke-width:0.99999987999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect7439-7"
width="14"
height="14"
x="83"
y="273"
rx="9.5"
ry="9.5" />
<rect
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999987999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect32489"
width="10.000001"
height="10.000001"
x="85"
y="275"
rx="7.0000005"
ry="7.0000005"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="5"
rx="5"
y="276"
x="86"
height="8"
width="8"
id="rect7681-6"
style="color:#000000;fill:#e7e7e7;fill-opacity:1;stroke:none;stroke-width:0.99999987999999995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g>
<g
id="g35608"
style="display:inline"
transform="translate(-15,-90.000001)">
<rect
style="color:#000000;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:#7092ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect35610"
width="15"
height="15"
x="82.5"
y="272.5"
rx="9.5"
ry="9.5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
ry="9.5"
rx="9.5"
y="273"
x="83"
height="14"
width="14"
id="rect35612"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
<rect
inkscape:export-ydpi="90"
inkscape:export-xdpi="90"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
ry="7.0000005"
rx="7.0000005"
y="274"
x="84"
height="11.999999"
width="11.999999"
id="rect35614"
style="color:#000000;fill:#e2e9ff;fill-opacity:1;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
style="color:#000000;fill:#4672ff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-rule:nonzero"
id="rect35616"
width="10"
height="10"
x="85"
y="275"
rx="5"
ry="5"
inkscape:export-filename="/Users/saman/work_repos/iD/img/source/layerswitcher-expanded.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

View File

@@ -16,7 +16,7 @@ iD.layerswitcher = function(map) {
selection
.append('button')
.attr('class', 'narrow')
.text('L')
.text('Layers')
.on('click', function() {
content.classed('hide', function() {
return !content.classed('hide');
@@ -28,9 +28,12 @@ iD.layerswitcher = function(map) {
opa = content
.append('div')
.attr('class', 'opacity-options-wrapper')
.attr('class', 'opacity-options-wrapper fillL2')
.html("<em>Layers</em>")
.append('ul')
.attr('class', 'opacity-options')
.attr('data-original-title', 'Adjust the layer opacity')
.call(bootstrap.tooltip().placement('right'))
.selectAll('a.opacity')
.data(opacities)
.enter()
@@ -82,7 +85,9 @@ iD.layerswitcher = function(map) {
map.background.source(d.source);
map.redraw();
selectLayer(d);
});
})
.insert('span')
.attr('class','icon toggle');
selectLayer(map.background.source());
}