Style fixes for sidebar, title, header links

diff --git a/css/app.css b/css/app.css
index 1b2961e..dfe9ec5 100644 (file)
--- a/css/app.css
+++ b/css/app.css
@@ -6340,7 +6340,7 @@ header {
       text-align: center;
       background: url(../assets/repeating-pattern.jpg);
       padding: 5px 0;
-      width: 224px; }
+      width: 324px; }
       header #top-line #cart-login ul {
         list-style: none;
         margin: 0; }
@@ -6529,6 +6529,8 @@ main {
 /* WooCommerce */
 .woocommerce {
   font-family: Arial;
+  /* Sidebar */
+  /* End sidebar */
   /* General CSS */
   /* End General CSS */
   /* Product Detail page */
@@ -6565,24 +6567,6 @@ main {
       text-align: center; }
     .woocommerce #woo-quick-display p {
       margin-bottom: 0; }
-  .woocommerce #woo-quick-cart-icon img {
-    /*        margin: 13px 0 0 13px;*/
-    width: 24px; }
-  .woocommerce #woo-quick-cart-icon > div {
-    float: left; }
-  .woocommerce .woo-quick-cart-image {
-    float: left; }
-    @media only screen and (max-width: 40em) {
-      .woocommerce .woo-quick-cart-image {
-        margin-left: 20px; } }
-  .woocommerce .woo-quick-cart-totals {
-    width: 105px; }
-    @media only screen and (min-width:40.063em) {
-      .woocommerce .woo-quick-cart-totals {
-        margin-left: 30px;
-        margin-top: 10px; } }
-  .woocommerce #woo-quick-checkout button {
-    float: right; }
   .woocommerce ul.products, .woocommerce .products ol, .woocommerce .products dl {
     list-style-type: none; }
   .woocommerce .woocommerce-error, .woocommerce .woocommerce-info, .woocommerce .woocommerce-message, .woocommerce .woocommerce-noreviews, .woocommerce p.no-comments {
@@ -6798,16 +6782,18 @@ main {
     box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.8); }
   .woocommerce #content-wrapper.woocommerce-wrapper .main.woo-single-product {
     padding: 20px 3%; }
-  .woocommerce .shop-sidebar .columns-1 ul.products > li.product {
+  .woocommerce .shop-sidebar {
+    margin-bottom: 20px; }
+  .woocommerce .shop-sidebar ul.products > li.product {
     width: 100%;
     margin-bottom: 0px;
     background-color: white; }
-  .woocommerce .shop-sidebar .columns-1 ul.products {
+  .woocommerce .shop-sidebar ul.products {
     margin-top: 0; }
-  .woocommerce .shop-sidebar .columns-1 ul.products > li.product h3 {
+  .woocommerce .shop-sidebar ul.products > li.product > a > h3 {
+    padding: 5px 0;
     text-align: left;
-    padding: 5px 0 5px 35px;
-    font-weight: normal;
+    font-weight: bold;
     color: white;
     line-height: 1.1; }
   .woocommerce .shop-sidebar {
@@ -6827,6 +6813,12 @@ main {
     .woocommerce .shop-sidebar > li a {
       color: white;
       text-transform: uppercase; }
+  .woocommerce #sidebar-category .shop-sidebar ul.products li.current h3 {
+    color: #0f789f; }
+  .woocommerce #sidebar-category .shop-sidebar ul.products li.current:hover h3 {
+    color: white; }
+  .woocommerce .shop-sidebar ul.products > li.product > a > div > img {
+    display: none; }
   .woocommerce nav.top-bar .top-bar-section > ul > li.drop > ul.dropdown .woocommerce .products {
     position: inherit;
     border: 0 !important; }
@@ -7088,6 +7080,8 @@ main {
       height: 35px; }
   .woocommerce .main.woo-single-product #content .product.has-default-attributes.has-children > .images {
     opacity: 1; }
+  .woocommerce .main.woo-single-product #content .entry-summary .product_title {
+    margin-bottom: 10px; }
   .woocommerce #content ul.products li.product-category.product {
     width: 33.33%;
     float: left;
@@ -7175,6 +7169,8 @@ main {
       text-decoration: none; }
       .woocommerce #content ul.products a:hover {
         text-shadow: none; }
+  .woocommerce header.title {
+    box-shadow: none; }
 
 /* End WooCommerce */
 .pp_content .pp_gallery {
@@ -7182,16 +7178,40 @@ main {
   overflow: hidden;
   width: 0; }
 
-/* Sidebar */
-#sidebar-category .shop-sidebar ul.products li.current h3 {
-  color: #0f789f; }
-#sidebar-category .shop-sidebar ul.products li.current:hover h3 {
-  color: white; }
+#woo-quick-cart-image img {
+  /*        margin: 13px 0 0 13px;*/
+  width: 24px; }
+#woo-quick-cart-image > div {
+  float: left; }
 
