From 6ee6fc733da7514c42d9d98cf16550c6a5813ba1 Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Sun, 13 Jun 2021 22:05:46 +0100
Subject: [PATCH] Remove duplicated imports

---
 app/webpacker/css/admin/advanced_settings.scss            | 2 --
 app/webpacker/css/admin/alert.scss                        | 2 --
 app/webpacker/css/admin/all.scss                          | 3 +--
 app/webpacker/css/admin/change_type_form.scss             | 1 -
 app/webpacker/css/admin/components/actions.scss           | 2 --
 app/webpacker/css/admin/components/alert-box.scss         | 3 ---
 app/webpacker/css/admin/components/alert_row.scss         | 2 --
 app/webpacker/css/admin/components/date-picker.scss       | 4 ----
 app/webpacker/css/admin/components/dialogs.scss           | 2 --
 app/webpacker/css/admin/components/jquery_dialog.scss     | 2 --
 app/webpacker/css/admin/components/messages.scss          | 2 --
 app/webpacker/css/admin/components/navigation.scss        | 2 --
 app/webpacker/css/admin/components/pagination.scss        | 3 ---
 app/webpacker/css/admin/components/progress.scss          | 3 ---
 app/webpacker/css/admin/components/save_bar.scss          | 2 --
 app/webpacker/css/admin/components/sidebar.scss           | 2 --
 app/webpacker/css/admin/components/simple_modal.scss      | 2 --
 app/webpacker/css/admin/components/states.scss            | 2 --
 .../css/admin/components/subscriptions_states.scss        | 2 --
 app/webpacker/css/admin/components/table_loading.scss     | 2 --
 app/webpacker/css/admin/components/wizard_progress.scss   | 2 --
 app/webpacker/css/admin/customers.scss                    | 2 --
 app/webpacker/css/admin/dashboard_item.scss               | 2 --
 app/webpacker/css/admin/dropdown.scss                     | 2 --
 app/webpacker/css/admin/enterprise_index_panels.scss      | 2 --
 app/webpacker/css/admin/enterprises.scss                  | 2 --
 app/webpacker/css/admin/globals/variables.scss            | 2 --
 app/webpacker/css/admin/hacks/ie.scss                     | 2 --
 app/webpacker/css/admin/index_panel_buttons.scss          | 2 --
 app/webpacker/css/admin/index_panels.scss                 | 2 --
 app/webpacker/css/admin/openfoodnetwork.scss              | 2 --
 app/webpacker/css/admin/order_cycles.scss                 | 2 --
 app/webpacker/css/admin/orders.scss                       | 2 --
 app/webpacker/css/admin/pages/enterprise_form.scss        | 2 --
 app/webpacker/css/admin/pages/subscription_form.scss      | 2 --
 app/webpacker/css/admin/pages/subscription_review.scss    | 2 --
 app/webpacker/css/admin/plugins/jstree.scss               | 4 ----
 app/webpacker/css/admin/plugins/powertip.scss             | 3 ---
 app/webpacker/css/admin/plugins/select2.scss              | 8 --------
 app/webpacker/css/admin/product_import.scss               | 2 --
 app/webpacker/css/admin/products.scss                     | 2 --
 app/webpacker/css/admin/reports.scss                      | 2 --
 app/webpacker/css/admin/sections/orders.scss              | 2 --
 app/webpacker/css/admin/sections/products.scss            | 2 --
 app/webpacker/css/admin/select2.scss                      | 2 --
 app/webpacker/css/admin/shared/forms.scss                 | 3 ---
 app/webpacker/css/admin/shared/icons.scss                 | 2 --
 app/webpacker/css/admin/shared/layout.scss                | 2 --
 app/webpacker/css/admin/shared/tables.scss                | 3 ---
 app/webpacker/css/admin/shared/typography.scss            | 2 --
 app/webpacker/css/admin/side_menu.scss                    | 2 --
 app/webpacker/css/admin/sidebar-item.scss                 | 2 --
 app/webpacker/css/admin/tag_rules.scss                    | 2 --
 app/webpacker/css/admin/variant_overrides.scss            | 2 --
 54 files changed, 1 insertion(+), 123 deletions(-)

