ui: use a /static directory

wangfakang · May 1, 2014 · 6385407 · 6385407
1 parent 28ac20c
commit 6385407
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 57 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ website/npm-debug.log
 *.attr
 
 ui/.sass-cache
+ui/static/base.css
diff --git a/ui/Makefile b/ui/Makefile
@@ -2,9 +2,9 @@ server:
 	python -m SimpleHTTPServer
 
 watch:
-	sass styles --watch
+	sass styles:static --watch
 
 build:
-	sass styles
+	sass styles:static
 
 .PHONY: server watch build
diff --git a/ui/styles/bootstrap.min.css → ui/static/bootstrap.min.css b/ui/styles/bootstrap.min.css → ui/static/bootstrap.min.css
diff --git a/ui/styles/base.css b/ui/styles/base.css
diff --git a/ui/styles/base.scss b/ui/styles/base.scss
@@ -1,5 +1,4 @@
 @import "variables";
-@import "layout";
 
 body {
     background-color: $foobar;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,4 @@ website/npm-debug.log
		*.attr

		ui/.sass-cache
		ui/static/base.css