raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10779 from dacook/10634-remove-admin_style_v2

Browse Source 
10634 Remove admin_style_v2 feature
This commit is contained in:
Filipe
2023-05-17 15:37:05 +01:00
committed by GitHub
parent 19caadb1a0 04a5c7452e
commit 0d23b63bbd
39 changed files with 60 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/spree/admin/navigation_helper.rb
View File

@@ -34,7 +34,6 @@ module Spree
link = link_to_with_icon(options[:icon], titleized_label, destination_url)
css_classes << 'tab-with-icon'
else
titleized_label = raw("<span class='text'>#{titleized_label}</span>")
link = link_to(titleized_label, destination_url)
end

2
app/helpers/spree/admin/orders_helper.rb
View File

@@ -112,7 +112,7 @@ module Spree
event_label = I18n.t("cancel", scope: "actions")
button_link_to(event_label,
fire_admin_order_url(@order, e: "cancel"),
method: :put, icon: "icon-remove", form_id: "cancel_order_form")
method: :put, icon: "icon-cancel", form_id: "cancel_order_form")
end
def resume_event_link

2
app/views/admin/order_cycles/_add_exchange_form.html.haml
View File

@@ -3,4 +3,4 @@
{{ enterprise.name }}
= "{{ enterprise.issues_summary_#{type} ? '('+enterprise.issues_summary_#{type}+')' : '' }}"
= f.submit t(".add_#{type}"), 'ng-click' => "add#{type.capitalize}($event)", 'ng-disabled' => "!new_#{type}_id || !OrderCycle.novel#{type.capitalize}(new_#{type}_id)", "class": "secondary"
= f.submit t(".add_#{type}"), 'ng-click' => "add#{type.capitalize}($event)", 'ng-disabled' => "!new_#{type}_id || !OrderCycle.novel#{type.capitalize}(new_#{type}_id)"

7
app/views/admin/order_cycles/_exchange_form.html.haml
View File

@@ -26,16 +26,15 @@
= f.submit t('.add_fee'), 'ng-click' => 'addExchangeFee($event, exchange)', 'ng-hide' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator'
%td.actions
.flex
%a{'ng-click' => 'removeExchange($event, exchange)', :class => "icon-trash no-text remove-exchange"}
%a{'ng-click' => 'removeExchange($event, exchange)', :class => "icon-trash no-text remove-exchange"}
- if type == 'supplier'
%tr.panel-row{ object: "exchange",
panels: "{products: 'exchange_products_supplied'}",
locals: "$index,exchangeTotalVariants,order_cycle,exchange,enterprises,setExchangeVariants,selectAllVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
colspan: if feature?(:admin_style_v2, spree_current_user) then 5 else 4 end }
colspan: 4 }
- if type == 'distributor'
%tr.panel-row{ object: "exchange",
panels: "{products: 'exchange_products_distributed', tags: 'exchange_tags'}",
locals: "$index,exchangeTotalVariants,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading",
colspan: if feature?(:admin_style_v2, spree_current_user) then 6 else 5 end }
colspan: 5 }

12
app/views/admin/order_cycles/_header.html.haml
View File

@@ -1,16 +1,16 @@
%colgroup
%col{ ng: { show: 'columns.name.visible' } }
%col{ ng: { show: 'columns.schedules.visible' } }
%col{ ng: { show: 'columns.open.visible' } }
%col{ ng: { show: 'columns.close.visible' } }
%col{ ng: { show: 'columns.open.visible' }, style: 'width: 20%;' }
%col{ ng: { show: 'columns.close.visible' }, style: 'width: 20%;' }
- unless simple_index
%col{ ng: { show: 'columns.producers.visible' } }
%col{ ng: { show: 'columns.coordinator.visible' } }
%col{ ng: { show: 'columns.shops.visible' } }
%col{ ng: { show: 'columns.products.visible' } }
%col
%col
%col
%col{ style: 'width: 5%;' }
%col{ style: 'width: 5%;' }
%col{ style: 'width: 5%;' }
%thead
%tr
@@ -32,3 +32,5 @@
%th{ ng: { show: 'columns.products.visible' } }
=t :products
%th.actions
%th.actions
%th.actions

11
app/views/admin/order_cycles/_row.html.haml
View File

