Fixed the colors of the menu in bootstrap.css

Fixed tile layouts Fixed aside Fixed taxon page Fixed account page
thms · Sep 30, 2013 · f6b81b8 · f6b81b8
1 parent 0279475
commit f6b81b8
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 21 deletions.
diff --git a/app/assets/stylesheets/store/bootstrap.css b/app/assets/stylesheets/store/bootstrap.css
@@ -44,7 +44,7 @@
 .nav > li > a:focus {
   text-decoration: none;
   border-radius: 4px 4px 0 0;
-  color: #fff;
+  color: #593D2b;
 }
 .nav > li.disabled > a {
   color: #999999;
@@ -59,7 +59,7 @@
 .nav .open > a,
 .nav .open > a:hover,
 .nav .open > a:focus {
-  background-color: #593d2b;
+  background-color: #593D2b;
   border-radius: 4px 4px 0 0;
   color: white;
 }
@@ -515,7 +515,7 @@ button.navbar-toggle .icon-bar + .icon-bar {
   margin-top: 0;
   border-top-right-radius: 0;
   border-top-left-radius: 0;
-  background: #593d2b;
+  background: #593D2B;
 }
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
   border-bottom-right-radius: 0;
@@ -960,7 +960,7 @@ button.navbar-toggle .icon-bar + .icon-bar {
   -webkit-border-radius: 0 6px 6px 6px;
      -moz-border-radius: 0 6px 6px 6px;
           border-radius: 0 6px 6px 6px;
-          background: #593d2b;
+          background: #593D2b;
 }
 
 .dropdown-submenu:hover > .dropdown-menu {
@@ -1018,7 +1018,7 @@ button.navbar-toggle .icon-bar + .icon-bar {
 .navbar {
   clear: both;
   font-family: "mrseavesmedium", serif;
-  border-bottom: 4px double #593d2b;
+  border-bottom: 4px double #593D2b;
   margin-top: 10px;
 }
 
@@ -1060,7 +1060,7 @@ button.navbar-toggle {
   .nav .open > a,
   .nav .open > a:hover,
   .nav .open > a:focus {
-    background-color: #593d2b;
+    background-color: #593D2b;
     border-radius: 4px 4px 0 0;
     color: white;
   }
@@ -1088,7 +1088,7 @@ button.navbar-toggle {
   }
 
   .navbar-nav .open .dropdown-menu {
-    background: #593d2b;
+    background: #593D2b;
   }
 
   .dropdown-submenu > a:after {
@@ -1158,7 +1158,7 @@ button.navbar-toggle {
   }
 
   .navbar-nav .open .dropdown-menu {
-    background: #593d2b;
+    background: #593D2b;
   }
 
   .dropdown-submenu > a:after {

diff --git a/app/assets/stylesheets/store/media_queries.css.scss b/app/assets/stylesheets/store/media_queries.css.scss
@@ -112,12 +112,13 @@ footer#footer ul li {padding-bottom:10px;}
       padding-left: 10px;
       width: 758px;
     }
-    footer#footer {
+    footer#footer, #content {
       width: 758px;
     }
     p[data-hook="use_billing"] {
       margin-top: -15px;
-    }    
+    } 
+   ul#products .columns {width:164px;margin-left:0px;}
   }
 
   /* All Mobile Sizes (devices and browser) */
@@ -135,12 +136,18 @@ footer#footer ul li {padding-bottom:10px;}
     footer#footer {
       width: 640px;
     }
+	aside#sidebar {display:none;}
+
+	div.six.columns[data-hook="product_left_part"] {float:left;width:250px;}
+	div.columns[data-hook="product_right_part"] {float:none;width:100%;}
+
 
 	.home-gp, .home-dl, .home-nl {float:none;width:100%;}
 
 	#search-box {top:113px;right:auto;left:0px;}
 	ul#nav-bar li {display:block;}
 
+
     #order_details .steps-data div.columns, 
     #order_summary .steps-data div.columns {
       padding: 0;
@@ -212,10 +219,11 @@ footer#footer ul li {padding-bottom:10px;}
       margin-right: -20px;
 
       li {
-        width: 133px;
-        margin-right: 10px;
+        width: 164px;
+        margin-right: 0px;
       }
     }
