raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5189 from Matt-Yorkley/mobile-buttons

Browse Source 
[Mobile UX] Style updates on buttons
This commit is contained in:
Pau Pérez Fabregat
2020-04-23 12:56:49 +02:00
committed by GitHub
parent aa52cf8bf0 538e4e54d2
commit a8ca471cd2
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/darkswarm/branding.css.scss
View File

@@ -54,6 +54,7 @@ $teal-400: #4cb5c5;
$teal-500: #0096ad;
$orange-400: #ff9466;
$orange-450: #f4704c;
$orange-500: #f27052;
$orange-600: #d7583a;

11
app/assets/stylesheets/darkswarm/shopping-cart.css.scss
View File

@@ -115,3 +115,14 @@
height: 36px;
}
}
.links {
.button {
padding: 1.125rem 0 1.1875rem;
width: 210px;
@media all and (max-width: 480px) {
width: 100%;
}
}
}

6
app/assets/stylesheets/darkswarm/ui.css.scss
View File

@@ -64,13 +64,13 @@
.button.primary, button.primary {
font-family: $body-font;
background: $clr-brick;
background: $orange-450;
color: white;
}
.button.primary:hover, .button.primary:active, .button.primary:focus, button.primary:hover, button.primary:active, button.primary:focus {
background: $clr-brick-bright;
text-shadow: 0 1px 0 $clr-brick;
background: $orange-400;
text-shadow: 0 1px 0 $orange-450;
}
button.success, .button.success {

1
app/views/checkout/_summary.html.haml
View File

@@ -31,5 +31,4 @@
//= f.submit "Purchase", class: "button", "ofn-focus" => "accordion['payment']"
%a.button.secondary{href: main_app.cart_url}
%i.ofn-i_008-caret-left
= t :checkout_back_to_cart

12
app/views/spree/orders/form/_cart_links.html.haml
View File

@@ -1,9 +1,5 @@
.row.links{'data-hook' => "cart_buttons"}
.columns.large-8{"data-hook" => ""}
%a.button.large.secondary{href: current_shop_products_path}
%i.ofn-i_008-caret-left
= t :orders_edit_continue
.columns.large-4.text-right
%a#checkout-link.button.large.primary{href: main_app.checkout_path}
= t :orders_edit_checkout
%i.ofn-i_007-caret-right
%a.button.large.secondary{href: current_shop_products_path}
= t :orders_edit_continue
%a#checkout-link.button.large.primary.right{href: main_app.checkout_path}
= t :orders_edit_checkout

2
app/views/spree/orders/form/_update_buttons.html.haml
View File

@@ -3,11 +3,9 @@
- if current_order.nil? || current_order.distributor.nil? || current_order.distributor == @order.distributor
- if current_order&.line_items.present?
= link_to main_app.cart_path, :class => "button expand" do
%i.ofn-i_008-caret-left
= t(:order_back_to_cart)
- else
= link_to "#{main_app.enterprise_shop_path(@order.distributor)}#/shop", class: "button expand" do
%i.ofn-i_008-caret-left
= t(:order_back_to_store)
- else