From aedd5ee46eef811e655ddc564e713cbe6085b3c5 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 16 Apr 2013 14:53:57 -0700 Subject: [PATCH] Create a dist directory This directory will contain the built sources (iD.js, iD.css) and images. On a release branch, we will check in the generated files. For the osm.us/master deploy, it should run make and use dist/ as the root. Paths in css are relative, e.g. url(img/foo.png). --- .gitignore | 7 +- Makefile | 40 ++++----- css/app.css | 30 +++---- css/img | 1 + css/line-presets.css | 2 +- css/maki-sprite.css | 2 +- css/map.css | 84 +++++++++--------- data/maki_sprite.js | 4 +- {img => dist/img}/background-pattern-1.png | Bin .../img}/background-pattern-opacity.png | Bin {img => dist/img}/bing_maps.png | Bin .../img}/cursor-draw-connect-line.png | Bin .../img}/cursor-draw-connect-line2x.png | Bin .../img}/cursor-draw-connect-vertex.png | Bin .../img}/cursor-draw-connect-vertex2x.png | Bin {img => dist/img}/cursor-draw.png | Bin {img => dist/img}/cursor-draw2x.png | Bin {img => dist/img}/cursor-grab.png | Bin {img => dist/img}/cursor-grab2x.png | Bin {img => dist/img}/cursor-grabbing.png | Bin {img => dist/img}/cursor-grabbing2x.png | Bin {img => dist/img}/cursor-pointer.png | Bin {img => dist/img}/cursor-pointer2x.png | Bin {img => dist/img}/cursor-pointing.png | Bin {img => dist/img}/cursor-pointing2x.png | Bin {img => dist/img}/cursor-select-acting.png | Bin {img => dist/img}/cursor-select-acting2x.png | Bin {img => dist/img}/cursor-select-add.png | Bin {img => dist/img}/cursor-select-add2x.png | Bin {img => dist/img}/cursor-select-area.png | Bin {img => dist/img}/cursor-select-area2x.png | Bin {img => dist/img}/cursor-select-line.png | Bin {img => dist/img}/cursor-select-line2x.png | Bin {img => dist/img}/cursor-select-point.png | Bin {img => dist/img}/cursor-select-point2x.png | Bin {img => dist/img}/cursor-select-remove.png | Bin {img => dist/img}/cursor-select-remove2x.png | Bin {img => dist/img}/cursor-select-split.png | Bin {img => dist/img}/cursor-select-split2x.png | Bin {img => dist/img}/cursor-select-vertex.png | Bin {img => dist/img}/cursor-select-vertex2x.png | Bin {img => dist/img}/line-presets.png | Bin {img => dist/img}/loader-black.gif | Bin {img => dist/img}/loader-white.gif | Bin {img => dist/img}/loader_bg.gif | Bin {img => dist/img}/logo.png | Bin {img => dist/img}/maki-sprite.png | Bin {img => dist/img}/mini-loader.gif | Bin {img => dist/img}/pattern/cemetery.png | Bin {img => dist/img}/pattern/construction.png | Bin {img => dist/img}/pattern/dots.png | Bin {img => dist/img}/pattern/farmland.png | Bin {img => dist/img}/pattern/orchard.png | Bin {img => dist/img}/pattern/vineyard.png | Bin {img => dist/img}/pattern/wetland.png | Bin {img => dist/img}/sprite.svg | 0 index_packaged.html => dist/index.html | 6 +- dist/land.html | 9 ++ index.html | 2 +- land.html | 10 +-- test/img | 2 +- test/index_packaged.html | 2 +- 62 files changed, 95 insertions(+), 106 deletions(-) create mode 120000 css/img rename {img => dist/img}/background-pattern-1.png (100%) rename {img => dist/img}/background-pattern-opacity.png (100%) rename {img => dist/img}/bing_maps.png (100%) rename {img => dist/img}/cursor-draw-connect-line.png (100%) rename {img => dist/img}/cursor-draw-connect-line2x.png (100%) rename {img => dist/img}/cursor-draw-connect-vertex.png (100%) rename {img => dist/img}/cursor-draw-connect-vertex2x.png (100%) rename {img => dist/img}/cursor-draw.png (100%) rename {img => dist/img}/cursor-draw2x.png (100%) rename {img => dist/img}/cursor-grab.png (100%) rename {img => dist/img}/cursor-grab2x.png (100%) rename {img => dist/img}/cursor-grabbing.png (100%) rename {img => dist/img}/cursor-grabbing2x.png (100%) rename {img => dist/img}/cursor-pointer.png (100%) rename {img => dist/img}/cursor-pointer2x.png (100%) rename {img => dist/img}/cursor-pointing.png (100%) rename {img => dist/img}/cursor-pointing2x.png (100%) rename {img => dist/img}/cursor-select-acting.png (100%) rename {img => dist/img}/cursor-select-acting2x.png (100%) rename {img => dist/img}/cursor-select-add.png (100%) rename {img => dist/img}/cursor-select-add2x.png (100%) rename {img => dist/img}/cursor-select-area.png (100%) rename {img => dist/img}/cursor-select-area2x.png (100%) rename {img => dist/img}/cursor-select-line.png (100%) rename {img => dist/img}/cursor-select-line2x.png (100%) rename {img => dist/img}/cursor-select-point.png (100%) rename {img => dist/img}/cursor-select-point2x.png (100%) rename {img => dist/img}/cursor-select-remove.png (100%) rename {img => dist/img}/cursor-select-remove2x.png (100%) rename {img => dist/img}/cursor-select-split.png (100%) rename {img => dist/img}/cursor-select-split2x.png (100%) rename {img => dist/img}/cursor-select-vertex.png (100%) rename {img => dist/img}/cursor-select-vertex2x.png (100%) rename {img => dist/img}/line-presets.png (100%) rename {img => dist/img}/loader-black.gif (100%) rename {img => dist/img}/loader-white.gif (100%) rename {img => dist/img}/loader_bg.gif (100%) rename {img => dist/img}/logo.png (100%) rename {img => dist/img}/maki-sprite.png (100%) rename {img => dist/img}/mini-loader.gif (100%) rename {img => dist/img}/pattern/cemetery.png (100%) rename {img => dist/img}/pattern/construction.png (100%) rename {img => dist/img}/pattern/dots.png (100%) rename {img => dist/img}/pattern/farmland.png (100%) rename {img => dist/img}/pattern/orchard.png (100%) rename {img => dist/img}/pattern/vineyard.png (100%) rename {img => dist/img}/pattern/wetland.png (100%) rename {img => dist/img}/sprite.svg (100%) rename index_packaged.html => dist/index.html (91%) create mode 100644 dist/land.html mode change 100644 => 120000 land.html diff --git a/.gitignore b/.gitignore index 6d9b443f3..f960c0be3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -iD.js -iD.min.js -iD.css -build +dist/iD.js +dist/iD.min.js +dist/iD.css transifex.auth diff --git a/Makefile b/Makefile index 4d64962f5..dda934fc5 100644 --- a/Makefile +++ b/Makefile @@ -6,19 +6,19 @@ JS_COMPILER = $(UGLIFY) LOCALE ?= en_US all: \ - iD.js \ - iD.min.js \ - img/line-presets.png \ - iD.css + dist/iD.js \ + dist/iD.min.js \ + dist/img/line-presets.png \ + dist/iD.css DATA_FILES = $(shell find data -type f -name '*.json' -o -name '*.md') -data/data.js: $(DATA_FILES) img/maki-sprite.png +data/data.js: $(DATA_FILES) dist/img/maki-sprite.png node build.js data/locales/en.js: data/core.yaml data/presets.yaml node build.js -iD.js: \ +dist/iD.js: \ js/lib/bootstrap-tooltip.js \ js/lib/d3.v3.js \ js/lib/d3.combobox.js \ @@ -66,30 +66,22 @@ iD.js: \ data/introGraph.js \ data/locales.js -.INTERMEDIATE iD.js: data/data.js +.INTERMEDIATE dist/iD.js: data/data.js -iD.js: node_modules/.install Makefile +dist/iD.js: node_modules/.install Makefile @rm -f $@ cat $(filter %.js,$^) > $@ -iD.css: css/*.css +dist/iD.min.js: dist/iD.js Makefile + @rm -f $@ + $(JS_COMPILER) $< -c -m -o $@ + +dist/iD.css: css/*.css cat css/reset.css css/map.css css/app.css css/line-presets.css css/maki-sprite.css > $@ node_modules/.install: package.json npm install && touch node_modules/.install -%.min.js: %.js Makefile - @rm -f $@ - $(JS_COMPILER) $< -c -m -o $@ - -install_root ?= build -install: all - mkdir -p $(install_root) - cp iD.js iD.min.js land.html $(install_root) - cp index_packaged.html $(install_root)/index.html - cp -R css/. $(install_root)/css - cp -R img/. $(install_root)/img - clean: rm -f iD*.js @@ -99,12 +91,12 @@ translations: data/locales.js: data/locales/*.js cat $^ > $@ -SPRITE = inkscape --export-area-page --export-png=img/line-presets.png svg/line-presets.svg +SPRITE = inkscape --export-area-page --export-png=dist/img/line-presets.png svg/line-presets.svg -img/line-presets.png: svg/line-presets.svg +dist/img/line-presets.png: svg/line-presets.svg if [ `which inkscape` ]; then $(SPRITE); else echo "Inkscape is not installed"; fi; -img/maki-sprite.png: $(wildcard node_modules/maki/renders/*.png) +dist/img/maki-sprite.png: $(wildcard node_modules/maki/renders/*.png) node data/maki_sprite D3_FILES = \ diff --git a/css/app.css b/css/app.css index 47ca494ce..8bd85a50d 100644 --- a/css/app.css +++ b/css/app.css @@ -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; } diff --git a/css/img b/css/img new file mode 120000 index 000000000..a5e0e5adb --- /dev/null +++ b/css/img @@ -0,0 +1 @@ +../dist/img/ \ No newline at end of file diff --git a/css/line-presets.css b/css/line-presets.css index d779b3dca..6cffb6fc2 100644 --- a/css/line-presets.css +++ b/css/line-presets.css @@ -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; diff --git a/css/maki-sprite.css b/css/maki-sprite.css index 40f4cdd08..9de570720 100644 --- a/css/maki-sprite.css +++ b/css/maki-sprite.css @@ -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;} diff --git a/css/map.css b/css/map.css index d2313eaee..170d44628 100644 --- a/css/map.css +++ b/css/map.css @@ -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; } diff --git a/data/maki_sprite.js b/data/maki_sprite.js index 76d52c43b..f761e0546 100644 --- a/data/maki_sprite.js +++ b/data/maki_sprite.js @@ -8,13 +8,13 @@ sprite.sprite('renders', { path: makipath }, function(err, makiSprite) { if (err) process.exit(1); // Move image and json files - fs.renameSync(path.join(makipath, makiSprite.filename()), './img/maki-sprite.png'); + fs.renameSync(path.join(makipath, makiSprite.filename()), './dist/img/maki-sprite.png'); fs.renameSync(path.join(makipath, 'renders.json'), './data/maki-sprite.json'); // Generate CSS var template = '.maki-{name}{background-position:{x} {y};width:{w};height:{h};}\n'; var css = "/* This file is generated by make. Do NOT edit manually. */\n\n"; - css += ".maki-icon{background-image:url('../img/maki-sprite.png');background-repeat:no-repeat;}\n"; + css += ".maki-icon{background-image:url(img/maki-sprite.png);background-repeat:no-repeat;}\n"; makiSprite.images.forEach(function(image) { if (image.width !== 24) return; diff --git a/img/background-pattern-1.png b/dist/img/background-pattern-1.png similarity index 100% rename from img/background-pattern-1.png rename to dist/img/background-pattern-1.png diff --git a/img/background-pattern-opacity.png b/dist/img/background-pattern-opacity.png similarity index 100% rename from img/background-pattern-opacity.png rename to dist/img/background-pattern-opacity.png diff --git a/img/bing_maps.png b/dist/img/bing_maps.png similarity index 100% rename from img/bing_maps.png rename to dist/img/bing_maps.png diff --git a/img/cursor-draw-connect-line.png b/dist/img/cursor-draw-connect-line.png similarity index 100% rename from img/cursor-draw-connect-line.png rename to dist/img/cursor-draw-connect-line.png diff --git a/img/cursor-draw-connect-line2x.png b/dist/img/cursor-draw-connect-line2x.png similarity index 100% rename from img/cursor-draw-connect-line2x.png rename to dist/img/cursor-draw-connect-line2x.png diff --git a/img/cursor-draw-connect-vertex.png b/dist/img/cursor-draw-connect-vertex.png similarity index 100% rename from img/cursor-draw-connect-vertex.png rename to dist/img/cursor-draw-connect-vertex.png diff --git a/img/cursor-draw-connect-vertex2x.png b/dist/img/cursor-draw-connect-vertex2x.png similarity index 100% rename from img/cursor-draw-connect-vertex2x.png rename to dist/img/cursor-draw-connect-vertex2x.png diff --git a/img/cursor-draw.png b/dist/img/cursor-draw.png similarity index 100% rename from img/cursor-draw.png rename to dist/img/cursor-draw.png diff --git a/img/cursor-draw2x.png b/dist/img/cursor-draw2x.png similarity index 100% rename from img/cursor-draw2x.png rename to dist/img/cursor-draw2x.png diff --git a/img/cursor-grab.png b/dist/img/cursor-grab.png similarity index 100% rename from img/cursor-grab.png rename to dist/img/cursor-grab.png diff --git a/img/cursor-grab2x.png b/dist/img/cursor-grab2x.png similarity index 100% rename from img/cursor-grab2x.png rename to dist/img/cursor-grab2x.png diff --git a/img/cursor-grabbing.png b/dist/img/cursor-grabbing.png similarity index 100% rename from img/cursor-grabbing.png rename to dist/img/cursor-grabbing.png diff --git a/img/cursor-grabbing2x.png b/dist/img/cursor-grabbing2x.png similarity index 100% rename from img/cursor-grabbing2x.png rename to dist/img/cursor-grabbing2x.png diff --git a/img/cursor-pointer.png b/dist/img/cursor-pointer.png similarity index 100% rename from img/cursor-pointer.png rename to dist/img/cursor-pointer.png diff --git a/img/cursor-pointer2x.png b/dist/img/cursor-pointer2x.png similarity index 100% rename from img/cursor-pointer2x.png rename to dist/img/cursor-pointer2x.png diff --git a/img/cursor-pointing.png b/dist/img/cursor-pointing.png similarity index 100% rename from img/cursor-pointing.png rename to dist/img/cursor-pointing.png diff --git a/img/cursor-pointing2x.png b/dist/img/cursor-pointing2x.png similarity index 100% rename from img/cursor-pointing2x.png rename to dist/img/cursor-pointing2x.png diff --git a/img/cursor-select-acting.png b/dist/img/cursor-select-acting.png similarity index 100% rename from img/cursor-select-acting.png rename to dist/img/cursor-select-acting.png diff --git a/img/cursor-select-acting2x.png b/dist/img/cursor-select-acting2x.png similarity index 100% rename from img/cursor-select-acting2x.png rename to dist/img/cursor-select-acting2x.png diff --git a/img/cursor-select-add.png b/dist/img/cursor-select-add.png similarity index 100% rename from img/cursor-select-add.png rename to dist/img/cursor-select-add.png diff --git a/img/cursor-select-add2x.png b/dist/img/cursor-select-add2x.png similarity index 100% rename from img/cursor-select-add2x.png rename to dist/img/cursor-select-add2x.png diff --git a/img/cursor-select-area.png b/dist/img/cursor-select-area.png similarity index 100% rename from img/cursor-select-area.png rename to dist/img/cursor-select-area.png diff --git a/img/cursor-select-area2x.png b/dist/img/cursor-select-area2x.png similarity index 100% rename from img/cursor-select-area2x.png rename to dist/img/cursor-select-area2x.png diff --git a/img/cursor-select-line.png b/dist/img/cursor-select-line.png similarity index 100% rename from img/cursor-select-line.png rename to dist/img/cursor-select-line.png diff --git a/img/cursor-select-line2x.png b/dist/img/cursor-select-line2x.png similarity index 100% rename from img/cursor-select-line2x.png rename to dist/img/cursor-select-line2x.png diff --git a/img/cursor-select-point.png b/dist/img/cursor-select-point.png similarity index 100% rename from img/cursor-select-point.png rename to dist/img/cursor-select-point.png diff --git a/img/cursor-select-point2x.png b/dist/img/cursor-select-point2x.png similarity index 100% rename from img/cursor-select-point2x.png rename to dist/img/cursor-select-point2x.png diff --git a/img/cursor-select-remove.png b/dist/img/cursor-select-remove.png similarity index 100% rename from img/cursor-select-remove.png rename to dist/img/cursor-select-remove.png diff --git a/img/cursor-select-remove2x.png b/dist/img/cursor-select-remove2x.png similarity index 100% rename from img/cursor-select-remove2x.png rename to dist/img/cursor-select-remove2x.png diff --git a/img/cursor-select-split.png b/dist/img/cursor-select-split.png similarity index 100% rename from img/cursor-select-split.png rename to dist/img/cursor-select-split.png diff --git a/img/cursor-select-split2x.png b/dist/img/cursor-select-split2x.png similarity index 100% rename from img/cursor-select-split2x.png rename to dist/img/cursor-select-split2x.png diff --git a/img/cursor-select-vertex.png b/dist/img/cursor-select-vertex.png similarity index 100% rename from img/cursor-select-vertex.png rename to dist/img/cursor-select-vertex.png diff --git a/img/cursor-select-vertex2x.png b/dist/img/cursor-select-vertex2x.png similarity index 100% rename from img/cursor-select-vertex2x.png rename to dist/img/cursor-select-vertex2x.png diff --git a/img/line-presets.png b/dist/img/line-presets.png similarity index 100% rename from img/line-presets.png rename to dist/img/line-presets.png diff --git a/img/loader-black.gif b/dist/img/loader-black.gif similarity index 100% rename from img/loader-black.gif rename to dist/img/loader-black.gif diff --git a/img/loader-white.gif b/dist/img/loader-white.gif similarity index 100% rename from img/loader-white.gif rename to dist/img/loader-white.gif diff --git a/img/loader_bg.gif b/dist/img/loader_bg.gif similarity index 100% rename from img/loader_bg.gif rename to dist/img/loader_bg.gif diff --git a/img/logo.png b/dist/img/logo.png similarity index 100% rename from img/logo.png rename to dist/img/logo.png diff --git a/img/maki-sprite.png b/dist/img/maki-sprite.png similarity index 100% rename from img/maki-sprite.png rename to dist/img/maki-sprite.png diff --git a/img/mini-loader.gif b/dist/img/mini-loader.gif similarity index 100% rename from img/mini-loader.gif rename to dist/img/mini-loader.gif diff --git a/img/pattern/cemetery.png b/dist/img/pattern/cemetery.png similarity index 100% rename from img/pattern/cemetery.png rename to dist/img/pattern/cemetery.png diff --git a/img/pattern/construction.png b/dist/img/pattern/construction.png similarity index 100% rename from img/pattern/construction.png rename to dist/img/pattern/construction.png diff --git a/img/pattern/dots.png b/dist/img/pattern/dots.png similarity index 100% rename from img/pattern/dots.png rename to dist/img/pattern/dots.png diff --git a/img/pattern/farmland.png b/dist/img/pattern/farmland.png similarity index 100% rename from img/pattern/farmland.png rename to dist/img/pattern/farmland.png diff --git a/img/pattern/orchard.png b/dist/img/pattern/orchard.png similarity index 100% rename from img/pattern/orchard.png rename to dist/img/pattern/orchard.png diff --git a/img/pattern/vineyard.png b/dist/img/pattern/vineyard.png similarity index 100% rename from img/pattern/vineyard.png rename to dist/img/pattern/vineyard.png diff --git a/img/pattern/wetland.png b/dist/img/pattern/wetland.png similarity index 100% rename from img/pattern/wetland.png rename to dist/img/pattern/wetland.png diff --git a/img/sprite.svg b/dist/img/sprite.svg similarity index 100% rename from img/sprite.svg rename to dist/img/sprite.svg diff --git a/index_packaged.html b/dist/index.html similarity index 91% rename from index_packaged.html rename to dist/index.html index e936a04d5..20d33e9a4 100644 --- a/index_packaged.html +++ b/dist/index.html @@ -3,11 +3,7 @@ iD - - - - - + diff --git a/dist/land.html b/dist/land.html new file mode 100644 index 000000000..88db9f1e4 --- /dev/null +++ b/dist/land.html @@ -0,0 +1,9 @@ + + + + + + diff --git a/index.html b/index.html index f85430fb8..a108856cf 100644 --- a/index.html +++ b/index.html @@ -211,7 +211,7 @@ } iD.data.load(function() { - id = iD(); + id = iD().imagePath('css/img/'); d3.select("#id-container") .call(id.ui()); diff --git a/land.html b/land.html deleted file mode 100644 index 88db9f1e4..000000000 --- a/land.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/land.html b/land.html new file mode 120000 index 000000000..45f5c6cc8 --- /dev/null +++ b/land.html @@ -0,0 +1 @@ +dist/land.html \ No newline at end of file diff --git a/test/img b/test/img index 6ffc6ca9f..a5e0e5adb 120000 --- a/test/img +++ b/test/img @@ -1 +1 @@ -../img \ No newline at end of file +../dist/img/ \ No newline at end of file diff --git a/test/index_packaged.html b/test/index_packaged.html index e2081c380..d83e6033d 100644 --- a/test/index_packaged.html +++ b/test/index_packaged.html @@ -17,7 +17,7 @@ - +