@@ -32,9 +32,8 @@
= t('.variants')
%td.actions
.flex
%a.edit-order-cycle.icon-edit.no-text{ ng: { href: '{{orderCycle.edit_path}}'}, 'ofn-with-tip' => t(:edit) }
%div{ ng: { if: 'orderCycle.viewing_as_coordinator' } }
%a.clone-order-cycle.icon-copy.no-text{ ng: { href: '{{orderCycle.clone_path}}'}, 'ofn-with-tip' => t(:clone) }
%div{ ng: { if: 'orderCycle.deletable && orderCycle.viewing_as_coordinator' }}
%a.delete-order-cycle.icon-trash.no-text{ ng: { href: '{{orderCycle.delete_path}}'}, data: { method: 'delete', confirm: t(:are_you_sure) }, 'ofn-with-tip' => t(:remove) }
%a.edit-order-cycle.icon-edit.no-text{ ng: { href: '{{orderCycle.edit_path}}'}, 'ofn-with-tip' => t(:edit) }
%td.actions{ ng: { if: 'orderCycle.viewing_as_coordinator' } }
%a.clone-order-cycle.icon-copy.no-text{ ng: { href: '{{orderCycle.clone_path}}'}, 'ofn-with-tip' => t(:clone) }
%td.actions{ ng: { if: 'orderCycle.deletable && orderCycle.viewing_as_coordinator' }}
%a.delete-order-cycle.icon-trash.no-text{ ng: { href: '{{orderCycle.delete_path}}'}, data: { method: 'delete', confirm: t(:are_you_sure) }, 'ofn-with-tip' => t(:remove) }

2
app/views/spree/admin/orders/_filters.html.haml
View File

@@ -54,6 +54,6 @@
.actions.filter-actions
%a.button.icon-search{'ng-click' => 'fetchResults()'}
= t(:filter_results)
%a.button{'ng-click' => 'clearFilters()', "id": "clear_filters_button", "class": ("secondary" if feature?(:admin_style_v2, spree_current_user)) }
%a.button{'ng-click' => 'clearFilters()', "id": "clear_filters_button"}
= t(:clear_filters)

7
app/views/spree/admin/orders/_note.html.haml
View File

@@ -20,8 +20,7 @@
= t(".no_note_present")
%td.actions
.flex
= link_to '', '', class: 'edit-note icon_link icon-edit no-text with-tip', data: { action: 'edit' }, title: Spree.t('edit')
- if @order.note.present?
= link_to '', '', class: 'delete-note icon_link icon-trash no-text with-tip', data: { action: 'remove' }, title: Spree.t('delete')
= link_to '', '', class: 'edit-note icon_link icon-edit no-text with-tip', data: { action: 'edit' }, title: Spree.t('edit')
- if @order.note.present?
= link_to '', '', class: 'delete-note icon_link icon-trash no-text with-tip', data: { action: 'remove' }, title: Spree.t('delete')

18
app/views/spree/admin/orders/_shipment.html.haml
View File

@@ -26,7 +26,7 @@
= Spree.t(:price)
%th
= Spree.t(:quantity)
%th.force-rounded-right
%th
= Spree.t(:total)
%th.orders-actions.actions
@@ -57,8 +57,8 @@
%span
= shipment.fee_adjustment.display_amount
%td.actions
- if shipment.fee_adjustment.present? && shipment.can_modify?
- if shipment.fee_adjustment.present? && shipment.can_modify?
%td.actions
- if can? :update, shipment
= link_to '', '', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')
@@ -70,9 +70,8 @@
%td.actions
- if can?(:update, shipment) && !shipment.canceled?
.flex
= link_to '', '', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'save' }, :title => I18n.t('actions.save')
= link_to '', '', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => { :action => 'cancel' }, :title => I18n.t('actions.cancel')
= link_to '', '', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'save' }, :title => I18n.t('actions.save')
= link_to '', '', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => { :action => 'cancel' }, :title => I18n.t('actions.cancel')
%tr.show-tracking.total
%td{ :colspan => "5" }
@@ -85,7 +84,6 @@
%td.actions
- if can?(:update, shipment) && shipment.can_modify?
.flex
= link_to '', '', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')
- if shipment.tracking.present?
= link_to '', '', :class => 'delete-tracking icon_link icon-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'remove' }, :title => Spree.t('delete')
= link_to '', '', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')
- if shipment.tracking.present?
= link_to '', '', :class => 'delete-tracking icon_link icon-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'remove' }, :title => Spree.t('delete')

9
app/views/spree/admin/orders/_shipment_manifest.html.haml
View File

