From: Salvatore Iovene <salvatore.iovene@intel.com>
Date: Mon, 8 Oct 2012 08:47:20 +0000 (+0300)
Subject: Renames the night theme.
X-Git-Tag: 0.1~154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f729886f3a2df610fa5c89153010600ce804d23f;p=profile%2Fivi%2Fcowhide.git

Renames the night theme.
---

diff --git a/grunt.js b/grunt.js
index bec2920..019a1f7 100644
--- a/grunt.js
+++ b/grunt.js
@@ -54,9 +54,9 @@ module.exports = function(grunt) {
           'dist/cowhide-default.css': 'src/less/cowhide-default.less'
         }
       },
-      cyborg: {
+      default_night_theme: {
         files: {
-          'dist/cowhide-cyborg.css': 'src/less/cowhide-cyborg.less'
+          'dist/cowhide-default-night.css': 'src/less/cowhide-default-night.less'
         }
       }
     },
@@ -98,11 +98,11 @@ module.exports = function(grunt) {
           'lib/jquery.ui.slider.css'
         ], dest: 'dist/cowhide-default.css'
       },
-      css_cyborg: {
+      css_default_night: {
         src: [
-          'dist/cowhide-cyborg.css',
+          'dist/cowhide-default-night.css',
           'lib/jquery.ui.slider.css'
-        ], dest: 'dist/cowhide-cyborg .css'
+        ], dest: 'dist/cowhide-default-night.css'
       }
     },
     min: {
@@ -116,9 +116,9 @@ module.exports = function(grunt) {
         src: ['dist/cowhide-default.css'],
         dest: 'dist/cowhide-default.min.css'
       },
-      cyborg: {
-        src: ['dist/cowhide-cyborg.css'],
-        dest: 'dist/cowhide-cyborg.min.css'
+      default_night_theme: {
+        src: ['dist/cowhide-default-night.css'],
+        dest: 'dist/cowhide-default-night.min.css'
       }
     },
     copy: {
diff --git a/src/javascripts/cowhide-core.js b/src/javascripts/cowhide-core.js
index a4a3897..e178a17 100644
--- a/src/javascripts/cowhide-core.js
+++ b/src/javascripts/cowhide-core.js
@@ -51,7 +51,7 @@
             var dir = dirname(path);
 
             if (base == 'cowhide-default.css')
-                base = 'cowhide-cyborg.css';
+                base = 'cowhide-default-night.css';
             else
                 base = 'cowhide-default.css';
 
diff --git a/src/less/cowhide-cyborg.less b/src/less/cowhide-cyborg.less
deleted file mode 100644
index d4fd452..0000000
--- a/src/less/cowhide-cyborg.less
+++ /dev/null
@@ -1,9 +0,0 @@
-@import "../bootstrap/less/bootstrap.less";
-
-@import "../themes/cyborg-variables.less";
-@import "../themes/cyborg-bootswatch.less";
-
-// TODO: this doesn't seem to work.
-@import "../themes/cyborg-item-lists.less";
-
-@import "cowhide-seat-selector.less";
diff --git a/src/less/cowhide-default-night.less b/src/less/cowhide-default-night.less
new file mode 100644
index 0000000..4c71379
--- /dev/null
+++ b/src/less/cowhide-default-night.less
@@ -0,0 +1,10 @@
+@import "../bootstrap/less/bootstrap.less";
+
+@import "../themes/default-night-variables.less";
+@import "../themes/default-night-theme.less";
+
+// TODO: this doesn't seem to work.
+@import "../themes/default-night-item-lists.less";
+
+// TODO: customize for night theme.
+@import "cowhide-seat-selector.less";
diff --git a/src/themes/cyborg-item-lists.less b/src/themes/default-night-item-lists.less
similarity index 100%
rename from src/themes/cyborg-item-lists.less
rename to src/themes/default-night-item-lists.less
diff --git a/src/themes/cyborg-bootswatch.less b/src/themes/default-night-theme.less
similarity index 98%
rename from src/themes/cyborg-bootswatch.less
rename to src/themes/default-night-theme.less
index 642bf0a..1c67b0e 100644
--- a/src/themes/cyborg-bootswatch.less
+++ b/src/themes/default-night-theme.less
@@ -6,12 +6,9 @@
 // TYPOGRAPHY
 // -----------------------------------------------------
 
-@import url('https://fonts.googleapis.com/css?family=Droid+Sans:400,700');
-
 label, input, button, select, textarea,
 .navbar .search-query:-moz-placeholder,
 .navbar .search-query::-webkit-input-placeholder {
-	font-family: 'Droid Sans', sans-serif;
 	color: @gray;
 }
 
@@ -35,6 +32,7 @@ html {
 }
 
 body {
+	font-family: @sansFontFamily;
 	min-height: 100%;
 	#gradient > .vertical (@bodyBackground, #252A30);
 }
@@ -48,8 +46,6 @@ body {
 
 .navbar {
 
-	font-size: 16px;
-
 	.navbar-inner {
 		.border-radius(0);
 		.box-shadow(none);
@@ -329,7 +325,6 @@ div.subnav {
 	background-image: none;
 	border-width: 0;
 	.box-shadow(none);
-	font-size: 14px;
 
 	li > a {
 		color: @blue;
@@ -348,7 +343,6 @@ div.subnav {
 
 	a {
 		border: 0;
-		font-size: 14px;
 	}
 
 	a:hover, .active a {
diff --git a/src/themes/cyborg-variables.less b/src/themes/default-night-variables.less
similarity index 100%
rename from src/themes/cyborg-variables.less
rename to src/themes/default-night-variables.less