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

Merge branch 'dist'

Browse Source
This commit is contained in:
John Firebaugh
2013-04-22 12:10:01 -07:00
parent 765fedef15 0e6c0db28a
commit e35fe0b581
63 changed files with 100 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+15 -15
View File
@@ -64,10 +64,10 @@ button,
.opacity-options li,
.radial-menu-item {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-pointer.png) 6 1, pointer; /* FF */
cursor: url(img/cursor-pointer.png) 6 1, pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-pointer.png) 1x,
url(../img/cursor-pointer2x.png) 2x
url(img/cursor-pointer.png) 1x,
url(img/cursor-pointer2x.png) 2x
) 6 1, pointer;
}
@@ -290,7 +290,7 @@ ul.link-list li:last-child {
}
.fillL2 {
background: #f7f7f7 url(../img/background-pattern-1.png) repeat;
background: #f7f7f7 url(img/background-pattern-1.png) repeat;
color: #333;
}
@@ -323,7 +323,7 @@ a.hide {
}
.loading {
background: url(../img/loader_bg.gif);
background: url(img/loader_bg.gif);
background-size:5px 5px;
}
@@ -469,7 +469,7 @@ button.save.has-count .count::before {
vertical-align:top;
width:20px;
height:20px;
background:transparent url(../img/sprite.svg) no-repeat 0 0;
background:transparent url(img/sprite.svg) no-repeat 0 0;
text-indent:-9999px;
overflow:hidden;
}
@@ -870,16 +870,16 @@ a:hover .icon.out-link { background-position: -500px -14px;}
margin: auto;
position: absolute;
left: 0; right: 0; top: 19px;
background:transparent url(../img/sprite.svg) no-repeat -240px -80px;
background:transparent url(img/sprite.svg) no-repeat -240px -80px;
}
.preset-icon-fill.tag-shop,
.preset-icon-fill.tag-building {
background:transparent url(../img/sprite.svg) no-repeat 0 -80px;
background:transparent url(img/sprite.svg) no-repeat 0 -80px;
}
.preset-icon-fill.tag-natural-water {
background:transparent url(../img/sprite.svg) no-repeat -60px -80px;
background:transparent url(img/sprite.svg) no-repeat -60px -80px;
}
.preset-icon-fill.tag-landuse,
@@ -887,11 +887,11 @@ a:hover .icon.out-link { background-position: -500px -14px;}
.preset-icon-fill.tag-natural-tree,
.preset-icon-fill.tag-natural-grassland,
.preset-icon-fill.tag-leisure-park {
background:transparent url(../img/sprite.svg) no-repeat -120px -80px;
background:transparent url(img/sprite.svg) no-repeat -120px -80px;
}
.preset-icon-fill.tag-amenity-parking {
background:transparent url(../img/sprite.svg) no-repeat -180px -80px;
background:transparent url(img/sprite.svg) no-repeat -180px -80px;
}
/* preset form basics */
@@ -1648,7 +1648,7 @@ img.wiki-image {
}
.opacity-options {
background: url(../img/background-pattern-opacity.png) 0 0 repeat;
background: url(img/background-pattern-opacity.png) 0 0 repeat;
height:20px;
width:62px;
position: absolute;
@@ -2036,7 +2036,7 @@ img.wiki-image {
width: 100px;
margin: auto;
margin-bottom: 10px;
background:transparent url(../img/sprite.svg) no-repeat 0 -220px;
background:transparent url(img/sprite.svg) no-repeat 0 -220px;
}
.modal-actions :first-child {
@@ -2496,7 +2496,7 @@ img.wiki-image {
content: "";
height: 80px;
width: 200px;
background:transparent url(../img/sprite.svg) no-repeat 0 -320px;
background:transparent url(img/sprite.svg) no-repeat 0 -320px;
}
.intro-areas-add .tooltip-inner::before {
@@ -2516,6 +2516,6 @@ img.wiki-image {
.huge-modal-button .illustration {
height: 100px;
width: 100px;
background: rgba(0, 0, 0, 0) url(../img/sprite.svg) no-repeat -301px -220px;
background: rgba(0, 0, 0, 0) url(img/sprite.svg) no-repeat -301px -220px;
margin: auto;
}
css/img
Symlink
+1
View File
@@ -0,0 +1 @@
../dist/img/
css/line-presets.css
+1 -1
View File
@@ -1,5 +1,5 @@
.preset-line-icon {
background-image: url(../img/line-presets.png);
background-image: url(img/line-presets.png);
width: 60px;
height: 60px;
overflow: hidden;
css/maki-sprite.css
+1 -1
View File
@@ -1,6 +1,6 @@
/* This file is generated by make. Do NOT edit manually. */
.maki-icon{background-image:url('../img/maki-sprite.png');background-repeat:no-repeat;}
.maki-icon{background-image:url(img/maki-sprite.png);background-repeat:no-repeat;}
.maki-airfield{background-position:-0px -34px;width:24px;height:24px;}
.maki-airport{background-position:-0px -94px;width:24px;height:24px;}
.maki-alcohol-shop{background-position:-0px -154px;width:24px;height:24px;}
css/map.css
+42 -42
View File
@@ -864,69 +864,69 @@ text.point {
#map:hover {
cursor: auto; /* Opera */
cursor: url(../img/cursor-grab.png) 9 9, auto; /* FF */
cursor: url(img/cursor-grab.png) 9 9, auto; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-grab.png) 1x,
url(../img/cursor-grab2x.png) 2x
url(img/cursor-grab.png) 1x,
url(img/cursor-grab2x.png) 2x
) 9 9, auto;
}
#map:active {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-grabbing.png) 9 9, auto; /* FF */
cursor: url(img/cursor-grabbing.png) 9 9, auto; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-grabbing.png) 1x,
url(../img/cursor-grabbing2x.png) 2x
url(img/cursor-grabbing.png) 1x,
url(img/cursor-grabbing2x.png) 2x
) 9 9, auto;
}
.mode-browse .point,
.mode-select .point {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-point.png), pointer; /* FF */
cursor: url(img/cursor-select-point.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-point.png) 1x,
url(../img/cursor-select-point2x.png) 2x
url(img/cursor-select-point.png) 1x,
url(img/cursor-select-point2x.png) 2x
), pointer;
}
.mode-select .vertex,
.mode-browse .vertex {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-vertex.png), pointer; /* FF */
cursor: url(img/cursor-select-vertex.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-vertex.png) 1x,
url(../img/cursor-select-vertex2x.png) 2x
url(img/cursor-select-vertex.png) 1x,
url(img/cursor-select-vertex2x.png) 2x
), pointer;
}
.mode-browse .line,
.mode-select .line {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-line.png), pointer; /* FF */
cursor: url(img/cursor-select-line.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-line.png) 1x,
url(../img/cursor-select-line2x.png) 2x
url(img/cursor-select-line.png) 1x,
url(img/cursor-select-line2x.png) 2x
), pointer;
}
.mode-select .area,
.mode-browse .area {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-area.png), pointer; /* FF */
cursor: url(img/cursor-select-area.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-area.png) 1x,
url(../img/cursor-select-area2x.png) 2x
url(img/cursor-select-area.png) 1x,
url(img/cursor-select-area2x.png) 2x
), pointer;
}
.mode-select .midpoint,
.mode-browse .midpoint {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-split.png), pointer; /* FF */
cursor: url(img/cursor-select-split.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-split.png) 1x,
url(../img/cursor-select-split2x.png) 2x
url(img/cursor-select-split.png) 1x,
url(img/cursor-select-split2x.png) 2x
), pointer;
}
@@ -935,19 +935,19 @@ text.point {
.mode-select .behavior-multiselect .line,
.mode-select .behavior-multiselect .area {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-add.png), pointer; /* FF */
cursor: url(img/cursor-select-add.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-add.png) 1x,
url(../img/cursor-select-add2x.png) 2x
url(img/cursor-select-add.png) 1x,
url(img/cursor-select-add2x.png) 2x
), pointer;
}
.mode-select .behavior-multiselect .selected {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-remove.png), pointer; /* FF */
cursor: url(img/cursor-select-remove.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-remove.png) 1x,
url(../img/cursor-select-remove2x.png) 2x
url(img/cursor-select-remove.png) 1x,
url(img/cursor-select-remove2x.png) 2x
), pointer;
}
@@ -958,10 +958,10 @@ text.point {
#map .midpoint:active,
#map .mode-select .selected {
cursor: pointer; /* Opera */
cursor: url(../img/cursor-select-acting.png), pointer; /* FF */
cursor: url(img/cursor-select-acting.png), pointer; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-select-acting.png) 1x,
url(../img/cursor-select-acting2x.png) 2x
url(img/cursor-select-acting.png) 1x,
url(img/cursor-select-acting2x.png) 2x
), pointer;
}
@@ -971,10 +971,10 @@ text.point {
.mode-add-area #map:hover,
.mode-drag-node #map:hover {
cursor: crosshair; /* Opera */
cursor: url(../img/cursor-draw.png) 9 9, crosshair; /* FF */
cursor: url(img/cursor-draw.png) 9 9, crosshair; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-draw.png) 1x,
url(../img/cursor-draw2x.png) 2x
url(img/cursor-draw.png) 1x,
url(img/cursor-draw2x.png) 2x
) 9 9, crosshair;
}
@@ -984,10 +984,10 @@ text.point {
.mode-add-area .behavior-hover .way,
.mode-drag-node .behavior-hover .way {
cursor: crosshair; /* Opera */
cursor: url(../img/cursor-draw-connect-line.png) 9 9, crosshair; /* FF */
cursor: url(img/cursor-draw-connect-line.png) 9 9, crosshair; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-draw-connect-line.png) 1x,
url(../img/cursor-draw-connect-line2x.png) 2x
url(img/cursor-draw-connect-line.png) 1x,
url(img/cursor-draw-connect-line2x.png) 2x
) 9 9, crosshair;
}
@@ -997,10 +997,10 @@ text.point {
.mode-add-area .behavior-hover .vertex,
.mode-drag-node .behavior-hover .vertex {
cursor: crosshair; /* Opera */
cursor: url(../img/cursor-draw-connect-vertex.png) 9 9, crosshair; /* FF */
cursor: url(img/cursor-draw-connect-vertex.png) 9 9, crosshair; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-draw-connect-vertex.png) 1x,
url(../img/cursor-draw-connect-vertex2x.png) 2x
url(img/cursor-draw-connect-vertex.png) 1x,
url(img/cursor-draw-connect-vertex2x.png) 2x
) 9 9, crosshair;
}
@@ -1009,10 +1009,10 @@ text.point {
.lasso .way,
.lasso .vertex {
cursor: crosshair; /* Opera */
cursor: url(../img/cursor-draw.png) 9 9, crosshair; /* FF */
cursor: url(img/cursor-draw.png) 9 9, crosshair; /* FF */
cursor: -webkit-image-set(
url(../img/cursor-draw.png) 1x,
url(../img/cursor-draw2x.png) 2x
url(img/cursor-draw.png) 1x,
url(img/cursor-draw2x.png) 2x
) 9 9, crosshair;
}