@@ -19,11 +19,10 @@
%td.cart-item-delete.actions
- if shipment.can_modify? && can?(:update, shipment)
.flex
= link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => t('actions.save'), :style => 'display: none'
= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('actions.cancel'), :style => 'display: none'
= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('actions.edit')
= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => t('actions.delete')
= link_to '', '#', :class => 'save-item icon_link icon-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => t('actions.save'), :style => 'display: none'
= link_to '', '#', :class => 'cancel-item icon_link icon-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => t('actions.cancel'), :style => 'display: none'
= link_to '', '#', :class => 'edit-item icon_link icon-edit no-text with-tip', :data => {:action => 'edit'}, :title => t('actions.edit')
= link_to '', '#', :class => 'delete-item icon-trash no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'remove'}, :title => t('actions.delete')
= render 'spree/admin/shared/custom-alert'
= render 'spree/admin/shared/custom-confirm'

2
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -52,7 +52,7 @@
.actions.filter-actions
%a.button.icon-search{'ng-click' => 'refreshData()'}
= t(:filter_results)
%a.button{'ng-click' => 'resetSelectFilters()', "id": "clear_filters_button", "class": ("secondary" if feature?(:admin_style_v2, spree_current_user)) }
%a.button{'ng-click' => 'resetSelectFilters()', "id": "clear_filters_button" }
= t(:clear_filters)
%hr.divider.sixteen.columns.alpha.omega{ ng: { show: 'unitsVariantSelected()' } }

22
app/views/spree/admin/orders/index.html.haml
View File

@@ -100,17 +100,17 @@
%td.align-center
%span{'ng-bind-html' => 'order.display_total'}
%td.actions
.flex
%div.row-loading-icons
%div{ng: {show: 'rowStatus[order.id] == "loading"', cloak: true}, style: "width: 30px; height: 30px;"}
= render partial: "components/spinner"
%i.success.icon-ok-sign{ng: {show: 'rowStatus[order.id] == "success"'} }
%i.error.icon-remove-sign.with-tip{ng: {show: 'rowStatus[order.id] == "error"'}, 'ofn-with-tip' => t('.order_not_updated')}
%a.icon_link.with-tip.icon-edit.no-text{'ng-href' => '{{order.edit_path}}', 'data-action' => 'edit', 'ofn-with-tip' => t('.edit')}
%div{'ng-if' => 'order.ready_to_ship'}
%button.icon-road.icon_link.with-tip.no-text{'ng-click' => 'shipOrder(order)', rel: 'nofollow', 'ofn-with-tip' => t('.ship')}
%div{'ng-if' => 'order.ready_to_capture'}
%button.icon-capture.icon_link.no-text{'ng-click' => 'capturePayment(order)', rel: 'nofollow', 'ofn-with-tip' => t('.capture')}
%div.row-loading-icons
%div{ng: {show: 'rowStatus[order.id] == "loading"', cloak: true}, style: "width: 30px; height: 30px;"}
= render partial: "components/spinner"
%i.success.icon-ok-sign{ng: {show: 'rowStatus[order.id] == "success"'} }
%i.error.icon-remove-sign.with-tip{ng: {show: 'rowStatus[order.id] == "error"'}, 'ofn-with-tip' => t('.order_not_updated')}
%a.icon_link.with-tip.icon-edit.no-text{'ng-href' => '{{order.edit_path}}', 'data-action' => 'edit', 'ofn-with-tip' => t('.edit')}
%div{'ng-if' => 'order.ready_to_ship'}
%button.icon-road.icon_link.with-tip.no-text{'ng-click' => 'shipOrder(order)', rel: 'nofollow', 'ofn-with-tip' => t('.ship')}
%div{'ng-if' => 'order.ready_to_capture'}
%button.icon-capture.icon_link.no-text{'ng-click' => 'capturePayment(order)', rel: 'nofollow', 'ofn-with-tip' => t('.capture')}
.sixteen.columns.alpha#loading{ 'ng-show' => 'RequestMonitor.loading' }
= render partial: "components/admin_spinner"
%h1

5
app/views/spree/admin/payments/_list.html.haml
View File

@@ -15,6 +15,5 @@
%td.align-center
%span{class: "state #{payment.state}"}= t(payment.state, scope: "spree.payment_states", default: payment.state.capitalize)
%td.actions
.flex
- payment.actions.each do |action|
= link_to_with_icon "icon-#{action}", Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: {action: action, disable_with: ""}
- payment.actions.each do |action|
= link_to_with_icon "icon-#{action}", Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: {action: action, disable_with: ""}

