Item8206: moved theme stuff to different directory

git-svn-id: http://svn.foswiki.org/trunk/NatSkin@4374 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jul 2, 2009 · d6dfd32 · d6dfd32
1 parent 3aa3777
commit d6dfd32
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 16 deletions.
diff --git a/pub/System/NatSkin/BlueNoteBorder.css → pub/System/JazzyNoteTheme/BlueNoteBorder.css b/pub/System/NatSkin/BlueNoteBorder.css → pub/System/JazzyNoteTheme/BlueNoteBorder.css
diff --git a/pub/System/NatSkin/BlueNoteBorder.css.gz → ...stem/JazzyNoteTheme/BlueNoteBorder.css.gz b/pub/System/NatSkin/BlueNoteBorder.css.gz → ...stem/JazzyNoteTheme/BlueNoteBorder.css.gz
diff --git a/pub/System/NatSkin/BlueNoteButtons.css → ...System/JazzyNoteTheme/BlueNoteButtons.css b/pub/System/NatSkin/BlueNoteButtons.css → ...System/JazzyNoteTheme/BlueNoteButtons.css
diff --git a/pub/System/NatSkin/BlueNoteButtons.css.gz → ...tem/JazzyNoteTheme/BlueNoteButtons.css.gz b/pub/System/NatSkin/BlueNoteButtons.css.gz → ...tem/JazzyNoteTheme/BlueNoteButtons.css.gz
diff --git a/pub/System/NatSkin/BlueNoteStyle.css → pub/System/JazzyNoteTheme/BlueNoteStyle.css b/pub/System/NatSkin/BlueNoteStyle.css → pub/System/JazzyNoteTheme/BlueNoteStyle.css
@@ -667,15 +667,15 @@ fieldset .foswikiFormSteps {
 .natSearchBoxPos1 a {
   margin:1px 5px;
   padding:0px;
-  background-image:url(icons/magnifier.png);
+  background-image:url(../NatSkin/icons/magnifier.png);
   background-repeat:no-repeat;
   display:block;
   height:16px;
   width:16px;
 }
 .natSearchBoxPos1 a:hover {
   background-color:inherit;
-  background-image:url(icons/magnifier.png);
+  background-image:url(../NatSkin/icons/magnifier.png);
   background-repeat:no-repeat;
 }
 .natSearchBoxPos2,

diff --git a/pub/System/NatSkin/BlueNoteStyle.css.gz → ...ystem/JazzyNoteTheme/BlueNoteStyle.css.gz b/pub/System/NatSkin/BlueNoteStyle.css.gz → ...ystem/JazzyNoteTheme/BlueNoteStyle.css.gz
diff --git a/pub/System/NatSkin/BlueNoteThin.css → pub/System/JazzyNoteTheme/BlueNoteThin.css b/pub/System/NatSkin/BlueNoteThin.css → pub/System/JazzyNoteTheme/BlueNoteThin.css
diff --git a/pub/System/NatSkin/BlueNoteThin.css.gz → ...System/JazzyNoteTheme/BlueNoteThin.css.gz b/pub/System/NatSkin/BlueNoteThin.css.gz → ...System/JazzyNoteTheme/BlueNoteThin.css.gz
diff --git a/pub/System/NatSkin/GrayBlend.gif → pub/System/JazzyNoteTheme/GrayBlend.gif b/pub/System/NatSkin/GrayBlend.gif → pub/System/JazzyNoteTheme/GrayBlend.gif
diff --git a/pub/System/NatSkin/GrayBlend.png → pub/System/JazzyNoteTheme/GrayBlend.png b/pub/System/NatSkin/GrayBlend.png → pub/System/JazzyNoteTheme/GrayBlend.png
diff --git a/pub/System/JazzyNoteTheme/Makefile b/pub/System/JazzyNoteTheme/Makefile
@@ -0,0 +1,7 @@
+TARGET= \
+  BlueNoteBorder.css \
+  BlueNoteButtons.css \
+  BlueNoteStyle.css \
+  BlueNoteThin.css
+
+-include ../NatSkin/Makefile.include
diff --git a/pub/System/NatSkin/bullet-toc.gif → pub/System/JazzyNoteTheme/bullet-toc.gif b/pub/System/NatSkin/bullet-toc.gif → pub/System/JazzyNoteTheme/bullet-toc.gif
diff --git a/pub/System/NatSkin/button-bg.png → pub/System/JazzyNoteTheme/button-bg.png b/pub/System/NatSkin/button-bg.png → pub/System/JazzyNoteTheme/button-bg.png
diff --git a/...System/NatSkin/foswiki-header-notrans.png → ...JazzyNoteTheme/foswiki-header-notrans.png b/...System/NatSkin/foswiki-header-notrans.png → ...JazzyNoteTheme/foswiki-header-notrans.png
diff --git a/pub/System/NatSkin/foswiki-header-tile.png → ...em/JazzyNoteTheme/foswiki-header-tile.png b/pub/System/NatSkin/foswiki-header-tile.png → ...em/JazzyNoteTheme/foswiki-header-tile.png
diff --git a/pub/System/NatSkin/foswiki-header.png → pub/System/JazzyNoteTheme/foswiki-header.png b/pub/System/NatSkin/foswiki-header.png → pub/System/JazzyNoteTheme/foswiki-header.png
diff --git a/pub/System/NatSkin/login_keys.png → pub/System/JazzyNoteTheme/login_keys.png b/pub/System/NatSkin/login_keys.png → pub/System/JazzyNoteTheme/login_keys.png
diff --git a/pub/System/NatSkin/menucorner.gif → pub/System/JazzyNoteTheme/menucorner.gif b/pub/System/NatSkin/menucorner.gif → pub/System/JazzyNoteTheme/menucorner.gif
diff --git a/pub/System/NatSkin/BaseStyle.css.gz b/pub/System/NatSkin/BaseStyle.css.gz
diff --git a/pub/System/NatSkin/Makefile b/pub/System/NatSkin/Makefile
@@ -4,22 +4,11 @@ TARGET= \
   BaseButtons.css \
   BaseStyle.css \
   BaseThin.css \
-  BlueNoteBorder.css \
-  BlueNoteButtons.css \
-  BlueNoteStyle.css \
-  BlueNoteThin.css \
   print.css \
   natskin.js \
   obfuscator.js
 
+SUBDIRS= \
+  ../JazzyNoteTheme
 
-GZIP=gzip
-
-
-.SUFFIXES: .js .css
-
-all: $(TARGET) $(TARGET:.js=.js.gz) $(TARGET:.css=.css.gz)
-
-%.gz: %
-	@echo compressing $< to $@
-	@$(GZIP) -c $< > $@
+-include Makefile.include
diff --git a/pub/System/NatSkin/Makefile.include b/pub/System/NatSkin/Makefile.include
@@ -0,0 +1,17 @@
+GZIP=gzip
+
+.SUFFIXES: .js .css
+.PHONY: subdirs $(SUBDIRS)
+
+all: subdirs $(TARGET) $(TARGET:.js=.js.gz) $(TARGET:.css=.css.gz)
+	@echo -n ""
+
+%.gz: %
+	@echo compressing $< to $@
+	@$(GZIP) -c $< > $@
+
+subdirs: $(SUBDIRS)
+
+$(SUBDIRS):
+	@$(MAKE) --no-print-directory -C $@
+