diff --git a/app/assets/stylesheets/layout/_dashboard.scss b/app/assets/stylesheets/layout/_dashboard.scss index 28c0918..eb66948 100644 --- a/app/assets/stylesheets/layout/_dashboard.scss +++ b/app/assets/stylesheets/layout/_dashboard.scss @@ -1,30 +1,21 @@ -$dash_blue: #4776E6; +$sidebar-bg: #34425A; $sidebar-desktop: 175px; $sidebar-mobile: 60px; .dashboard { - background: -moz-linear-gradient(left, $dash_blue $sidebar-desktop, #ebeef0 $sidebar-desktop, #f5f5f5 100%); /* FF3.6-15 */ - background: -webkit-linear-gradient(left, $dash_blue $sidebar-desktop,#ebeef0 $sidebar-desktop, #f5f5f5 100%); /* Chrome10-25,Safari5.1-6 */ - background: linear-gradient(to right, $dash_blue $sidebar-desktop,#ebeef0 $sidebar-desktop, #f5f5f5 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + background: linear-gradient(to right, $sidebar-bg $sidebar-desktop,#ebeef0 $sidebar-desktop, #f5f5f5 100%); min-height: calc(100vh - 125px); @include respond-to(s) { - background: -moz-linear-gradient(left, $dash_blue $sidebar-mobile, #ebeef0 $sidebar-mobile, #f5f5f5 100%); /* FF3.6-15 */ - background: -webkit-linear-gradient(left, $dash_blue $sidebar-mobile,#ebeef0 $sidebar-mobile, #f5f5f5 100%); /* Chrome10-25,Safari5.1-6 */ - background: linear-gradient(to right, $dash_blue $sidebar-mobile,#ebeef0 $sidebar-mobile, #f5f5f5 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + background: linear-gradient(to right, $sidebar-bg $sidebar-mobile,#ebeef0 $sidebar-mobile, #f5f5f5 100%); + margin-top: 10px; }; @include respond-to(xs) { - background: -moz-linear-gradient(left, $dash_blue $sidebar-mobile, #ebeef0 $sidebar-mobile, #f5f5f5 100%); /* FF3.6-15 */ - background: -webkit-linear-gradient(left, $dash_blue $sidebar-mobile,#ebeef0 $sidebar-mobile, #f5f5f5 100%); /* Chrome10-25,Safari5.1-6 */ - background: linear-gradient(to right, $dash_blue $sidebar-mobile,#ebeef0 $sidebar-mobile, #f5f5f5 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */ + background: linear-gradient(to right, $sidebar-bg $sidebar-mobile,#ebeef0 $sidebar-mobile, #f5f5f5 100%); + margin-top: 10px; }; - // this style fix the margin from the footer to match the sidebar height - + .footer { - margin-top: 0; - } - .container { max-width: 100%; } @@ -51,18 +42,34 @@ $sidebar-mobile: 60px; } &__item { - border-bottom: 1px solid lighten($dash_blue, 5%); + border-bottom: 1px solid lighten($sidebar-bg, 5%); width: 100%; - text-align: center; + text-align: left; + + @include respond-to(s) { + text-align: center; + }; + + @include respond-to(xs) { + text-align: center; + }; } &__link { display: block; - padding: 25px 0 23px; + padding: 19px 0 17px 10px; color: #fff; + @include respond-to(s) { + padding-left: 0; + }; + + @include respond-to(xs) { + padding-left: 0; + }; + &:hover { - background: darken($dash_blue, 5%); + background: darken($sidebar-bg, 5%); color: #fff; text-decoration: none; -webkit-box-shadow: inset 0px -3px 12px 0px rgba(0,0,0,0.15); @@ -71,7 +78,7 @@ $sidebar-mobile: 60px; } &:active, &:focus { - background: darken($dash_blue, 5%); + background: darken($sidebar-bg, 5%); color: #ccc; text-decoration: none; -webkit-box-shadow: inset 0px -3px 12px 0px rgba(0,0,0,0.15); @@ -80,7 +87,16 @@ $sidebar-mobile: 60px; } .fa { - font-size: 22px; + font-size: 14px; + margin-right: 3px; + + @include respond-to(s) { + font-size: 22px; + }; + + @include respond-to(xs) { + font-size: 22px; + }; } } @@ -91,10 +107,9 @@ $sidebar-mobile: 60px; } &__sidebar { - background: $dash_blue; + border-right: 1px solid lighten($sidebar-bg, 5%); float: left; width: $sidebar-desktop; - border-right: 1px solid lighten($dash_blue, 5%); @include respond-to(s) { overflow: hidden; diff --git a/app/views/products/_product.html.erb b/app/views/products/_product.html.erb index f10fa74..8bdf39c 100644 --- a/app/views/products/_product.html.erb +++ b/app/views/products/_product.html.erb @@ -1,30 +1,30 @@ <% cache product do %> -
-
-
- Zoom - | - <%= link_to 'Ver Más', product, class: "productList__more" %> -
+
+
+
+ Zoom + | + <%= link_to 'Ver Más', product, class: "productList__more" %> +
- <%= link_to product do %> - product - <% end %> + <%= link_to product do %> + product + <% end %> -
-