7
app/views/spree/admin/shared/_head.html.haml
View File

@@ -12,12 +12,9 @@
= t(controller.controller_name, :default => controller.controller_name.titleize)
= " - OFN #{t(:administration)}"
%link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600,700&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"}
%link{:href => "https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"}
- if feature?(:admin_style_v2, spree_current_user)
= stylesheet_pack_tag 'admin-styles-v2', media: "screen, print"
- else
= stylesheet_pack_tag 'admin-styles', media: "screen, print"
= stylesheet_pack_tag 'admin-styles', media: "screen, print"
= render "layouts/bugsnag_js"
= javascript_include_tag 'admin/all'

2
app/views/spree/layouts/admin.html.haml
View File

@@ -3,7 +3,7 @@
%head
= render :partial => 'spree/admin/shared/head'
%body.admin{ "class": ("admin-v2" if feature?(:admin_style_v2, spree_current_user)) }
%body.admin
- if content_for?(:main_ng_app_name)
- if content_for?(:main_ng_ctrl_name)
%div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe, "ng-controller" => yield(:main_ng_ctrl_name).strip.html_safe }

1
app/webpacker/css/admin/all.scss
View File

@@ -129,3 +129,4 @@
@import "app/components/table_header_component/table_header_component";
@import "app/components/search_input_component/search_input_component";
@import "app/components/confirm_modal_component/confirm_modal_component";

1
app/webpacker/css/admin/components/navigation.scss
View File

@@ -78,6 +78,7 @@ nav.menu {
text-transform: uppercase;
position: relative;
text-align: center;
font-weight: 600;
i {
display: inline;

16
app/webpacker/css/admin/globals/palette.scss
View File

@@ -1,16 +0,0 @@
// Basic color palette for admin
$color-1: #FFFFFF !default; // White
$color-2: #9FC820 !default; // Green
$color-3: #5498DA !default; // Light Blue
$color-4: #6788A2 !default; // Dark Blue
$color-5: #C60F13 !default; // Red
$color-6: #FF9300 !default; // Yellow
@mixin basicColorPalette($color1, $color2, $color3, $color4, $color5, $color6) {
$color-1: $color1 !global;
$color-2: $color2 !global;
$color-3: $color3 !global;
$color-4: $color4 !global;
$color-5: $color5 !global;
$color-6: $color6 !global;
}

8
app/webpacker/css/admin/globals/variables.scss
View File

@@ -9,6 +9,14 @@ $base-font-family: "Open Sans", "Helvetica Neue", "Helvetica", Helvetica, Arial,
// Colors
//--------------------------------------------------------------
// Basic color palette for admin
$color-1: #FFFFFF !default; // White
$color-2: #9FC820 !default; // Green
$color-3: #5498DA !default; // Light Blue
$color-4: #6788A2 !default; // Dark Blue
$color-5: #C60F13 !default; // Red
$color-6: #FF9300 !default; // Yellow
// Body base colors
$color-body-bg: $color-1 !default;
$color-body-text: $color-4 !default;

79
app/webpacker/css/admin/v2/components/buttons.scss
View File

@@ -1,79 +0,0 @@
/* Overide buttons.scss app/webpacker/css/admin/components/buttons.scss */
@mixin backgroundAndBorder($color) {
background-color: $color;
border: 2px solid $color;
}
input[type="submit"],
select[type="submit"],
.select2-container-multi [type="submit"].select2-choices,
input[type="button"],
select[type="button"],
.select2-container-multi [type="button"].select2-choices,
button:not(.no-text),
.button,
.actions a:not(.no-text),
fieldset .filter-actions button, // Be more specific to be sure to override the form button style (with a white border)
fieldset .filter-actions .button:hover,
.admin__section-header .ofn-drop-down // Same behavior as the button
{
@include backgroundAndBorder($v2-blue-light);
&:hover {
@include backgroundAndBorder($v2-blue);
box-shadow: $v2-box-shadow;
}
&.disabled,
&[disabled],
&.disabled.secondary,
&[disabled].secondary {
@include backgroundAndBorder($v2-dark-light-grey);
box-shadow: none;
cursor: default;
color: white;
&:hover {
@include backgroundAndBorder($v2-dark-light-grey);
box-shadow: none;
cursor: default;
color: white;
}
}
&.secondary,
&.cancel,
&.icon-remove,
&#clear_all_filters {
background-color: $white;
border: 2px solid $v2-blue-light;
color: $v2-blue-light;
&:hover {
background-color: $v2-blue-lightest;
color: $v2-blue;
box-shadow: $v2-box-shadow;
}
}
&.active {
@include backgroundAndBorder($v2-blue);
}
}
#table-filter .actions {
/* used to draw a line on the right and left of the actions buttons
We can then remove the dropshadow on the buttons */
&:before,
&:after {
background-color: $v2-light-grey; // same color as the border of the fieldset. see forms.scss
height: 1px;
content: attr(data-initials);
flex-grow: 1; // make the line as long as it can
}
}
#table-filter fieldset {
border-bottom: 0;
}