-.shop-sidebar ul.products > li.product > a > div > img {
-  display: none; }
+#woo-quick-cart-image {
+  clear: none;
+  display: block;
+  float: left;
+  height: 30px;
+  padding: 2px;
+  width: 25px; }
+
+.woo-quick-cart-totals {
+  width: 105px; }
+  @media only screen and (min-width:40.063em) {
+    .woo-quick-cart-totals {
+      margin-left: 30px;
+      margin-top: 10px; } }
+
+#woo-quick-checkout button {
+  float: right; }
+
+#cart-login > div {
+  float: left;
+  display: block;
+  text-align: center;
+  padding: 0 5px; }
+#cart-login a {
+  color: black; }
+#cart-login a:hover {
+  color: #0f789f; }
 
-/* End sidebar */
 .home-feed-post {
   padding-bottom: 25px; }
   @media only screen and (max-width: 40em) {

diff --git a/header.php b/header.php
index 1852562..4a40fcd 100644 (file)
--- a/header.php
+++ b/header.php
@@ -16,10 +16,24 @@
                         <div id="top-line">
                             <div class="row medium-uncollapse large-collapse">
                                 <div id="cart-login" class="small-12 medium-5 large-3 columns right">
-                                    <ul>
-                                        <li><a>View Cart</a></li>
-                                        <li><a>Register</a> / <a>Login</a></li>
-                                    </ul>
+                                    <div id="woo-quick-cart-image">
+                                        <a href="<?php global $woocommerce;echo $woocommerce->cart->get_cart_url();?>">
+                                            <img src="<?php echo get_template_directory_uri(); ?>/assets/shopping-cart.png">
+                                        </a>
+
+                                    </div>
+                                    <div>
+                                        <a href="<?php echo $woocommerce->cart->get_cart_url();?>"><span>View Cart</span></a> |
+                                    </div>
+                                    <div id="woo-quick-checkout">
+                                    <?php if ( is_user_logged_in() ) { ?>
+                                            <a href="<?php echo get_permalink( get_option('woocommerce_myaccount_page_id') ); ?>" title="<?php _e('My Account','woothemes'); ?>"><?php _e('My Account','woothemes'); ?></a>
+                                            | <a href="<?php echo wp_logout_url()?>">Log Out</a>
+                                     <?php } 
+                                     else { ?>
+                                            <a href="<?php echo get_permalink( get_option('woocommerce_myaccount_page_id') ); ?>" title="<?php _e('Login / Register','woothemes'); ?>"><?php _e('Login / Register','woothemes'); ?></a>
+                                     <?php } ?>
+                                    </div>
                                 </div>
                                 <div class="large-4 columns show-for-large-up">
                                     <h6>888-676-Lama</h6>

diff --git a/parts/shop-sidebar.php b/parts/shop-sidebar.php
index a6fb76c..f16023f 100644 (file)
--- a/parts/shop-sidebar.php
+++ b/parts/shop-sidebar.php
@@ -1,31 +1,11 @@
                 
-                <ul class="sidebar shop-sidebar">
-                    <a href="<?php echo esc_url( get_permalink(18) ); ?>">
+                <div class="sidebar shop-sidebar">
+                    <a href="<?php echo esc_url( get_permalink( woocommerce_get_page_id( 'shop' ) ) ); ?>">
                         <h1>Products</h1>
                     </a>
-                    
-                    <li class="page_item page_item_has_children">
-                        <a href="<?php echo esc_url(get_permalink(18)); ?>">
-                            Categories
-                        </a>
-                    </li>
+
                     <?php echo do_shortcode('[product_categories number="" orderby="name" order="asc" columns="1" hide_empty="0" parent="0" ids=""]'); ?>
-                    <li class="page_item page_item_has_children">
-                        <a href="<?php echo esc_url(get_permalink(19)); ?>">
-                            Cart
-                        </a>
-                    </li>
-                    <li class="page_item page_item_has_children">
-                        <a href="<?php echo esc_url(get_permalink(20)); ?>">
-                            Checkout
-                        </a>
-                    </li>
-                    <li class="page_item page_item_has_children">
-                        <a href="<?php echo esc_url(get_permalink(21)); ?>">
-                            My Account
-                        </a>
-                    </li>
-                </ul>
+                </div>
 
 <script>
 jQuery(document).ready(function($) {

diff --git a/scss/_page.header.scss b/scss/_page.header.scss
index e3f9ad1..5c4ba06 100644 (file)
--- a/scss/_page.header.scss
+++ b/scss/_page.header.scss
@@ -57,7 +57,7 @@ header {
             text-align: center;
             background: url(../assets/repeating-pattern.jpg);
             padding: 5px 0;
-            width: 224px;
+            width: 324px;
             ul {
                 list-style: none;
                 margin: 0;

diff --git a/scss/plugins/_woocommerce.scss b/scss/plugins/_woocommerce.scss
index 75f2853..32a55cd 100644 (file)
--- a/scss/plugins/_woocommerce.scss
+++ b/scss/plugins/_woocommerce.scss
@@ -37,33 +37,6 @@
             margin-bottom: 0;
         }
     }
-    #woo-quick-cart-icon {
-        img {
-    /*        margin: 13px 0 0 13px;*/
-            width: 24px;
-        }
-        > div {
-            float: left;
-        }
-    }
-    .woo-quick-cart-image {
-        float: left;
-        @media #{$small-only} {
-            margin-left:20px;
-        }
-    }
-    .woo-quick-cart-totals {
-        width:105px; 
-        @media #{$medium-up} {
-            margin-left:30px;
-            margin-top: 10px;
-        }
-    }
-    #woo-quick-checkout {
-        button {
-            float: right;
-        }
-    }
     ul.products, .products ol, .products dl {
             list-style-type: none;
     }