- <%= link_to product.product_name, product, class: 'productList__link' %> -

+
+

+ <%= link_to product.product_name, product, class: 'productList__link' %> +

-

- <%= number_to_currency product.price, precision: 0 %> -

+

+ <%= number_to_currency product.price, precision: 0 %> +

-

- <%= link_to product.store.name, store_path(product.store.slug), class: "productList__store" %> -

+

+ <%= link_to product.store.name, store_path(product.store.slug), class: "productList__store" %> +

+
-
<% end %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 75f63cd..d131a30 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -74,7 +74,7 @@

- <%= link_to edit_product_path(@product) do %> + <%= link_to edit_stores_product_path(@product) do %> <% end %> diff --git a/app/views/shared/dashboard/_sidebar.html.erb b/app/views/shared/dashboard/_sidebar.html.erb index 0ef7bc1..4b5562b 100644 --- a/app/views/shared/dashboard/_sidebar.html.erb +++ b/app/views/shared/dashboard/_sidebar.html.erb @@ -7,7 +7,6 @@
  • <%= link_to new_contact_path, class: 'dashboard__link' do %> -
    <% end %>
    • diff --git a/app/views/shared/menu/_customer_menu.html.erb b/app/views/shared/menu/_customer_menu.html.erb index 6943518..5a967db 100644 --- a/app/views/shared/menu/_customer_menu.html.erb +++ b/app/views/shared/menu/_customer_menu.html.erb @@ -1,7 +1,6 @@
  • <%= link_to customers_dashboard_path, class: "dashboard__link js_instagramLoad" do %> -
    <% end %>
    • @@ -9,15 +8,13 @@
  • <%= link_to customers_dashboard_orders_path, class: "dashboard__link" do %> -
    - Productos comprados + <% end %>
  • <%= link_to edit_user_registration_path, class: "dashboard__link " do %> - -
    - + + <% end %>
    • diff --git a/app/views/shared/menu/_store_menu.html.erb b/app/views/shared/menu/_store_menu.html.erb index 7857e0c..08eea1c 100644 --- a/app/views/shared/menu/_store_menu.html.erb +++ b/app/views/shared/menu/_store_menu.html.erb @@ -1,7 +1,6 @@
  • <%= link_to stores_dashboard_path, class: 'dashboard__link' do %> -
    <% end %>
    • @@ -9,39 +8,34 @@
  • <%= link_to stores_instagram_media_path, class: 'dashboard__link js_instagramLoad' do %> -
    - + <% end %>
  • <%= link_to stores_products_path, class: "dashboard__link" do %> -
    - + <% end %>
  • <%= link_to stores_orders_path, class: "dashboard__link" do %> -
    - + <% end %>
  • <%= link_to edit_user_registration_path, class: "dashboard__link" do %> - -
    - + + <% end %>
  • - <%= link_to store_path(current_user), class: "dashboard__link" do %> - -
    - + <%= link_to store_path(current_user), class: "dashboard__link", target: '_blank' do %> + + <% end %>