9
app/webpacker/css/admin/v2/components/dropdown.scss
View File

@@ -1,9 +0,0 @@
/* Override app/webpacker/css/admin/dropdown.scss */
.ofn-drop-down,
.ofn-drop-down-with-prepend .ofn-drop-down-prepend {
background-color: white;
&.disabled {
opacity: 0.9;
}
}

9
app/webpacker/css/admin/v2/components/progress.scss
View File

@@ -1,9 +0,0 @@
/* Overide app/webpacker/css/admin/components/progress.scss file */
#progress {
background-color: $v2-blue;
}
#loading {
color: $v2-blue;
}

11
app/webpacker/css/admin/v2/components/sidebar.scss
View File

@@ -1,11 +0,0 @@
/* Override file app/webpacker/css/admin/components/sidebar.scss */
#sidebar {
border-color: #e7e7e7;
.sidebar-title {
color: $v2-blue;
& > span {
background-color: $v2-body-bg;
}
}
}

150
app/webpacker/css/admin/v2/components/tables.scss
View File

@@ -1,150 +0,0 @@
/* Overide tables.scss app/webpacker/css/admin/components/tables.scss */
table {
background-color: white;
}
table thead tr:first-child th:first-child {
border-top-left-radius: 3px;
}
table thead tr:first-child th:last-child,
table thead th.force-rounded-right {
border-top-right-radius: 3px;
}
table thead th {
background-color: $v2-medium-light-grey;
border: none;
color: $v2-blue;
text-transform: capitalize;
font-size: 13px;
a {
border: none;
color: $v2-blue;
}
}
table tr:not([class*="state"]) {
th:first-child,
td:first-child {
border-left: none;
}
}
table tbody tr {
&:first-child th,
&:first-child td {
border-top: none; // Don't show the top border of the first row
}
td {
border: none;
border-bottom: 2px solid $v2-medium-light-grey;
> .flex {
column-gap: 10px;
}
&.actions > .flex {
justify-content: flex-end;
}
}
&.even,
&.odd {
td {
background-color: transparent; // Do not use odd and even colors for background
}
}
}
table thead tr th.actions,
table tbody tr td.actions {
// Special for icons in the actions column
[class*="icon-"],
button[class*="icon-"]:not(.disabled):not([disabled]):not(.secondary):not(
.cancel
) {
color: $v2-blue;
display: flex;
justify-content: center;
align-items: center;
&:before {
width: auto;
padding: 0;
}
&.no-text {
border: 2px solid $v2-blue-light;
display: flex; // Be sure that display: flex; is applied
padding-top: 0;
&:hover {
border-color: $v2-blue;
box-shadow: $v2-box-shadow;
&:before {
color: white;
}
}
}
}
.icon-edit:hover,
.icon-capture:hover,
.icon-ok:hover,
.icon-plus:hover,
.icon-road:hover {
background-color: $v2-blue;
color: $color-1;
}
}
table {
thead th.actions,
thead td.actions {
background-color: $v2-medium-light-grey !important;
}
tbody tr td.actions {
background-color: white !important;
}
td {
&.actions {
padding-left: 20px;
border-bottom: 2px solid $v2-medium-light-grey !important; // needs to be important because of already defined with important
}
}
}
table tbody tr:hover > td {
background-color: #e9f3fc !important; // needs to be important because of already defined with important
}
table#listing_orders {
td {
// When the table is the listing of orders, we need to increase the height of the cells
padding: 20px 0;
&:not(:first-child) {
border-left: none; // Only show left border on the first cells, as it indicates the order state by its color
}
}
}
table#listing_order_cycles tr.open td {
background-color: #d9fccb !important; // needs to be important because of already defined with important
}
table#listing_order_cycles tr.closed td {
background-color: #eee !important; // needs to be important because of already defined with important
}
table#listing_order_cycles tr.upcoming td {
background-color: #fbfccb !important; // needs to be important because of already defined with important
}
tbody.panel-ctrl.expanded > tr:not(.panel-row) > td {
border-bottom: 1px solid #6788a2 !important; // needs to be important because of already defined with important
}
tbody.panel-ctrl.expanded > tr:not(.panel-row) > td.selected {
border-bottom: none !important; // it's a bit annoying to always put that important, but it's the only way to override the default style
}