@@ -392,18 +365,23 @@
     #content-wrapper.woocommerce-wrapper .main.woo-single-product {
         padding: 20px 3%;
     }
-    .shop-sidebar .columns-1 ul.products > li.product {
+    
+    /* Sidebar */
+    .shop-sidebar {
+        margin-bottom: 20px;
+    }
+    .shop-sidebar ul.products > li.product {
         width: 100%;
         margin-bottom: 0px;
         background-color: white;
     }
-    .shop-sidebar .columns-1 ul.products {
+    .shop-sidebar ul.products {
         margin-top: 0;
     }
-    .shop-sidebar .columns-1 ul.products > li.product h3 {
+    .shop-sidebar ul.products > li.product > a > h3 {
+        padding: 5px 0;
         text-align: left;
-        padding: 5px 0 5px 35px;
-        font-weight: normal;
+        font-weight: bold;
         color: white;
         line-height: 1.1;
     }
@@ -431,6 +409,20 @@
             text-transform: uppercase;
         }
     }
+    #sidebar-category .shop-sidebar ul.products li.current {
+        h3 {
+            color: $blue;
+        }
+
+        &:hover h3 {
+            color: white;
+        }
+    }
+
+    .shop-sidebar ul.products > li.product > a > div > img {
+        display: none;
+    }
+    /* End sidebar */
     nav.top-bar .top-bar-section > ul > li.drop > ul.dropdown .woocommerce { 
         .products {
             position: inherit;
@@ -796,6 +788,9 @@
                 opacity: 1;
             }
         }
+        .entry-summary .product_title {
+            margin-bottom: 10px;
+        }
     }
     /* End product detail page */
 
@@ -918,7 +913,9 @@
         }
     }
     /* End Products page */
-    
+    header.title {
+        box-shadow: none;
+    }
 }/* End WooCommerce */ 
 
 .pp_content .pp_gallery {
@@ -926,18 +923,49 @@
     overflow: hidden;
     width: 0;
 }
-
-/* Sidebar */
-#sidebar-category .shop-sidebar ul.products li.current {
-    h3 {
-        color: $blue;
+#woo-quick-cart-image {
+    img {
+/*        margin: 13px 0 0 13px;*/
+        width: 24px;
     }
-
-    &:hover h3 {
-        color: white;
+    > div {
+        float: left;
+    }
+    span {
+        
     }
 }
-.shop-sidebar ul.products > li.product > a > div > img {
-    display: none;
+#woo-quick-cart-image {
+    clear: none;
+    display: block;
+    float: left;
+    height: 30px;
+    padding: 2px;
+    width: 25px;
+}
+.woo-quick-cart-totals {
+    width:105px; 
+    @media #{$medium-up} {
+        margin-left:30px;
+        margin-top: 10px;
+    }
+}
+#woo-quick-checkout {
+    button {
+        float: right;
+    }
+}
+#cart-login {
+    > div {
+        float: left;
+        display: block;
+        text-align: center;
+        padding: 0 5px;
+    }
+    a {
+        color: black;
+    }
+    a:hover {
+        color: $blue;
+    }
 }
-/* End sidebar */