diff --git a/app/webpacker/css/admin/advanced_settings.scss b/app/webpacker/css/admin/advanced_settings.scss
index 614d91883b..6636428f3b 100644
--- a/app/webpacker/css/admin/advanced_settings.scss
+++ b/app/webpacker/css/admin/advanced_settings.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 #advanced_settings {
   background-color: $spree-light-blue;
   border: 1px solid $pale-blue;
diff --git a/app/webpacker/css/admin/alert.scss b/app/webpacker/css/admin/alert.scss
index 3894447936..267e7a8580 100644
--- a/app/webpacker/css/admin/alert.scss
+++ b/app/webpacker/css/admin/alert.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .alert {
   border: 3px solid $medium-grey;
   border-radius: 6px;
diff --git a/app/webpacker/css/admin/all.scss b/app/webpacker/css/admin/all.scss
index 011682581c..27bc2f9b3e 100644
--- a/app/webpacker/css/admin/all.scss
+++ b/app/webpacker/css/admin/all.scss
@@ -4,7 +4,6 @@
 @import '~jquery-ui/themes/base/jquery.ui.dialog';
 @import '../shared/textAngular';
 @import '../shared/ng-tags-input.min';
-@import 'select2';
 @import '~flatpickr/dist/flatpickr';
 @import '~flatpickr/dist/themes/material_blue';
 @import '~shortcut-buttons-flatpickr/dist/themes/light';
@@ -14,6 +13,7 @@
 @import 'variables';
 @import 'globals/mixins';
 
+@import '../shared/variables/layout';
 @import 'shared/typography';
 @import 'shared/tables';
 @import 'shared/icons';
@@ -21,7 +21,6 @@
 @import 'shared/layout';
 
 @import 'plugins/flatpickr-customization';
-
 @import 'plugins/powertip';
 @import 'plugins/jstree';
 @import 'plugins/font-awesome';
diff --git a/app/webpacker/css/admin/change_type_form.scss b/app/webpacker/css/admin/change_type_form.scss
index 97ef5b40e5..87b43ff1a2 100644
--- a/app/webpacker/css/admin/change_type_form.scss
+++ b/app/webpacker/css/admin/change_type_form.scss
@@ -1,6 +1,5 @@
 @import "../darkswarm/branding";
 @import "../darkswarm/mixins";
-@import "variables";
 
 #change_type {
   section {
diff --git a/app/webpacker/css/admin/components/actions.scss b/app/webpacker/css/admin/components/actions.scss
index c6b5519aef..1aeac5e630 100644
--- a/app/webpacker/css/admin/components/actions.scss
+++ b/app/webpacker/css/admin/components/actions.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 table tbody tr {
   &.highlight {
 
diff --git a/app/webpacker/css/admin/components/alert-box.scss b/app/webpacker/css/admin/components/alert-box.scss
index 09daf7bd70..35950af6dc 100644
--- a/app/webpacker/css/admin/components/alert-box.scss
+++ b/app/webpacker/css/admin/components/alert-box.scss
@@ -1,6 +1,3 @@
-@import "../../darkswarm/mixins";
-@import "../variables";
-
 .alert-box {
   position: relative;
   display: block;
diff --git a/app/webpacker/css/admin/components/alert_row.scss b/app/webpacker/css/admin/components/alert_row.scss
index 8f07c1b054..c8c41651a5 100644
--- a/app/webpacker/css/admin/components/alert_row.scss
+++ b/app/webpacker/css/admin/components/alert_row.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 .alert-row{
   margin-bottom: 10px;
   font-weight: bold;
diff --git a/app/webpacker/css/admin/components/date-picker.scss b/app/webpacker/css/admin/components/date-picker.scss
index 0590db7599..8511a73617 100644
--- a/app/webpacker/css/admin/components/date-picker.scss
+++ b/app/webpacker/css/admin/components/date-picker.scss
@@ -1,7 +1,3 @@
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-@import 'admin/plugins/font-awesome';
-
 // scss-lint:disable QualifyingElement
 
 .date-range-filter {
diff --git a/app/webpacker/css/admin/components/dialogs.scss b/app/webpacker/css/admin/components/dialogs.scss
index 64f9bebc9d..298f8e1239 100644
--- a/app/webpacker/css/admin/components/dialogs.scss
+++ b/app/webpacker/css/admin/components/dialogs.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 #info-dialog, #confirm-dialog {
   .message {
     .text, .icon {
diff --git a/app/webpacker/css/admin/components/jquery_dialog.scss b/app/webpacker/css/admin/components/jquery_dialog.scss
index 79a12f7d4f..3bfddb8762 100644
--- a/app/webpacker/css/admin/components/jquery_dialog.scss
+++ b/app/webpacker/css/admin/components/jquery_dialog.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 /**
 Main colors:
 dark: #545454
diff --git a/app/webpacker/css/admin/components/messages.scss b/app/webpacker/css/admin/components/messages.scss
index 18bf5b5a66..34970ce4c7 100644
--- a/app/webpacker/css/admin/components/messages.scss
+++ b/app/webpacker/css/admin/components/messages.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 .errorExplanation {
   padding: 5px;
   border: 1px solid very-light($color-error, 12);
diff --git a/app/webpacker/css/admin/components/navigation.scss b/app/webpacker/css/admin/components/navigation.scss
index 4616cc3b4c..2bb630ba7d 100644
--- a/app/webpacker/css/admin/components/navigation.scss
+++ b/app/webpacker/css/admin/components/navigation.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 // Navigation
 //---------------------------------------------------
 .inline-menu {
diff --git a/app/webpacker/css/admin/components/pagination.scss b/app/webpacker/css/admin/components/pagination.scss
index 3491585449..beba1f2159 100644
--- a/app/webpacker/css/admin/components/pagination.scss
+++ b/app/webpacker/css/admin/components/pagination.scss
@@ -1,6 +1,3 @@
-@import 'admin/globals/variables';
-@import "admin/variables";
-
 .pagination {
   text-align: center;
   margin: 2em 0 1em;
diff --git a/app/webpacker/css/admin/components/progress.scss b/app/webpacker/css/admin/components/progress.scss
index c3ea8c69b3..8221701587 100644
--- a/app/webpacker/css/admin/components/progress.scss
+++ b/app/webpacker/css/admin/components/progress.scss
@@ -1,6 +1,3 @@
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-
 #progress {
   @include border-radius(10px);
   position: fixed;
diff --git a/app/webpacker/css/admin/components/save_bar.scss b/app/webpacker/css/admin/components/save_bar.scss
index e5082cfafe..70f906119f 100644
--- a/app/webpacker/css/admin/components/save_bar.scss
+++ b/app/webpacker/css/admin/components/save_bar.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 #save-bar {
   position: fixed;
   width: 100%;
diff --git a/app/webpacker/css/admin/components/sidebar.scss b/app/webpacker/css/admin/components/sidebar.scss
index 03047ba8db..960de96ab0 100644
--- a/app/webpacker/css/admin/components/sidebar.scss
+++ b/app/webpacker/css/admin/components/sidebar.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 // Sidebar
 //---------------------------------------------------
 #sidebar {
diff --git a/app/webpacker/css/admin/components/simple_modal.scss b/app/webpacker/css/admin/components/simple_modal.scss
index 453fe6da4f..d7e1c1f914 100644
--- a/app/webpacker/css/admin/components/simple_modal.scss
+++ b/app/webpacker/css/admin/components/simple_modal.scss
@@ -1,5 +1,3 @@
-@import '../variables';
-
 .reveal-modal.simple-modal {
   width: 300px;
 
diff --git a/app/webpacker/css/admin/components/states.scss b/app/webpacker/css/admin/components/states.scss
index 11593f2f77..97ad366abf 100644
--- a/app/webpacker/css/admin/components/states.scss
+++ b/app/webpacker/css/admin/components/states.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 .state {
   text-transform: uppercase;
   font-size: 80%;
diff --git a/app/webpacker/css/admin/components/subscriptions_states.scss b/app/webpacker/css/admin/components/subscriptions_states.scss
index 2377684416..252e448d58 100644
--- a/app/webpacker/css/admin/components/subscriptions_states.scss
+++ b/app/webpacker/css/admin/components/subscriptions_states.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 #subscriptions .state {
   border-radius: 3px;
   text-transform: uppercase;
diff --git a/app/webpacker/css/admin/components/table_loading.scss b/app/webpacker/css/admin/components/table_loading.scss
index 7aededd14b..31a0c61894 100644
--- a/app/webpacker/css/admin/components/table_loading.scss
+++ b/app/webpacker/css/admin/components/table_loading.scss
@@ -1,5 +1,3 @@
-@import '../variables';
-
 .row-loading {
   opacity: .5;
 }
diff --git a/app/webpacker/css/admin/components/wizard_progress.scss b/app/webpacker/css/admin/components/wizard_progress.scss
index f773f33ba0..af53ccad7a 100644
--- a/app/webpacker/css/admin/components/wizard_progress.scss
+++ b/app/webpacker/css/admin/components/wizard_progress.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 $color_unselected: #d9d9d9;
 $color_selected: $spree-blue;
 
diff --git a/app/webpacker/css/admin/customers.scss b/app/webpacker/css/admin/customers.scss
index 0a10d9de06..f1284b4725 100644
--- a/app/webpacker/css/admin/customers.scss
+++ b/app/webpacker/css/admin/customers.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .tag-with-rules {
   color: black;
 }
diff --git a/app/webpacker/css/admin/dashboard_item.scss b/app/webpacker/css/admin/dashboard_item.scss
index 38d3e81786..829b98590f 100644
--- a/app/webpacker/css/admin/dashboard_item.scss
+++ b/app/webpacker/css/admin/dashboard_item.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 div.dashboard_item {
   margin-bottom: 30px;
 
diff --git a/app/webpacker/css/admin/dropdown.scss b/app/webpacker/css/admin/dropdown.scss
index 8c612f60e3..4a991cbffe 100644
--- a/app/webpacker/css/admin/dropdown.scss
+++ b/app/webpacker/css/admin/dropdown.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 #content-header .ofn-drop-down {
   border: none;
   background-color: $spree-blue;
diff --git a/app/webpacker/css/admin/enterprise_index_panels.scss b/app/webpacker/css/admin/enterprise_index_panels.scss
index 69940e2eb1..7d95b9b8e2 100644
--- a/app/webpacker/css/admin/enterprise_index_panels.scss
+++ b/app/webpacker/css/admin/enterprise_index_panels.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .enterprise_package_panel, .enterprise_producer_panel {
   .info {
     p {
diff --git a/app/webpacker/css/admin/enterprises.scss b/app/webpacker/css/admin/enterprises.scss
index 2c74a30508..55fd17b3ac 100644
--- a/app/webpacker/css/admin/enterprises.scss
+++ b/app/webpacker/css/admin/enterprises.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 form[name="enterprise_form"] {
   div.row.warning {
     color: $warning-orange;
diff --git a/app/webpacker/css/admin/globals/variables.scss b/app/webpacker/css/admin/globals/variables.scss
index 7244780159..204b4f799d 100644
--- a/app/webpacker/css/admin/globals/variables.scss
+++ b/app/webpacker/css/admin/globals/variables.scss
@@ -1,5 +1,3 @@
-@import 'shared/variables/layout';
-
 // -------------------------------------------------------------
 //   Variables used in all other files
 //--------------------------------------------------------------
diff --git a/app/webpacker/css/admin/hacks/ie.scss b/app/webpacker/css/admin/hacks/ie.scss
index 4eff79ed84..b224b67d55 100644
--- a/app/webpacker/css/admin/hacks/ie.scss
+++ b/app/webpacker/css/admin/hacks/ie.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 // IE general hacks
 html.ie {
 
diff --git a/app/webpacker/css/admin/index_panel_buttons.scss b/app/webpacker/css/admin/index_panel_buttons.scss
index 4ff84bac89..09f7a6f65f 100644
--- a/app/webpacker/css/admin/index_panel_buttons.scss
+++ b/app/webpacker/css/admin/index_panel_buttons.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 tbody.panel-ctrl {
   tr.panel-row {
     > td {
diff --git a/app/webpacker/css/admin/index_panels.scss b/app/webpacker/css/admin/index_panels.scss
index 8625fbfed2..e20ee34a5f 100644
--- a/app/webpacker/css/admin/index_panels.scss
+++ b/app/webpacker/css/admin/index_panels.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 tbody.panel-ctrl {
   td.panel-toggle{
     -webkit-touch-callout: none;
diff --git a/app/webpacker/css/admin/openfoodnetwork.scss b/app/webpacker/css/admin/openfoodnetwork.scss
index d946d203bc..5ba6b879db 100644
--- a/app/webpacker/css/admin/openfoodnetwork.scss
+++ b/app/webpacker/css/admin/openfoodnetwork.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .text-center {
   text-align: center;
 }
diff --git a/app/webpacker/css/admin/order_cycles.scss b/app/webpacker/css/admin/order_cycles.scss
index e651f867ab..012f2513c5 100644
--- a/app/webpacker/css/admin/order_cycles.scss
+++ b/app/webpacker/css/admin/order_cycles.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 form.order_cycle {
   margin-bottom: 5em;
 }
diff --git a/app/webpacker/css/admin/orders.scss b/app/webpacker/css/admin/orders.scss
index 2f66371ab4..b107947151 100644
--- a/app/webpacker/css/admin/orders.scss
+++ b/app/webpacker/css/admin/orders.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 input, div {
 	&.update-pending {
 	  border: solid 1px orange;
diff --git a/app/webpacker/css/admin/pages/enterprise_form.scss b/app/webpacker/css/admin/pages/enterprise_form.scss
index 55572be07c..5c588ba11a 100644
--- a/app/webpacker/css/admin/pages/enterprise_form.scss
+++ b/app/webpacker/css/admin/pages/enterprise_form.scss
@@ -1,5 +1,3 @@
-@import "../variables";
-
 span.unavailable,
 span.available {
   font-weight: bold;
diff --git a/app/webpacker/css/admin/pages/subscription_form.scss b/app/webpacker/css/admin/pages/subscription_form.scss
index b892c4f17e..02c9fd783e 100644
--- a/app/webpacker/css/admin/pages/subscription_form.scss
+++ b/app/webpacker/css/admin/pages/subscription_form.scss
@@ -1,5 +1,3 @@
-@import '../variables';
-
 .admin-subscription-form-subscription-line-items {
   .not-in-open-and-upcoming-order-cycles-warning {
     color: $warning-red;
diff --git a/app/webpacker/css/admin/pages/subscription_review.scss b/app/webpacker/css/admin/pages/subscription_review.scss
index 76008afc0f..ba3280aa2b 100644
--- a/app/webpacker/css/admin/pages/subscription_review.scss
+++ b/app/webpacker/css/admin/pages/subscription_review.scss
@@ -1,5 +1,3 @@
-@import '../variables';
-
 .admin-subscription-review-subscription-line-items {
   .not-in-open-and-upcoming-order-cycles-warning {
     color: $warning-red;
diff --git a/app/webpacker/css/admin/plugins/jstree.scss b/app/webpacker/css/admin/plugins/jstree.scss
index 3980d6711e..0fad9d6578 100644
--- a/app/webpacker/css/admin/plugins/jstree.scss
+++ b/app/webpacker/css/admin/plugins/jstree.scss
@@ -1,7 +1,3 @@
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-@import 'admin/plugins/font-awesome';
-
 #taxonomy_tree {
   > ul, .jstree-icon {
     background-image: none;
diff --git a/app/webpacker/css/admin/plugins/powertip.scss b/app/webpacker/css/admin/plugins/powertip.scss
index ffa9ff7a94..b53f47a7e4 100644
--- a/app/webpacker/css/admin/plugins/powertip.scss
+++ b/app/webpacker/css/admin/plugins/powertip.scss
@@ -1,6 +1,3 @@
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-
 #powerTip {
   background-color: $color-3;
   padding: 5px 15px;
diff --git a/app/webpacker/css/admin/plugins/select2.scss b/app/webpacker/css/admin/plugins/select2.scss
index d3f354148b..a721da9b7c 100644
--- a/app/webpacker/css/admin/plugins/select2.scss
+++ b/app/webpacker/css/admin/plugins/select2.scss
@@ -1,11 +1,3 @@
-@import 'admin/globals/functions';
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-
-@import 'admin/shared/forms';
-
-@import 'admin/plugins/font-awesome';
-
 .select2-container {
   &:hover .select2-choice, &.select2-container-active .select2-choice {
     background-color: $color-sel-hover-bg !important;
diff --git a/app/webpacker/css/admin/product_import.scss b/app/webpacker/css/admin/product_import.scss
index 20dcc481f1..db5f8b52d6 100644
--- a/app/webpacker/css/admin/product_import.scss
+++ b/app/webpacker/css/admin/product_import.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 $pi-red: $warning-red;
 $pi-green: lighten($spree-green, 10%);
 $pi-orange: $bright-orange;
diff --git a/app/webpacker/css/admin/products.scss b/app/webpacker/css/admin/products.scss
index 832bd67fc2..7800b28446 100644
--- a/app/webpacker/css/admin/products.scss
+++ b/app/webpacker/css/admin/products.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 #product_distributors_field span {
   display: block;
 }
diff --git a/app/webpacker/css/admin/reports.scss b/app/webpacker/css/admin/reports.scss
index 24c0411708..e8c36b6af6 100644
--- a/app/webpacker/css/admin/reports.scss
+++ b/app/webpacker/css/admin/reports.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .report__table {
   margin-top: 2em;
 }
diff --git a/app/webpacker/css/admin/sections/orders.scss b/app/webpacker/css/admin/sections/orders.scss
index 47b84337b9..e8f4d79692 100644
--- a/app/webpacker/css/admin/sections/orders.scss
+++ b/app/webpacker/css/admin/sections/orders.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 // Customize orders filter
 [data-hook="admin_orders_index_search"] {
   select[data-placeholder="Status"] {
diff --git a/app/webpacker/css/admin/sections/products.scss b/app/webpacker/css/admin/sections/products.scss
index a56a3ada17..7740149ca1 100644
--- a/app/webpacker/css/admin/sections/products.scss
+++ b/app/webpacker/css/admin/sections/products.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 [data-hook="admin_product_form_fields"] {
   label {
     display: inline-block;
diff --git a/app/webpacker/css/admin/select2.scss b/app/webpacker/css/admin/select2.scss
index ec8f3234b6..8c6204bb96 100644
--- a/app/webpacker/css/admin/select2.scss
+++ b/app/webpacker/css/admin/select2.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .select2-container {
   .select2-choice {
     .select2-search-choice-close {
diff --git a/app/webpacker/css/admin/shared/forms.scss b/app/webpacker/css/admin/shared/forms.scss
index 850cf83fc2..678cab0986 100644
--- a/app/webpacker/css/admin/shared/forms.scss
+++ b/app/webpacker/css/admin/shared/forms.scss
@@ -1,6 +1,3 @@
-@import 'admin/globals/variables';
-@import 'admin/globals/mixins';
-
 input[type="text"],
 input[type="password"],
 input[type="email"],
diff --git a/app/webpacker/css/admin/shared/icons.scss b/app/webpacker/css/admin/shared/icons.scss
index 4cfb87639f..2bb1604e8e 100644
--- a/app/webpacker/css/admin/shared/icons.scss
+++ b/app/webpacker/css/admin/shared/icons.scss
@@ -1,5 +1,3 @@
-@import 'admin/plugins/font-awesome';
-
 // Some fixes for fontwesome stylesheets
 [class^="icon-"], [class*=" icon-"] {
   &:before {
diff --git a/app/webpacker/css/admin/shared/layout.scss b/app/webpacker/css/admin/shared/layout.scss
index 17af56a59b..7705d09caa 100644
--- a/app/webpacker/css/admin/shared/layout.scss
+++ b/app/webpacker/css/admin/shared/layout.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 // Basics
 //---------------------------------------------------
 * {
diff --git a/app/webpacker/css/admin/shared/tables.scss b/app/webpacker/css/admin/shared/tables.scss
index c4ee0e79ac..612e85f06d 100644
--- a/app/webpacker/css/admin/shared/tables.scss
+++ b/app/webpacker/css/admin/shared/tables.scss
@@ -1,6 +1,3 @@
-@import 'admin/globals/variables';
-@import 'admin/plugins/font-awesome';
-
 table {
   width: 100%;
   margin-bottom: 15px;
diff --git a/app/webpacker/css/admin/shared/typography.scss b/app/webpacker/css/admin/shared/typography.scss
index ebea6dbb17..91918daba5 100644
--- a/app/webpacker/css/admin/shared/typography.scss
+++ b/app/webpacker/css/admin/shared/typography.scss
@@ -1,5 +1,3 @@
-@import 'admin/globals/variables';
-
 // Base
 //--------------------------------------------------------------
 body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, p, blockquote, th, td { margin: 0; padding: 0; font-size: 13px; }
diff --git a/app/webpacker/css/admin/side_menu.scss b/app/webpacker/css/admin/side_menu.scss
index 8cb912814d..398787b7b8 100644
--- a/app/webpacker/css/admin/side_menu.scss
+++ b/app/webpacker/css/admin/side_menu.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .side_menu {
   border-right: 2px solid #f6f6f6;
   border-top: 2px solid #f6f6f6;
diff --git a/app/webpacker/css/admin/sidebar-item.scss b/app/webpacker/css/admin/sidebar-item.scss
index 9d7047976f..b9d34b27f1 100644
--- a/app/webpacker/css/admin/sidebar-item.scss
+++ b/app/webpacker/css/admin/sidebar-item.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 div.sidebar_item {
   margin-bottom: 30px;
 
diff --git a/app/webpacker/css/admin/tag_rules.scss b/app/webpacker/css/admin/tag_rules.scss
index b1bbc1f0e0..8650f11c22 100644
--- a/app/webpacker/css/admin/tag_rules.scss
+++ b/app/webpacker/css/admin/tag_rules.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 tags-input {
   &.limit-reached {
     input, span.input {
diff --git a/app/webpacker/css/admin/variant_overrides.scss b/app/webpacker/css/admin/variant_overrides.scss
index f74e15ecb9..c01673b292 100644
--- a/app/webpacker/css/admin/variant_overrides.scss
+++ b/app/webpacker/css/admin/variant_overrides.scss
@@ -1,5 +1,3 @@
-@import "variables";
-
 .variant-override-unit {
   float: right;
   font-style: italic;