10
app/webpacker/css/admin/v2/components/tags-input.scss
View File

@@ -1,10 +0,0 @@
tags-input .tags li.tag-item {
background-color: $v2-blue-light;
}
tags-input .tags {
box-shadow: none;
&.focused {
box-shadow: none;
}
}

47
app/webpacker/css/admin/v2/components/tom_select.scss
View File

@@ -1,47 +0,0 @@
/* Override app/webpacker/css/admin/components/tom_select.scss */
.ts-wrapper.primary.focus .ts-control,
.ts-wrapper.primary .ts-control {
background-color: white;
border: 1px solid $v2-light-grey;
color: $v2-medium-grey;
&:after {
border-color: $v2-medium-grey transparent transparent transparent;
}
}
.ts-wrapper.dropdown-active.primary .ts-control {
background-color: transparent;
border-color: $v2-light-grey;
color: $v2-medium-grey;
&:after {
border-color: transparent transparent $v2-medium-grey transparent;
}
}
.ts-wrapper.dropdown-active.focus .ts-control {
border-color: $v2-medium-grey;
}
.dropdown-input-wrap {
.dropdown-input {
border: 1px solid $v2-light-grey;
}
}
.ts-dropdown .create:hover,
.ts-dropdown #admin-menu li.selected a.create,
#admin-menu li.selected .ts-dropdown a.create,
.ts-dropdown .option:hover,
.ts-dropdown #admin-menu li.selected a.option,
#admin-menu li.selected .ts-dropdown a.option,
.ts-dropdown .active {
background-color: $v2-blue;
color: $white;
}
.ts-dropdown.single {
border-color: $v2-medium-grey;
}

19
app/webpacker/css/admin/v2/components/wizard_progress.scss
View File

@@ -1,19 +0,0 @@
ul.wizard-progress li {
a {
color: white;
}
background-color: $v2-dark-light-grey;
&:before,
&:after {
background-color: $v2-dark-light-grey;
}
&.current {
background-color: $v2-blue-light;
&:before,
&:after {
background-color: $v2-blue-light;
}
}
}

22
app/webpacker/css/admin/v2/main.scss
View File

@@ -1,22 +0,0 @@
@import "variables.scss";
@import "shared/typography.scss";
@import "navigation.scss";
@import "plugins/select2.scss";
@import "plugins/powertip.scss";
@import "plugins/flatpickr-customization.scss";
@import "shared/forms.scss";
@import "components/buttons.scss";
@import "components/tables.scss";
@import "components/progress.scss";
@import "components/sidebar.scss";
@import "components/tom_select.scss";
@import "components/dropdown.scss";
@import "components/wizard_progress.scss";
@import "components/tags-input.scss";
@import "others.scss";
body {
background-color: $v2-body-bg;
}

84
app/webpacker/css/admin/v2/navigation.scss
View File

@@ -1,84 +0,0 @@
#header {
#login-nav {
li {
color: $v2-medium-dark-grey;
i {
@include v2-link-color();
}
}
}
}
#admin-menu {
background-color: $v2-orange;
li a span.text {
font-weight: 700;
}
li.tab-with-icon a:before {
display: none;
}
li a:hover,
li.selected a {
background-color: $v2-orange-light;
span {
text-shadow: 1px 1px 9px $v2-orange;
}
&:after {
display: none;
}
}
}
#sub-menu {
background-color: $v2-orange-light;
li a {
font-size: 100%;
}
li a:hover,
li.selected a {
text-shadow: 1px 1px 9px $v2-orange;
background-color: lighten($v2-orange-light, 7%);
&:after {
display: none;
}
}
}
.admin__section-header {
background-color: transparent;
border-bottom: none;
h1.js-admin-page-title {
color: $v2-medium-dark-grey;
}
}
nav.menu ul li,
nav.menu ul #admin-menu li,
#admin-menu nav.menu ul li {
&.active {
a {
color: $v2-blue-dark;
border-bottom-color: $v2-blue-dark;
}
}
&.selected a,
a {
&:hover {
color: $v2-blue-dark;
border-bottom-color: $v2-blue-dark;
border-top-color: transparent;
border-right-color: transparent;
border-left-color: transparent;
}
}
}

