change color scheme, reduce to two color combination

uyab · Nov 16, 2013 · caea59c · caea59c
1 parent 1aa4a70
commit caea59c
Show file tree

Hide file tree

Showing 4 changed files with 111 additions and 238 deletions.
diff --git a/app/views/demos/color-scheme.blade.php b/app/views/demos/color-scheme.blade.php
@@ -5,21 +5,12 @@
         <h2 class="page-title">Color Scheme</h2>
         <div class="container">
             <div class="row">
-                <div class="col-sm-2 theme brand-inverse brand-1" style="height:100px">
+                <div class="col-sm-6 theme brand-inverse brand-1" style="height:100px">
                     primary color
                 </div>
-                <div class="col-sm-2 theme brand-inverse brand-2" style="height:100px">
+                <div class="col-sm-6 theme brand-inverse brand-2" style="height:100px">
                     secondary color
                 </div>
-                <div class="col-sm-2 theme brand-inverse brand-3" style="height:100px">
-                    tertiary color
-                </div>
-                <div class="col-sm-2 theme brand-inverse brand-4" style="height:100px">
-                    ternary color
-                </div>
-                <div class="col-sm-2 theme brand-inverse brand-5" style="height:100px">
-                    ternary color
-                </div>
             </div>
         </div>
     </div>

diff --git a/app/views/layouts/partials/navbar.blade.php b/app/views/layouts/partials/navbar.blade.php
@@ -14,7 +14,7 @@
 				<li class="dropdown nav-notifications">
 					<a href="dashboard.html#" class="dropdown-toggle" data-toggle="dropdown">
 						<i class="icon-warning-sign icon"></i>
-						<span class="label theme brand-4 brand-inverse">9</span>
+						<span class="label theme brand-1 brand-inverse">9</span>
 					</a>
 					<ul class="dropdown-menu reveal">
 						<li class="nav-notifications-header">
@@ -56,7 +56,7 @@
 				<li class="dropdown nav-notifications">
 				 	<a href="dashboard.html#" class="dropdown-toggle" data-toggle="dropdown">
 						<i class="icon-envelope icon"></i>
-						<span class="label  theme brand-3 brand-inverse">8</span>
+						<span class="label  theme brand-1 brand-inverse">8</span>
 					</a>
 					<ul class="dropdown-menu reveal">
 						<li class="nav-notifications-header">