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

resolve conflict.

Browse Source
This commit is contained in:
Saman Bemel-Benrud
2012-12-14 19:58:15 -05:00
parent 9348068224 ad0efa4931
commit 2c3c4cc652
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+4 -4
View File
@@ -136,7 +136,7 @@ a.selected {
cursor:url(../img/cursor-draw-finish.png) 9 9, auto;
}
#map.add-place:hover {
#map.add-point:hover {
cursor:url(../img/cursor-draw-marker.png) 18 18, auto;
}
@@ -305,7 +305,7 @@ button.action .label {
/* Definitions for every icon */
.icon.browse { background-position: 0px 0px;}
.icon.add-place { background-position: -20px 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;}
@@ -322,7 +322,7 @@ button.action .label {
.icon.layers { background-position: -300px 0px;}
/*.active .icon.browse { background-position: 0px -20px;}
.active .icon.add-place { background-position: -20px -20px;}
.active .icon.add-point { background-position: -20px -20px;}
.active .icon.add-line { background-position: -40px -20px;}
.active .icon.add-area { background-position: -60px -20px;}
.active .icon.undo { background-position: -80px -20px;}
@@ -339,7 +339,7 @@ button.action .label {
.active .icon.layers { background-position: -300px -20px;}*/
button[disabled] .icon.browse { background-position: 0px -40px;}
button[disabled] .icon.add-place { background-position: -20px -40px;}
button[disabled] .icon.add-point { background-position: -20px -40px;}
button[disabled] .icon.add-line { background-position: -40px -40px;}
button[disabled] .icon.add-area { background-position: -60px -40px;}
button[disabled] .icon.undo { background-position: -80px -40px;}