6
app/webpacker/css/admin/v2/others.scss
View File

@@ -1,6 +0,0 @@
/* The aim of this file is to not create a file for each small modification on components */
#advanced_settings {
background-color: $v2-blue-lightest;
border-color: $v2-blue-dark;
}

46
app/webpacker/css/admin/v2/plugins/flatpickr-customization.scss
View File

@@ -1,46 +0,0 @@
/* Override flatpickr styles: app/webpacker/css/admin/plugins/flatpickr-customization.scss */
.flatpickr-calendar {
&.arrowTop::after {
border-bottom-color: $v2-blue-light;
}
.flatpickr-months .flatpickr-month,
.flatpickr-current-month .flatpickr-monthDropdown-months {
background: $v2-blue-light;
color: white;
input {
color: white;
}
}
.flatpickr-weekdays {
background: $v2-blue-light;
.flatpickr-weekday {
background: $v2-blue-light;
color: white;
}
}
.flatpickr-day.selected,
.flatpickr-day.startRange,
.flatpickr-day.endRange,
.flatpickr-day.selected.inRange,
.flatpickr-day.startRange.inRange,
.flatpickr-day.endRange.inRange,
.flatpickr-day.selected:focus,
.flatpickr-day.startRange:focus,
.flatpickr-day.endRange:focus,
.flatpickr-day.selected:hover,
.flatpickr-day.startRange:hover,
.flatpickr-day.endRange:hover,
.flatpickr-day.selected.prevMonthDay,
.flatpickr-day.startRange.prevMonthDay,
.flatpickr-day.endRange.prevMonthDay,
.flatpickr-day.selected.nextMonthDay,
.flatpickr-day.startRange.nextMonthDay,
.flatpickr-day.endRange.nextMonthDay {
background: $v2-blue-light;
border-color: $v2-blue-light;
}
}

58
app/webpacker/css/admin/v2/plugins/powertip.scss
View File

@@ -1,58 +0,0 @@
/* Overide file powertip.scss app/webpacker/css/admin/v2/plugins/powertip.scss */
#powerTip {
background-color: $v2-blue;
&.n:before,
&.ne:before,
&.nw:before {
border-top-color: $v2-blue;
}
&.e:before {
border-right-color: $v2-blue;
}
&.s:before,
&.se:before,
&.sw:before {
border-bottom-color: $v2-blue;
}
&.w:before {
border-left-color: $v2-blue;
}
&.ne:before,
&.se:before {
border-right-color: $v2-blue;
}
&.nw:before,
&.sw:before {
border-right-color: $v2-blue;
}
&.edit,
&.green,
&.capture,
&.save,
&.add {
background-color: $v2-blue;
&.n:before,
&.ne:before,
&.nw:before {
border-top-color: $v2-blue;
}
&.e:before,
&.nw:before,
&.sw:before {
border-right-color: $v2-blue;
}
&.s:before,
&.se:before,
&.sw:before {
border-bottom-color: $v2-blue;
}
&.w:before {
border-left-color: $v2-blue;
}
}
}

88
app/webpacker/css/admin/v2/plugins/select2.scss
View File

