From 24c0115190c221f8dc203141b883b5a0743ea59c Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Tue, 16 Apr 2013 14:14:55 -0700 Subject: [PATCH] Generate a concatenated iD.css file --- .gitignore | 1 + Makefile | 6 +++++- index_packaged.html | 5 +---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 514b741ea..6d9b443f3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ iD.js iD.min.js +iD.css build transifex.auth diff --git a/Makefile b/Makefile index 635b485f2..445c8b648 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,8 @@ LOCALE ?= en_US all: \ iD.js \ - iD.min.js + iD.min.js \ + iD.css DATA_FILES = $(shell find data -type f -name '*.json' -o -name '*.md') data/data.js: $(DATA_FILES) @@ -71,6 +72,9 @@ iD.js: node_modules/.install Makefile @rm -f $@ cat $(filter %.js,$^) > $@ +iD.css: css/*.css + cat css/reset.css css/map.css css/app.css css/feature-icons.css > $@ + node_modules/.install: package.json npm install && touch node_modules/.install diff --git a/index_packaged.html b/index_packaged.html index 670280016..20d33e9a4 100644 --- a/index_packaged.html +++ b/index_packaged.html @@ -3,10 +3,7 @@ iD - - - - +