Added css files and css optimization.

NilsLattek · Jul 10, 2012 · f5d2c51 · f5d2c51
1 parent 22122c4
commit f5d2c51
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 3 deletions.
diff --git a/bin/build.sh b/bin/build.sh
@@ -24,6 +24,7 @@ cd $CURDIR
 
 echo "Removing unnecessary js files from the build directory"
 find $BUILDDIR/js -type f -not \( -name "main.js" -o -name "require.js" \) -delete
+find $BUILDDIR/css -type f -not \( -name "index.css" \) -delete
 
 echo "Removing collections directory"
 rm -rf $BUILDDIR/js/collections
@@ -40,6 +41,10 @@ rm -rf $BUILDDIR/js/templates
 echo "Removing views directory"
 rm -rf $BUILDDIR/js/views
 
+echo "Removing css directories"
+rm -rf $BUILDDIR/css/layout
+rm -rf $BUILDDIR/css/views
+
 echo "Moving build.txt to current dir"
 mv $BUILDDIR/build.txt $CURDIR
 

diff --git a/bin/build.txt b/bin/build.txt
@@ -1,4 +1,18 @@
 
+css/index.css
+----------------
+css/layout/application.css
+css/views/entry.css
+css/index.css
+
+css/layout/application.css
+----------------
+css/layout/application.css
+
+css/views/entry.css
+----------------
+css/views/entry.css
+
 js/libs/require/require.js
 ----------------
 js/libs/require/require.js

diff --git a/client-build/css/index.css b/client-build/css/index.css
@@ -0,0 +1 @@
+body {margin: 0; padding: 0;}ul {list-style-type: none; margin: 0; padding: 0;}
diff --git a/client-build/img/.gitkeep b/client-build/img/.gitkeep
diff --git a/client-build/index.html b/client-build/index.html
@@ -5,7 +5,7 @@
 
     <meta name="viewport" content="width=device-width; initial-scale=1.0; minimum-scale=1; maximum-scale=1.0; user-scalable=0;">
 
-    <!--<link rel="stylesheet" href="css/style.css">-->
+    <link rel="stylesheet" href="css/index.css">
     <script data-main="js/main" src="js/libs/require/require.js"></script>
   </head>
   <body>

diff --git a/client/css/index.css b/client/css/index.css
@@ -0,0 +1,2 @@
+@import url("layout/application.css");
+@import url("views/entry.css");
diff --git a/client/css/layout/application.css b/client/css/layout/application.css
@@ -0,0 +1,4 @@
+body {
+  margin: 0;
+  padding: 0;
+}
diff --git a/client/css/views/entry.css b/client/css/views/entry.css
@@ -0,0 +1,5 @@
+ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
diff --git a/client/img/.gitkeep b/client/img/.gitkeep
diff --git a/client/index.html b/client/index.html
@@ -5,7 +5,7 @@
 
     <meta name="viewport" content="width=device-width; initial-scale=1.0; minimum-scale=1; maximum-scale=1.0; user-scalable=0;">
 
-    <!--<link rel="stylesheet" href="css/style.css">-->
+    <link rel="stylesheet" href="css/index.css">
     <script data-main="js/main" src="js/libs/require/require.js"></script>
   </head>
   <body>

diff --git a/client/js/build.js b/client/js/build.js
@@ -5,7 +5,7 @@
     mainConfigFile: 'main.js',
     optimize: "uglify",
     //optimize: "none",
-    //optimizeCss: "standard.keepLines",
+    optimizeCss: "standard", //standard.keepLines
     inlineText: true,
     findNestedDependencies: true,
     paths: {