@@ -1,88 +0,0 @@
/* Override select2 styles app/webpacker/css/admin/plugins/select2.scss */
.select2-container {
.select2-choice {
background-color: white;
border: 1px solid $v2-light-grey !important;
color: $v2-medium-grey !important;
padding-left: 5px;
font-size: 13px;
height: 35px;
.select2-arrow {
color: $v2-medium-grey;
}
}
&.select2-container-active,
&:hover {
.select2-choice {
background-color: white !important;
border-color: $v2-medium-grey !important;
}
}
&.select2-dropdown-open.select2-container-active {
&:not(.select2-drop-above) {
.select2-choice {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
}
}
&.select2-drop-above .select.select2-choice {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
}
}
.select2-container-multi {
&.select2-dropdown-open,
&.select2-container-active {
.select2-choices {
border-color: $v2-medium-grey !important;
}
}
.select2-choices {
border-color: $v2-medium-grey !important;
min-height: 35px;
.select2-search-choice {
background-color: $v2-blue-light;
}
}
&.select2-drop-above {
.select2-choices {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
}
}
.select2-drop {
border-color: $v2-medium-grey;
&.select2-drop-above.select2-drop-active {
border-color: $v2-medium-grey;
}
}
.select2-search {
color: $v2-medium-grey;
}
.select2-results {
margin-right: 0;
li {
.select2-result-label {
color: $v2-medium-grey;
}
&.select2-highlighted {
background-color: $v2-blue;
}
&.select2-no-results,
&.select2-searching {
color: $v2-medium-grey;
}
}
}

57
app/webpacker/css/admin/v2/shared/forms.scss
View File

@@ -1,57 +0,0 @@
/* Overide forms.scss app/webpacker/css/admin/shared/forms.scss */
input[type="text"],
.select2-container-multi .select2-choices,
.select2-search input,
.select2-search select,
select,
input[type="password"],
input[type="email"],
input[type="url"],
input[type="tel"],
input[type="date"],
input[type="datetime"],
input[type="time"],
input[type="number"],
textarea,
fieldset {
// Change the color of all inputs
color: $v2-medium-grey;
border-color: $v2-light-grey !important;
font-size: 13px;
&:focus {
border-color: $v2-medium-grey !important;
}
}
fieldset label {
color: $v2-medium-dark-grey;
}
fieldset legend {
color: $v2-blue;
background-color: $v2-body-bg;
}
input[type="checkbox"],
input[type="radio"] {
accent-color: $v2-blue;
}
fieldset .filter-actions {
button,
.button,
input[type="submit"] {
box-shadow: none;
width: 200px; // adjust at the same size in order to center them. Not ideal but works for now.
&:first-of-type {
margin-right: 0; // don't see any reason to have a margin right on the first button as it's managed by the flexbox
}
&:hover {
box-shadow: $v2-box-shadow;
}
}
}

18
app/webpacker/css/admin/v2/shared/typography.scss
View File

@@ -1,18 +0,0 @@
// Overide app/webpacker/css/admin/shared/typography.scss
@mixin v2-link-color() {
color: $v2-blue;
border-color: $v2-blue;
&:hover {
color: $v2-blue-dark;
border-color: $v2-blue-dark;
}
}
a:not(.button) {
@include v2-link-color();
}
h4 {
color: $v2-medium-dark-grey;
}

26
app/webpacker/css/admin/v2/variables.scss
View File

@@ -1,26 +0,0 @@
// Should finally replace (or at least complete) the file /admin/globale/variables.scss
$v2-orange: #f27052;
$v2-orange-light: #f5947d;
$v2-orange-lighter: #f8b7a8;
$v2-orange-lightest: #fcdbd4;
$v2-dark-grey: #333333;
$v2-medium-dark-grey: #444444;
$v2-body-grey: $color-4;
$v2-medium-grey: #717171;
$v2-dark-light-grey: #d9d9d9;
$v2-medium-light-grey: #e6e6e6;
$v2-light-grey: #e7e7e7;
$v2-blue: #017a9a;
$v2-blue-dark: #005e7a;
$v2-blue-light: #0096ad;
$v2-blue-lightest: #e6f7fa; // Could be used as a background color for the action icons
$v2-green: #019854;
$v2-green-light: #01cb70;
$v2-box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); // Default box shadow for actions stuff
$v2-body-bg: #f7f9fa;

6
app/webpacker/packs/admin-styles-v2.scss
View File

@@ -1,6 +0,0 @@
@import '../css/admin/globals/palette';
@include basicColorPalette(#FFFFFF, #69A95D, #14B6CC, #484848, #C1122B, #F27052);
@import "../css/admin/all.scss";
@import "../css/admin/v2/main.scss";

2
app/webpacker/packs/admin-styles.scss
View File

@@ -1,3 +1 @@
@import '../css/admin/globals/palette';
@import "../css/admin/all.scss";

3
lib/open_food_network/feature_toggle.rb
View File

@@ -11,9 +11,6 @@ module OpenFoodNetwork
# We way move this to a YAML file when it becomes too awkward.
# **WARNING:** Features not in this list will be removed.
CURRENT_FEATURES = {
"admin_style_v2" => <<~DESC,
Change some colour and layout in the backend to a newer version.
DESC
"api_reports" => <<~DESC,
An API endpoint for reports at
<code>/api/v0/reports/:report_type(/:report_subtype)</code>