diff --git a/app/assets/stylesheets/admin/components/navigation.scss b/app/assets/stylesheets/admin/components/navigation.scss index c90f4b736a..6ad0eaeca2 100644 --- a/app/assets/stylesheets/admin/components/navigation.scss +++ b/app/assets/stylesheets/admin/components/navigation.scss @@ -160,3 +160,11 @@ nav.menu { } } } + +#header figure { + margin: 0.25em 0; +} + +#login-nav { + line-height: 1.75em; +} diff --git a/app/views/admin/enterprise_groups/_form.html.haml b/app/views/admin/enterprise_groups/_form.html.haml index 39a4b8bd1e..4bc31bd81a 100644 --- a/app/views/admin/enterprise_groups/_form.html.haml +++ b/app/views/admin/enterprise_groups/_form.html.haml @@ -6,7 +6,7 @@ .four.columns.alpha = render 'admin/shared/side_menu' .one.column   - .eleven.columns.omega.fullwidth_inputs + .eight.columns.omega.fullwidth_inputs = render 'form_primary_details', f: f = render 'form_users', f: f = render 'form_about', f: f diff --git a/app/views/admin/enterprises/form/_shop_preferences.html.haml b/app/views/admin/enterprises/form/_shop_preferences.html.haml index 15fd2daad4..a04b09508f 100644 --- a/app/views/admin/enterprises/form/_shop_preferences.html.haml +++ b/app/views/admin/enterprises/form/_shop_preferences.html.haml @@ -1,104 +1,95 @@ .row - .alpha.eleven.columns - .three.columns.alpha - = f.label "enterprise_preferred_shopfront_message", t('.shopfront_message') - .eight.columns.omega - %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_message', 'id' => 'enterprise_preferred_shopfront_message', 'name' => 'enterprise[preferred_shopfront_message]', 'class' => 'text-angular textangular-strip', 'ta-paste' => "stripFormatting($html)", "textangular-links-target-blank" => true, - 'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]", - 'placeholder' => t('.shopfront_message_placeholder')} + .three.columns.alpha + = f.label "enterprise_preferred_shopfront_message", t('.shopfront_message') + .eight.columns.omega + %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_message', 'id' => 'enterprise_preferred_shopfront_message', 'name' => 'enterprise[preferred_shopfront_message]', 'class' => 'text-angular textangular-strip', 'ta-paste' => "stripFormatting($html)", "textangular-links-target-blank" => true, + 'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]", + 'placeholder' => t('.shopfront_message_placeholder')} .row - .alpha.eleven.columns - .three.columns.alpha - = f.label "enterprise_preferred_shopfront_closed_message", t('.shopfront_closed_message') - .eight.columns.omega - %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_closed_message', 'id' => 'enterprise_preferred_shopfront_closed_message', 'name' => 'enterprise[preferred_shopfront_closed_message]', 'class' => 'text-angular textangular-strip', 'ta-paste' => "stripFormatting($html)", "textangular-links-target-blank" => true, - 'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]", - 'placeholder' => t('.shopfront_closed_message_placeholder')} + .three.columns.alpha + = f.label "enterprise_preferred_shopfront_closed_message", t('.shopfront_closed_message') + .eight.columns.omega + %text-angular{'ng-model' => 'Enterprise.preferred_shopfront_closed_message', 'id' => 'enterprise_preferred_shopfront_closed_message', 'name' => 'enterprise[preferred_shopfront_closed_message]', 'class' => 'text-angular textangular-strip', 'ta-paste' => "stripFormatting($html)", "textangular-links-target-blank" => true, + 'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]", + 'placeholder' => t('.shopfront_closed_message_placeholder')} .row - .alpha.eleven.columns - .three.columns.alpha - = f.label "enterprise_preferred_shopfront_taxon_order", t('.shopfront_category_ordering') - %br - = t('.shopfront_category_ordering_note') - .eight.columns.omega - %textarea.fullwidth{ id: 'enterprise_preferred_shopfront_taxon_order', name: 'enterprise[preferred_shopfront_taxon_order]', rows: 6, 'ng-model' => 'Enterprise.preferred_shopfront_taxon_order', 'ofn-taxon-autocomplete' => '', 'multiple-selection' => 'true', placeholder: 'Category' } + .three.columns.alpha + = f.label "enterprise_preferred_shopfront_taxon_order", t('.shopfront_category_ordering') + %br + = t('.shopfront_category_ordering_note') + .eight.columns.omega + %textarea.fullwidth{ id: 'enterprise_preferred_shopfront_taxon_order', name: 'enterprise[preferred_shopfront_taxon_order]', rows: 6, 'ng-model' => 'Enterprise.preferred_shopfront_taxon_order', 'ofn-taxon-autocomplete' => '', 'multiple-selection' => 'true', placeholder: 'Category' } .row - .alpha.eleven.columns - .three.columns.alpha - = f.label "enterprise_preferred_shopfront_order_cycle_order", t(:sort_order_cycles_on_shopfront_by) - .three.columns - = radio_button :enterprise, :preferred_shopfront_order_cycle_order, :orders_open_at, { 'ng-model' => 'Enterprise.preferred_shopfront_order_cycle_order' } - = label :enterprise, :preferred_shopfront_order_cycle_order_orders_open_at, t('.open_date') - .five.columns.omega - = radio_button :enterprise, :preferred_shopfront_order_cycle_order, :orders_close_at, { 'ng-model' => 'Enterprise.preferred_shopfront_order_cycle_order' } - = label :enterprise, :preferred_shopfront_order_cycle_order_orders_close_at, t('.close_date') + .three.columns.alpha + = f.label "enterprise_preferred_shopfront_order_cycle_order", t(:sort_order_cycles_on_shopfront_by) + .three.columns + = radio_button :enterprise, :preferred_shopfront_order_cycle_order, :orders_open_at, { 'ng-model' => 'Enterprise.preferred_shopfront_order_cycle_order' } + = label :enterprise, :preferred_shopfront_order_cycle_order_orders_open_at, t('.open_date') + .five.columns.omega + = radio_button :enterprise, :preferred_shopfront_order_cycle_order, :orders_close_at, { 'ng-model' => 'Enterprise.preferred_shopfront_order_cycle_order' } + = label :enterprise, :preferred_shopfront_order_cycle_order_orders_close_at, t('.close_date') .row - .alpha.eleven.columns - .three.columns.alpha - %label= t '.shopfront_requires_login' - %div{'ofn-with-tip' => t('.shopfront_requires_login_tip')} - %a= t 'admin.whats_this' - .three.columns - = f.radio_button :require_login, false, "ng-model" => "Enterprise.require_login", "ng-value" => "false" - = f.label :require_login, t('.shopfront_requires_login_false'), value: :false - .five.columns.omega - = f.radio_button :require_login, true, "ng-model" => "Enterprise.require_login", "ng-value" => "true" - = f.label :require_login, t('.shopfront_requires_login_true'), value: :true + .three.columns.alpha + %label= t '.shopfront_requires_login' + %div{'ofn-with-tip' => t('.shopfront_requires_login_tip')} + %a= t 'admin.whats_this' + .three.columns + = f.radio_button :require_login, false, "ng-model" => "Enterprise.require_login", "ng-value" => "false" + = f.label :require_login, t('.shopfront_requires_login_false'), value: :false + .five.columns.omega + = f.radio_button :require_login, true, "ng-model" => "Enterprise.require_login", "ng-value" => "true" + = f.label :require_login, t('.shopfront_requires_login_true'), value: :true .row{ng: {if: "!Enterprise.require_login"}} - .alpha.eleven.columns - .three.columns.alpha - %label= t '.allow_guest_orders' - %div{'ofn-with-tip' => t('.allow_guest_orders_tip')} - %a= t 'admin.whats_this' - .eight.columns.omega - .row - .three.columns.alpha - = f.radio_button :allow_guest_orders, true, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "true" - = f.label :allow_guest_orders, t('.allow_guest_orders_true'), value: :true - .five.columns.omega - = f.radio_button :allow_guest_orders, false, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "false" - = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false - .row.warning{ng: {show: 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes'}} - .eight.columns.alpha.omega - %i.icon-warning-sign - = t '.recommend_require_login' + .three.columns.alpha + %label= t '.allow_guest_orders' + %div{'ofn-with-tip' => t('.allow_guest_orders_tip')} + %a= t 'admin.whats_this' + .eight.columns.omega + .row + .three.columns.alpha + = f.radio_button :allow_guest_orders, true, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "true" + = f.label :allow_guest_orders, t('.allow_guest_orders_true'), value: :true + .five.columns.omega + = f.radio_button :allow_guest_orders, false, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "false" + = f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false + .row.warning{ng: {show: 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes'}} + .eight.columns.alpha.omega + %i.icon-warning-sign + = t '.recommend_require_login' .row - .alpha.eleven.columns - .three.columns.alpha - %label= t '.allow_order_changes' - %div{'ofn-with-tip' => t('.allow_order_changes_tip')} - %a= t 'admin.whats_this' - .three.columns - = f.radio_button :allow_order_changes, false, "ng-model" => "Enterprise.allow_order_changes", "ng-value" => "false" - = f.label :allow_order_changes, t('.allow_order_changes_false'), value: :false - .five.columns.omega - = f.radio_button :allow_order_changes, true, "ng-model" => "Enterprise.allow_order_changes", "ng-value" => "true" - = f.label :allow_order_changes, t('.allow_order_changes_true'), value: :true + .three.columns.alpha + %label= t '.allow_order_changes' + %div{'ofn-with-tip' => t('.allow_order_changes_tip')} + %a= t 'admin.whats_this' + .three.columns + = f.radio_button :allow_order_changes, false, "ng-model" => "Enterprise.allow_order_changes", "ng-value" => "false" + = f.label :allow_order_changes, t('.allow_order_changes_false'), value: :false + .five.columns.omega + = f.radio_button :allow_order_changes, true, "ng-model" => "Enterprise.allow_order_changes", "ng-value" => "true" + = f.label :allow_order_changes, t('.allow_order_changes_true'), value: :true .row - .alpha.eleven.columns - .three.columns.alpha - %label= t '.enable_subscriptions' - %div{'ofn-with-tip' => t('.enable_subscriptions_tip')} - %a= t 'admin.whats_this' - .three.columns - = f.radio_button :enable_subscriptions, true - = f.label :enable_subscriptions, t('.enable_subscriptions_true'), value: :true - .five.columns.omega - = f.radio_button :enable_subscriptions, false - = f.label :enable_subscriptions, t('.enable_subscriptions_false'), value: :false + .three.columns.alpha + %label= t '.enable_subscriptions' + %div{'ofn-with-tip' => t('.enable_subscriptions_tip')} + %a= t 'admin.whats_this' + .three.columns + = f.radio_button :enable_subscriptions, true + = f.label :enable_subscriptions, t('.enable_subscriptions_true'), value: :true + .five.columns.omega + = f.radio_button :enable_subscriptions, false + = f.label :enable_subscriptions, t('.enable_subscriptions_false'), value: :false .row - .alpha.eleven.columns - .three.columns.alpha - %label= t '.customer_names_in_reports' - %div{'ofn-with-tip' => t('.customer_names_tip')} - %a= t 'admin.whats_this' - .three.columns - = radio_button :enterprise, :preferred_show_customer_names_to_suppliers, true - = label :enterprise_preferred_show_customer_names_to_suppliers, t('.customer_names_true'), value: :true - .five.columns.omega - = radio_button :enterprise, :preferred_show_customer_names_to_suppliers, false - = label :enterprise_preferred_show_customer_names_to_suppliers, t('.customer_names_false'), value: :false + .three.columns.alpha + %label= t '.customer_names_in_reports' + %div{'ofn-with-tip' => t('.customer_names_tip')} + %a= t 'admin.whats_this' + .three.columns + = radio_button :enterprise, :preferred_show_customer_names_to_suppliers, true + = label :enterprise_preferred_show_customer_names_to_suppliers, t('.customer_names_true'), value: :true + .five.columns.omega + = radio_button :enterprise, :preferred_show_customer_names_to_suppliers, false + = label :enterprise_preferred_show_customer_names_to_suppliers, t('.customer_names_false'), value: :false diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 50fff333aa..a6d5f6d05c 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -21,12 +21,12 @@ %label{ :for => 'start_date_filter' } = t("admin.start_date") %br - %input{ :class => "two columns alpha", :type => "text", :id => 'start_date_filter', 'ng-model' => 'startDate', 'datepicker' => "startDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()', 'ng-model-options' => '{ debounce: 1000 }' } + %input.fullwidth{ :type => "text", :id => 'start_date_filter', 'ng-model' => 'startDate', 'datepicker' => "startDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()', 'ng-model-options' => '{ debounce: 1000 }' } .date_filter{ :class => "two columns" } %label{ :for => 'end_date_filter' } = t("admin.end_date") %br - %input{ :class => "two columns alpha", :type => "text", :id => 'end_date_filter', 'ng-model' => 'endDate', 'datepicker' => "endDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()', 'ng-model-options' => '{ debounce: 1000 }' } + %input.fullwidth{ :type => "text", :id => 'end_date_filter', 'ng-model' => 'endDate', 'datepicker' => "endDate", 'confirm-change' => "confirmRefresh()", 'ng-change' => 'refreshData()', 'ng-model-options' => '{ debounce: 1000 }' } .one.column   .filter_select{ :class => "three columns" } %label{ :for => 'supplier_filter' } diff --git a/app/views/spree/admin/orders/customer_details/_form.html.haml b/app/views/spree/admin/orders/customer_details/_form.html.haml index 5ac4e15a52..772dc48df1 100644 --- a/app/views/spree/admin/orders/customer_details/_form.html.haml +++ b/app/views/spree/admin/orders/customer_details/_form.html.haml @@ -7,13 +7,13 @@ = f.label :email, Spree.t(:email) + ':' = f.email_field :email, :class => 'fullwidth' - .alpha.six.columns{"data-hook" => "bill_address_wrapper"} + .alpha.eight.columns{"data-hook" => "bill_address_wrapper"} %fieldset.no-border-bottom %legend{:align => "center"}= Spree.t(:billing_address) = f.fields_for :bill_address do |ba_form| = render :partial => 'address_form', :locals => { :f => ba_form, :name => Spree.t(:billing_address), :use_billing => false } - .omega.six.columns{"data-hook" => "ship_address_wrapper"} + .omega.eight.columns{"data-hook" => "ship_address_wrapper"} %fieldset.no-border-bottom %legend{:align => "center"}= Spree.t(:shipping_address) = f.fields_for :ship_address do |sa_form| diff --git a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml index e53f9e436e..5004d1d987 100644 --- a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml +++ b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml @@ -34,7 +34,7 @@ %a.close{ href: "#" } × .row - .alpha.seven.columns.dashboard_item.single-ent#map + .alpha.eight.columns.dashboard_item.single-ent#map .header %h3 %span.icon-user @@ -45,10 +45,8 @@ = @enterprise.name = t "live" %span.icon-arrow-right - .two.columns -   - .seven.columns.omega.dashboard_item.single-ent#edit + .eight.columns.omega.dashboard_item.single-ent#edit .header %h3 %span.icon-edit @@ -63,7 +61,7 @@ .row - if can? :admin, Spree::Product - .seven.columns.alpha.dashboard_item.single-ent#products + .eight.columns.alpha.dashboard_item.single-ent#products .header %h3 %span.icon-th-large @@ -73,11 +71,8 @@ = t "manage_products" %span.icon-arrow-right - .two.columns -   - - if can? :admin, OrderCycle - .seven.columns.omega.dashboard_item.single-ent#order_cycles + .eight.columns.omega.dashboard_item.single-ent#order_cycles .header %h3 %span.icon-shopping-cart diff --git a/app/views/spree/admin/products/_form.html.haml b/app/views/spree/admin/products/_form.html.haml index 08386e10dd..ff97183eca 100644 --- a/app/views/spree/admin/products/_form.html.haml +++ b/app/views/spree/admin/products/_form.html.haml @@ -1,5 +1,5 @@ %div{"data-hook" => "admin_product_form_fields"} - .left.eight.columns.alpha + .left.twelve.columns.alpha = f.field_container :name do = f.label :name, raw(t(:name) + content_tag(:span, ' *', :class => 'required')) = f.text_field :name, :class => 'fullwidth title' diff --git a/app/views/spree/admin/reports/index.html.haml b/app/views/spree/admin/reports/index.html.haml index cc5205c885..533eab2de1 100644 --- a/app/views/spree/admin/reports/index.html.haml +++ b/app/views/spree/admin/reports/index.html.haml @@ -1,13 +1,14 @@ - content_for :page_title do = t(:listing_reports) -%table.index - %thead - %tr - %th= t(:name) - %th= t(:description) - %tbody - - @reports.each do |key, value| +.columns.twelve + %table.index + %thead %tr - %td= link_to value[:name], value[:url] - %td= value[:description] + %th= t(:name) + %th= t(:description) + %tbody + - @reports.each do |key, value| + %tr + %td= link_to value[:name], value[:url] + %td= value[:description] diff --git a/app/views/spree/layouts/_admin_body.html.haml b/app/views/spree/layouts/_admin_body.html.haml index 1f3dcce205..ab1e7f0a89 100644 --- a/app/views/spree/layouts/_admin_body.html.haml +++ b/app/views/spree/layouts/_admin_body.html.haml @@ -19,7 +19,7 @@ = render :partial => 'spree/layouts/admin/login_nav' %nav#admin-menu{ data: { hook: '' }} - .container + .container.no-gutter .sixteen.columns.main-menu-wrapper %ul.inline-menu.fullwidth-menu{"data-hook" => "admin_tabs"} = render :partial => 'spree/admin/shared/tabs'