+	div.six.columns[data-hook="product_left_part"] {float:left;width:140px;}
 
     table#cart-detail, table[data-hook="order_details"] {
       tbody {
@@ -267,6 +275,9 @@ footer#footer ul li {padding-bottom:10px;}
         padding: 10px 20px;
       }
     }
+	.taxon-image img {width:75%;height:75%;}
+	div.six.columns[data-hook="product_left_part"] {float:left;width:120px;}
+	div.columns[data-hook="product_right_part"] {text-align:left;}
 
     #shipping_method p label {
       float: none;
@@ -348,8 +359,8 @@ footer#footer ul li {padding-bottom:10px;}
     ul#products {
 
       li {
-        width: 142px;
-        margin-right: 15px;
+        width: 164px;
+        margin-right: 0px;
 
         &.secondary, &.omega {
           margin-right: 0;

diff --git a/app/assets/stylesheets/store/reservebar.css.scss b/app/assets/stylesheets/store/reservebar.css.scss
@@ -91,10 +91,10 @@ div#slider .nivo-caption {right:0;height:250px;width:50%;color:#333;background:n
 div#slider .nivo-controlNav {right:0;bottom:0;left:auto;}
 
 /* Search box - needs to have same zINdex as menu to allow autosuggest to be on top of the menu */
-#keywords {position:relative;z-index:100;width:220px;}
+#keywords {position:relative;z-index:2000;width:220px;}
 
 /* minicart styling*/
-div#minicart {background-color:#eeeeee;z-index:200;}
+div#minicart {background-color:#eeeeee;z-index:4000;}
 div#minicart-footer {text-align:right;padding-right:12px;margin-top:5px;}
 div#minicart table {margin:0 auto;}
 div#minicart table th {text-align:center;}
@@ -178,4 +178,7 @@ sub, sup {font-size:60%;}
 
 td[data-hook="cart_item_image"] {min-width:50px;}
 
-.product-not-active {margin:24px;font-weight:bold;}
+.product-not-active {margin:24px;font-weight:bold;}
+
+.taxon-image {float:left;margin-right:12px;}
+.taxon-text {float:none;width:100%;text-align:left;}
diff --git a/app/assets/stylesheets/store/screen.css.scss b/app/assets/stylesheets/store/screen.css.scss
@@ -17,6 +17,8 @@ $product_title_text_color:  #C13828;
 $product_body_text_color:   #593d2b;
 $product_link_text_color:   #C13828;
 
+$nav_link_hover_color:		#FBB917;
+
 
 
 /*--------------------------------------*/
@@ -119,6 +121,7 @@ mark {background-color: $link_text_color; color: $layout_background_color; font-
     }
   }
 
+   .navbar-nav a:hover {color: $nav_link_hover_color !important;}
   /*--------------------------------------*/
   /* Lists
   /*--------------------------------------*/

diff --git a/app/overrides/account_page.rb b/app/overrides/account_page.rb
@@ -2,7 +2,7 @@
                      :name => "account_page_spacing",
                      :insert_before => "[data-hook='account_summary']",
                      :text => "<style>\nh3 {margin-top:24px;} #content {width:980px;} table {width:100%;} #user-info td, #user_addresses td{width:50%;}\n</style>\n",
-                     :disabled => false)
+                     :disabled => true)
 
 Deface::Override.new(:virtual_path => "spree/users/show",
                     :name => "account_page_summary",

diff --git a/app/views/spree/taxons/show.html.erb b/app/views/spree/taxons/show.html.erb
@@ -13,10 +13,10 @@
 
 <% unless @taxon.description.blank? %>
 	<div style="min-height:150px;">
-		<div style="float:left;width:48%;text-align:right;">
+		<div class="taxon-image">
 			<%= image_tag @taxon.icon(:product) %>
 		</div>
-		<div style="float:left;width:48%;margin-left:24px;">
+		<div class="taxon-text">
 			<h3 class="taxon-title"><%= accurate_title %></h3>
 			<br />
 			<%= @taxon.description.html_safe %>

diff --git a/spree_reservebar_theme.gemspec b/spree_reservebar_theme.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_reservebar_theme'
-  s.version     = '0.6.1'
+  s.version     = '0.6.2'
   s.summary     = 'Spree Commerce Theme for reservebar.com'
 
   s.author        = 'Thomas Boltze'