From ec2213d2f041fe724a726a523d0b883b147abe63 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Sun, 13 Jun 2021 14:56:58 +0100 Subject: [PATCH] Reduce duplicate import statements It looks ike these CSS rules are actually being re-imported multiple times, which is bloating the output. --- .../css/darkswarm/_shop-filters.scss | 5 ----- app/webpacker/css/darkswarm/_shop-inputs.scss | 5 ----- .../css/darkswarm/_shop-navigation.scss | 4 ---- .../css/darkswarm/_shop-popovers.scss | 3 --- .../css/darkswarm/_shop-product-rows.scss | 4 ---- app/webpacker/css/darkswarm/account.scss | 4 ---- app/webpacker/css/darkswarm/active_table.scss | 4 ---- .../css/darkswarm/active_table_search.scss | 5 ----- app/webpacker/css/darkswarm/all.scss | 22 ++++++++++++++----- app/webpacker/css/darkswarm/animations.scss | 2 -- app/webpacker/css/darkswarm/base/colors.scss | 1 - app/webpacker/css/darkswarm/big-input.scss | 5 ----- .../css/darkswarm/cart-dropdown.scss | 4 ---- app/webpacker/css/darkswarm/cart-page.scss | 5 ----- app/webpacker/css/darkswarm/checkout.scss | 4 ---- .../darkswarm/compass/css3/transition.scss | 3 --- .../compass/css3/user-interface.scss | 2 -- .../css/darkswarm/distributor_header.scss | 3 --- .../css/darkswarm/embedded_shopfront.scss | 3 --- .../css/darkswarm/expanding-sidebar.scss | 4 ---- app/webpacker/css/darkswarm/footer.scss | 4 ---- app/webpacker/css/darkswarm/forms.scss | 3 --- app/webpacker/css/darkswarm/groups.scss | 4 ---- app/webpacker/css/darkswarm/home_panes.scss | 6 ----- app/webpacker/css/darkswarm/home_tagline.scss | 6 +---- app/webpacker/css/darkswarm/hub_node.scss | 3 --- app/webpacker/css/darkswarm/hubs.scss | 3 --- app/webpacker/css/darkswarm/images.scss | 4 ---- .../css/darkswarm/layout/offcanvas.scss | 2 -- app/webpacker/css/darkswarm/loading.scss | 2 -- app/webpacker/css/darkswarm/map.scss | 2 -- app/webpacker/css/darkswarm/menu.scss | 4 ---- app/webpacker/css/darkswarm/mixins.scss | 3 --- .../css/darkswarm/modal-enterprises.scss | 8 ++----- app/webpacker/css/darkswarm/modals.scss | 3 --- app/webpacker/css/darkswarm/page_alert.scss | 5 ----- .../css/darkswarm/pages/login_modal.scss | 3 --- .../css/darkswarm/producer_node.scss | 3 --- app/webpacker/css/darkswarm/producers.scss | 3 --- app/webpacker/css/darkswarm/registration.scss | 3 --- app/webpacker/css/darkswarm/shop.scss | 6 ----- app/webpacker/css/darkswarm/shop_search.scss | 4 ---- app/webpacker/css/darkswarm/shop_tabs.scss | 4 ---- app/webpacker/css/darkswarm/sidebar.scss | 9 -------- app/webpacker/css/darkswarm/signup.scss | 6 ----- app/webpacker/css/darkswarm/tabset.scss | 4 ---- app/webpacker/css/darkswarm/taxons.scss | 3 --- app/webpacker/css/darkswarm/typography.scss | 1 - app/webpacker/css/darkswarm/ui.scss | 6 ----- app/webpacker/css/darkswarm/variables.scss | 1 - .../variables/{_layout.scss => layout.scss} | 0 51 files changed, 19 insertions(+), 191 deletions(-) rename app/webpacker/css/shared/variables/{_layout.scss => layout.scss} (100%) diff --git a/app/webpacker/css/darkswarm/_shop-filters.scss b/app/webpacker/css/darkswarm/_shop-filters.scss index b7296778ab..e9ff3b8aac 100644 --- a/app/webpacker/css/darkswarm/_shop-filters.scss +++ b/app/webpacker/css/darkswarm/_shop-filters.scss @@ -1,8 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "big-input"; -@import "animations"; -@import "variables"; @mixin filter-selector($base-clr, $border-clr, $hover-clr) { &.inline-block, ul.inline-block { diff --git a/app/webpacker/css/darkswarm/_shop-inputs.scss b/app/webpacker/css/darkswarm/_shop-inputs.scss index 435d4eb3ac..bf902f55b9 100644 --- a/app/webpacker/css/darkswarm/_shop-inputs.scss +++ b/app/webpacker/css/darkswarm/_shop-inputs.scss @@ -1,8 +1,3 @@ -@import "mixins"; -@import "variables"; -@import "branding"; -@import "big-input"; - .darkswarm { // #search @include placeholder(rgba(0, 0, 0, 0.4), #777); diff --git a/app/webpacker/css/darkswarm/_shop-navigation.scss b/app/webpacker/css/darkswarm/_shop-navigation.scss index 54b48aaf7f..d01897d942 100644 --- a/app/webpacker/css/darkswarm/_shop-navigation.scss +++ b/app/webpacker/css/darkswarm/_shop-navigation.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "typography"; -@import "variables"; - ordercycle { float: right; background: $grey-050; diff --git a/app/webpacker/css/darkswarm/_shop-popovers.scss b/app/webpacker/css/darkswarm/_shop-popovers.scss index d91f870330..1877420f0f 100644 --- a/app/webpacker/css/darkswarm/_shop-popovers.scss +++ b/app/webpacker/css/darkswarm/_shop-popovers.scss @@ -1,6 +1,3 @@ -@import "mixins"; -@import "branding"; - // Pop over // Foundation overrides .joyride-tip-guide.price_breakdown { diff --git a/app/webpacker/css/darkswarm/_shop-product-rows.scss b/app/webpacker/css/darkswarm/_shop-product-rows.scss index 4ecfd5182d..888b0e157e 100644 --- a/app/webpacker/css/darkswarm/_shop-product-rows.scss +++ b/app/webpacker/css/darkswarm/_shop-product-rows.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "animations"; - .darkswarm { products { product { diff --git a/app/webpacker/css/darkswarm/account.scss b/app/webpacker/css/darkswarm/account.scss index d73e4b7367..782c97cc32 100644 --- a/app/webpacker/css/darkswarm/account.scss +++ b/app/webpacker/css/darkswarm/account.scss @@ -1,7 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "variables"; - .account-summary { color: #4a4a4a; } diff --git a/app/webpacker/css/darkswarm/active_table.scss b/app/webpacker/css/darkswarm/active_table.scss index 395ad7c876..7e9d78a662 100644 --- a/app/webpacker/css/darkswarm/active_table.scss +++ b/app/webpacker/css/darkswarm/active_table.scss @@ -1,7 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "compass/css3/user-interface"; - .no-results { font-size: 1.875rem; } diff --git a/app/webpacker/css/darkswarm/active_table_search.scss b/app/webpacker/css/darkswarm/active_table_search.scss index 486e79178a..63d2c2a697 100644 --- a/app/webpacker/css/darkswarm/active_table_search.scss +++ b/app/webpacker/css/darkswarm/active_table_search.scss @@ -1,8 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "big-input"; -@import "animations"; - // Filter-box .row .row.filter-box { margin-left: 0; diff --git a/app/webpacker/css/darkswarm/all.scss b/app/webpacker/css/darkswarm/all.scss index 9dd99272ff..97d20a60dc 100644 --- a/app/webpacker/css/darkswarm/all.scss +++ b/app/webpacker/css/darkswarm/all.scss @@ -9,17 +9,29 @@ *= require_self */ @import 'variables'; -@import "~foundation-sites/scss/foundation"; +@import '../shared/variables/layout'; +@import '~foundation-sites/scss/foundation'; + +@import 'big-input'; +@import 'branding'; +@import 'typography'; +@import 'mixins'; @import 'base/colors'; +@import 'animations'; + +@import "compass/support"; +@import "compass/css3/transition"; +@import "compass/css3/user-interface"; + @import 'layout/offcanvas'; -//@import '*'; +@import 'shop-filters'; +@import 'shop-modals'; +@import 'shop-product-thumb'; @import 'account'; @import 'active_table'; @import 'active_table_search'; @import 'angular'; -@import 'animations'; -@import 'branding'; @import 'cart-dropdown'; @import 'cart-page'; @import 'checkout'; @@ -41,7 +53,6 @@ @import 'loading'; @import 'map'; @import 'menu'; -@import 'mixins'; @import 'modal-enterprises'; @import 'modals'; @import 'overrides'; @@ -60,7 +71,6 @@ @import 'tables'; @import 'tabset'; @import 'taxons'; -@import 'typography'; @import 'ui'; @import 'pages/login_modal'; diff --git a/app/webpacker/css/darkswarm/animations.scss b/app/webpacker/css/darkswarm/animations.scss index cd5f3a5f89..406cca504d 100644 --- a/app/webpacker/css/darkswarm/animations.scss +++ b/app/webpacker/css/darkswarm/animations.scss @@ -1,5 +1,3 @@ -@import "mixins"; - .turbo-progress-bar { background-color: $teal-400; } diff --git a/app/webpacker/css/darkswarm/base/colors.scss b/app/webpacker/css/darkswarm/base/colors.scss index 756843c925..fd2eeb9c9e 100644 --- a/app/webpacker/css/darkswarm/base/colors.scss +++ b/app/webpacker/css/darkswarm/base/colors.scss @@ -1,4 +1,3 @@ -@import '../branding'; //// Foundation base variables // diff --git a/app/webpacker/css/darkswarm/big-input.scss b/app/webpacker/css/darkswarm/big-input.scss index 10336e30c6..6779ed29e2 100644 --- a/app/webpacker/css/darkswarm/big-input.scss +++ b/app/webpacker/css/darkswarm/big-input.scss @@ -1,8 +1,3 @@ -@import "typography"; -@import "branding"; -@import "animations"; -@import "mixins"; - //Big search used in active table search \\ @mixin big-input($input, $inputhvr, $inputactv) { diff --git a/app/webpacker/css/darkswarm/cart-dropdown.scss b/app/webpacker/css/darkswarm/cart-dropdown.scss index eeb6681a7f..d4bbdbed89 100644 --- a/app/webpacker/css/darkswarm/cart-dropdown.scss +++ b/app/webpacker/css/darkswarm/cart-dropdown.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "variables"; -@import "branding"; - .expanding-sidebar.cart-sidebar { .background { z-index: 150; diff --git a/app/webpacker/css/darkswarm/cart-page.scss b/app/webpacker/css/darkswarm/cart-page.scss index 5d0f833759..6feeae9d46 100644 --- a/app/webpacker/css/darkswarm/cart-page.scss +++ b/app/webpacker/css/darkswarm/cart-page.scss @@ -1,8 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "compass/css3/user-interface"; -@import "variables"; - #update-cart { #errorExplanation { display: none; diff --git a/app/webpacker/css/darkswarm/checkout.scss b/app/webpacker/css/darkswarm/checkout.scss index df51d9de34..c77f94968a 100644 --- a/app/webpacker/css/darkswarm/checkout.scss +++ b/app/webpacker/css/darkswarm/checkout.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "animations"; - .order-summary { background-color: #e1f0f5; padding: 1em; diff --git a/app/webpacker/css/darkswarm/compass/css3/transition.scss b/app/webpacker/css/darkswarm/compass/css3/transition.scss index d0bf3c8302..51cf30968c 100644 --- a/app/webpacker/css/darkswarm/compass/css3/transition.scss +++ b/app/webpacker/css/darkswarm/compass/css3/transition.scss @@ -1,9 +1,6 @@ -@import "compass/support"; - // The the user threshold for transition support. Defaults to `$graceful-usage-threshold` $transition-support-threshold: $graceful-usage-threshold !default; - // CSS Transitions // Currently only works in Webkit. // diff --git a/app/webpacker/css/darkswarm/compass/css3/user-interface.scss b/app/webpacker/css/darkswarm/compass/css3/user-interface.scss index f0c06a4ab8..3a3e99fbae 100644 --- a/app/webpacker/css/darkswarm/compass/css3/user-interface.scss +++ b/app/webpacker/css/darkswarm/compass/css3/user-interface.scss @@ -3,8 +3,6 @@ // they become available in browsers: // http://www.w3.org/TR/2000/WD-css3-userint-20000216 -@import "compass/support"; - // The prefixed support threshold for user-select. // Defaults to the $graceful-usage-threshold. $userselect-support-threshold: $graceful-usage-threshold !default; diff --git a/app/webpacker/css/darkswarm/distributor_header.scss b/app/webpacker/css/darkswarm/distributor_header.scss index 5166b79230..4dc32da428 100644 --- a/app/webpacker/css/darkswarm/distributor_header.scss +++ b/app/webpacker/css/darkswarm/distributor_header.scss @@ -1,6 +1,3 @@ -@import "mixins"; -@import 'typography'; - $shop-navigation-zindex: 20; section { diff --git a/app/webpacker/css/darkswarm/embedded_shopfront.scss b/app/webpacker/css/darkswarm/embedded_shopfront.scss index 619ec692e4..1fce1f676e 100644 --- a/app/webpacker/css/darkswarm/embedded_shopfront.scss +++ b/app/webpacker/css/darkswarm/embedded_shopfront.scss @@ -1,6 +1,3 @@ -@import "mixins"; -@import "typography"; - $large-menu-height: 4.6875rem; $medium-menu-height: 3rem; $gutter-width: 0.9375rem; diff --git a/app/webpacker/css/darkswarm/expanding-sidebar.scss b/app/webpacker/css/darkswarm/expanding-sidebar.scss index 8bfcfe824b..d2fdfc7711 100644 --- a/app/webpacker/css/darkswarm/expanding-sidebar.scss +++ b/app/webpacker/css/darkswarm/expanding-sidebar.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "variables"; -@import "branding"; - .expanding-sidebar { display: flex; flex-direction: column; diff --git a/app/webpacker/css/darkswarm/footer.scss b/app/webpacker/css/darkswarm/footer.scss index b28e9747fa..246c904328 100644 --- a/app/webpacker/css/darkswarm/footer.scss +++ b/app/webpacker/css/darkswarm/footer.scss @@ -1,7 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "animations"; - footer { .row { p { diff --git a/app/webpacker/css/darkswarm/forms.scss b/app/webpacker/css/darkswarm/forms.scss index b44b32220f..5b494ec790 100644 --- a/app/webpacker/css/darkswarm/forms.scss +++ b/app/webpacker/css/darkswarm/forms.scss @@ -1,6 +1,3 @@ -@import "mixins"; -@import "branding"; - fieldset { border: 0; } diff --git a/app/webpacker/css/darkswarm/groups.scss b/app/webpacker/css/darkswarm/groups.scss index b6ba8087c7..09d19e8eb6 100644 --- a/app/webpacker/css/darkswarm/groups.scss +++ b/app/webpacker/css/darkswarm/groups.scss @@ -1,7 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "typography"; - // Search page #groups { @include groupsbg; diff --git a/app/webpacker/css/darkswarm/home_panes.scss b/app/webpacker/css/darkswarm/home_panes.scss index 0e63c36bec..d96e931466 100644 --- a/app/webpacker/css/darkswarm/home_panes.scss +++ b/app/webpacker/css/darkswarm/home_panes.scss @@ -1,9 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "typography"; -@import "animations"; -@import "variables"; - // Styling for big panes on homepage \\ #panes { .pane { diff --git a/app/webpacker/css/darkswarm/home_tagline.scss b/app/webpacker/css/darkswarm/home_tagline.scss index e16fa92dbf..9a0355f195 100644 --- a/app/webpacker/css/darkswarm/home_tagline.scss +++ b/app/webpacker/css/darkswarm/home_tagline.scss @@ -1,7 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "variables"; - // Styling for brand intro / tagline on homepage #tagline { @@ -13,7 +9,7 @@ @include fullbg; background-color: $ofn-grey; - background-image: url("../images/home/home.jpg"); + //background-image: url("../../images/home/home.jpg"); position: fixed; left: 0; right: 0; diff --git a/app/webpacker/css/darkswarm/hub_node.scss b/app/webpacker/css/darkswarm/hub_node.scss index f35713496f..99c700a69f 100644 --- a/app/webpacker/css/darkswarm/hub_node.scss +++ b/app/webpacker/css/darkswarm/hub_node.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - .hubs { .active_table .active_table_node { //Prevents ugly overflows on hub title diff --git a/app/webpacker/css/darkswarm/hubs.scss b/app/webpacker/css/darkswarm/hubs.scss index 253266eba4..344192b90b 100644 --- a/app/webpacker/css/darkswarm/hubs.scss +++ b/app/webpacker/css/darkswarm/hubs.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - #hubs { background-color: lighten($ofn-grey, 43%); diff --git a/app/webpacker/css/darkswarm/images.scss b/app/webpacker/css/darkswarm/images.scss index 739914d709..9019971bfb 100644 --- a/app/webpacker/css/darkswarm/images.scss +++ b/app/webpacker/css/darkswarm/images.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "variables"; -@import "branding"; - .product-img { text-align: center; diff --git a/app/webpacker/css/darkswarm/layout/offcanvas.scss b/app/webpacker/css/darkswarm/layout/offcanvas.scss index de54f0ef54..6efc1f8eba 100644 --- a/app/webpacker/css/darkswarm/layout/offcanvas.scss +++ b/app/webpacker/css/darkswarm/layout/offcanvas.scss @@ -1,5 +1,3 @@ -@import "compass/css3/transition"; - .off-canvas-fixed { @include transition(transform 1000ms ease-in-out); } diff --git a/app/webpacker/css/darkswarm/loading.scss b/app/webpacker/css/darkswarm/loading.scss index 32a3d6b9b4..f3d93f2624 100644 --- a/app/webpacker/css/darkswarm/loading.scss +++ b/app/webpacker/css/darkswarm/loading.scss @@ -1,5 +1,3 @@ -@import "compass/css3/user-interface"; - #loading { .reveal-modal-bg { z-index: 101; diff --git a/app/webpacker/css/darkswarm/map.scss b/app/webpacker/css/darkswarm/map.scss index b3a6d827ea..73c9d6bb80 100644 --- a/app/webpacker/css/darkswarm/map.scss +++ b/app/webpacker/css/darkswarm/map.scss @@ -1,8 +1,6 @@ // Place all the styles related to the map controller here. // They will automatically be included in application.css. // You can use Sass (SCSS) here: http://sass-lang.com/ -@import "mixins"; -@import "big-input"; .map-container { width: 100%; diff --git a/app/webpacker/css/darkswarm/menu.scss b/app/webpacker/css/darkswarm/menu.scss index 850622f50e..0f282a056c 100644 --- a/app/webpacker/css/darkswarm/menu.scss +++ b/app/webpacker/css/darkswarm/menu.scss @@ -1,8 +1,4 @@ //@import 'compass'; -@import 'branding'; -@import 'mixins'; -@import 'typography'; -@import 'variables'; nav.top-bar { @include textpress; diff --git a/app/webpacker/css/darkswarm/mixins.scss b/app/webpacker/css/darkswarm/mixins.scss index 55fa0e04df..deec6c3831 100644 --- a/app/webpacker/css/darkswarm/mixins.scss +++ b/app/webpacker/css/darkswarm/mixins.scss @@ -1,7 +1,4 @@ // Note this mixin file is used in ADMIN and FRONTEND -@import 'shared/variables/layout'; - -@import "branding"; // Generic \\ diff --git a/app/webpacker/css/darkswarm/modal-enterprises.scss b/app/webpacker/css/darkswarm/modal-enterprises.scss index c72aa79f71..e4adf73751 100644 --- a/app/webpacker/css/darkswarm/modal-enterprises.scss +++ b/app/webpacker/css/darkswarm/modal-enterprises.scss @@ -1,7 +1,3 @@ -@import 'branding'; -@import 'mixins'; -@import 'admin/globals/variables'; - // Generic styles for use .modal-centered { @@ -32,10 +28,10 @@ margin-bottom: 0.5rem; a.heading { - color: $color-link; + color: $teal-400; &:hover { - color: $color-link-hover; + color: $teal-500; text-decoration: underline; } } diff --git a/app/webpacker/css/darkswarm/modals.scss b/app/webpacker/css/darkswarm/modals.scss index 5f9cebc067..6dea3ae85f 100644 --- a/app/webpacker/css/darkswarm/modals.scss +++ b/app/webpacker/css/darkswarm/modals.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - dialog , .reveal-modal { border: none; diff --git a/app/webpacker/css/darkswarm/page_alert.scss b/app/webpacker/css/darkswarm/page_alert.scss index bbfde8cb6d..b905926dd6 100644 --- a/app/webpacker/css/darkswarm/page_alert.scss +++ b/app/webpacker/css/darkswarm/page_alert.scss @@ -1,8 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "animations"; -@import "compass/css3/transition"; - $page-alert-height: 55px; // Basic style \\ diff --git a/app/webpacker/css/darkswarm/pages/login_modal.scss b/app/webpacker/css/darkswarm/pages/login_modal.scss index 265c74519c..98ee4730c7 100644 --- a/app/webpacker/css/darkswarm/pages/login_modal.scss +++ b/app/webpacker/css/darkswarm/pages/login_modal.scss @@ -1,6 +1,3 @@ -@import '../base/colors'; -@import '../collapsible'; - // Styling for login modal to style tabs .reveal-modal.login-modal { border-bottom-color: $modal-background-color; diff --git a/app/webpacker/css/darkswarm/producer_node.scss b/app/webpacker/css/darkswarm/producer_node.scss index 93a9d4ae58..4415936479 100644 --- a/app/webpacker/css/darkswarm/producer_node.scss +++ b/app/webpacker/css/darkswarm/producer_node.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - .producers { .active_table .active_table_node { // Header row diff --git a/app/webpacker/css/darkswarm/producers.scss b/app/webpacker/css/darkswarm/producers.scss index e1a8c7a21b..239df132bf 100644 --- a/app/webpacker/css/darkswarm/producers.scss +++ b/app/webpacker/css/darkswarm/producers.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - .producers { @include producersbg; diff --git a/app/webpacker/css/darkswarm/registration.scss b/app/webpacker/css/darkswarm/registration.scss index 1486e644c4..f6f9f00216 100644 --- a/app/webpacker/css/darkswarm/registration.scss +++ b/app/webpacker/css/darkswarm/registration.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - #registration-modal { @media only screen and (max-width: 640px) { margin: 0 15px; diff --git a/app/webpacker/css/darkswarm/shop.scss b/app/webpacker/css/darkswarm/shop.scss index 8312f6c360..c9a3420f0a 100644 --- a/app/webpacker/css/darkswarm/shop.scss +++ b/app/webpacker/css/darkswarm/shop.scss @@ -1,9 +1,3 @@ -@import "mixins"; -@import "animations"; -@import "variables"; -@import "branding"; -@import "big-input"; - // Shop partials @import "shop-inputs"; @import "shop-navigation"; diff --git a/app/webpacker/css/darkswarm/shop_search.scss b/app/webpacker/css/darkswarm/shop_search.scss index 8f375cdfe4..115e0c48ca 100644 --- a/app/webpacker/css/darkswarm/shop_search.scss +++ b/app/webpacker/css/darkswarm/shop_search.scss @@ -1,7 +1,3 @@ -@import "mixins"; -@import "branding"; -@import "variables"; - .shop-searchbar { background-color: $grey-100; height: 5em; diff --git a/app/webpacker/css/darkswarm/shop_tabs.scss b/app/webpacker/css/darkswarm/shop_tabs.scss index 93b9e037c7..e34faf44f7 100644 --- a/app/webpacker/css/darkswarm/shop_tabs.scss +++ b/app/webpacker/css/darkswarm/shop_tabs.scss @@ -1,7 +1,3 @@ -@import "typography"; -@import "mixins"; -@import "branding"; - // Tabs styling #shop-tabs { diff --git a/app/webpacker/css/darkswarm/sidebar.scss b/app/webpacker/css/darkswarm/sidebar.scss index 2e6a7d0a2e..2c0d0e5933 100644 --- a/app/webpacker/css/darkswarm/sidebar.scss +++ b/app/webpacker/css/darkswarm/sidebar.scss @@ -1,12 +1,3 @@ -// OMG -// We can't import foundation components? -// See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252 - -@import "variables"; -@import "foundation/components/global"; -@import "foundation/components/buttons"; -@import "foundation/components/panels"; - #sidebar { margin-top: 1.875em; diff --git a/app/webpacker/css/darkswarm/signup.scss b/app/webpacker/css/darkswarm/signup.scss index 206d7d6656..1b63aa160a 100644 --- a/app/webpacker/css/darkswarm/signup.scss +++ b/app/webpacker/css/darkswarm/signup.scss @@ -1,9 +1,3 @@ -@import "branding"; -@import "mixins"; -@import "typography"; -@import "animations"; -@import "variables"; - #producer-signup.pane, #shops-signup.pane { @include tiledPane; diff --git a/app/webpacker/css/darkswarm/tabset.scss b/app/webpacker/css/darkswarm/tabset.scss index 225e4dd5f6..5525ebc338 100644 --- a/app/webpacker/css/darkswarm/tabset.scss +++ b/app/webpacker/css/darkswarm/tabset.scss @@ -1,7 +1,3 @@ -@import "typography"; -@import "mixins"; -@import "branding"; - .tabset-ctrl:not(#shop-tabs) { .tab-view { padding-top: 30px; diff --git a/app/webpacker/css/darkswarm/taxons.scss b/app/webpacker/css/darkswarm/taxons.scss index 006e15de58..eb88f8f9db 100644 --- a/app/webpacker/css/darkswarm/taxons.scss +++ b/app/webpacker/css/darkswarm/taxons.scss @@ -1,6 +1,3 @@ -@import "branding"; -@import "mixins"; - .fat-taxons, .fat-properties { display: inline-block; line-height: 1; diff --git a/app/webpacker/css/darkswarm/typography.scss b/app/webpacker/css/darkswarm/typography.scss index 37d7c955c0..2261036d74 100644 --- a/app/webpacker/css/darkswarm/typography.scss +++ b/app/webpacker/css/darkswarm/typography.scss @@ -1,4 +1,3 @@ -@import "branding"; @mixin headingFont { font-family: "Oswald", sans-serif; diff --git a/app/webpacker/css/darkswarm/ui.scss b/app/webpacker/css/darkswarm/ui.scss index b2177013cc..23983ad845 100644 --- a/app/webpacker/css/darkswarm/ui.scss +++ b/app/webpacker/css/darkswarm/ui.scss @@ -1,9 +1,3 @@ -@import "foundation/components/buttons"; -@import "branding"; -@import "mixins"; -@import "typography"; -@import "variables"; - // Button class extensions .neutral-btn { diff --git a/app/webpacker/css/darkswarm/variables.scss b/app/webpacker/css/darkswarm/variables.scss index d34f80593f..dc1521f069 100644 --- a/app/webpacker/css/darkswarm/variables.scss +++ b/app/webpacker/css/darkswarm/variables.scss @@ -1,5 +1,4 @@ @import "~foundation-sites/scss/foundation/components/global"; -@import "branding"; // Brand guide colours: // International: #81c26e diff --git a/app/webpacker/css/shared/variables/_layout.scss b/app/webpacker/css/shared/variables/layout.scss similarity index 100% rename from app/webpacker/css/shared/variables/_layout.scss rename to app/webpacker/css/shared/variables/layout.scss