diff --git a/Gemfile b/Gemfile index 24f9d76959..37f31cf756 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,6 @@ gem 'angular-rails-templates', '>= 0.3.0' gem 'awesome_nested_set' gem 'ransack', '2.4.2' gem 'responders' -gem 'sass-rails', '< 5.1.0' # this restriction originates from the compass-rails's version gem 'webpacker', '~> 5' gem 'i18n' @@ -104,7 +103,6 @@ gem 'whenever', require: false gem 'test-unit', '~> 3.5' gem 'coffee-rails', '~> 5.0.0' -gem 'compass-rails' gem 'mini_racer', '0.4.0' diff --git a/Gemfile.lock b/Gemfile.lock index 06a9170f4e..544acc4dbe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,7 +196,6 @@ GEM rubyzip (>= 1.3.0, < 3) childprocess (4.1.0) chronic (0.10.2) - chunky_png (1.4.0) climate_control (0.2.0) cliver (0.3.2) cocaine (0.5.8) @@ -211,22 +210,6 @@ GEM coffee-script-source (1.12.2) combine_pdf (1.0.21) ruby-rc4 (>= 0.1.5) - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) - compass-core (1.0.3) - multi_json (~> 1.0) - sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) - compass-rails (4.0.0) - compass (~> 1.0.0) - sass-rails (< 5.1) - sprockets (< 4.0) concurrent-ruby (1.1.9) connection_pool (2.2.5) crack (0.4.5) @@ -732,7 +715,6 @@ DEPENDENCIES catalog! coffee-rails (~> 5.0.0) combine_pdf - compass-rails cuprite custom_error_message! database_cleaner @@ -807,7 +789,6 @@ DEPENDENCIES rswag rubocop rubocop-rails - sass-rails (< 5.1.0) sd_notify select2-rails! selenium-webdriver diff --git a/app/webpacker/css/darkswarm/_shop-navigation.scss b/app/webpacker/css/darkswarm/_shop-navigation.scss index 152a3c97f4..54b48aaf7f 100644 --- a/app/webpacker/css/darkswarm/_shop-navigation.scss +++ b/app/webpacker/css/darkswarm/_shop-navigation.scss @@ -64,7 +64,7 @@ ordercycle { } select { - background-image: image-url('white-caret.svg'); + background-image: url('../images/white-caret.svg'); background-size: 30px auto; background-position-x: 102%; height: 2.35em; @@ -149,7 +149,7 @@ shop ordercycle { select { background-color: $white; - background-image: image-url('black-caret.svg'); + background-image: url('../images/black-caret.svg'); color: $grey-500; font-style: italic; } diff --git a/app/webpacker/css/darkswarm/all.scss b/app/webpacker/css/darkswarm/all.scss index ad896c008b..9dd99272ff 100644 --- a/app/webpacker/css/darkswarm/all.scss +++ b/app/webpacker/css/darkswarm/all.scss @@ -14,6 +14,55 @@ @import 'base/colors'; @import 'layout/offcanvas'; //@import '*'; +@import 'account'; +@import 'active_table'; +@import 'active_table_search'; +@import 'angular'; +@import 'animations'; +@import 'branding'; +@import 'cart-dropdown'; +@import 'cart-page'; +@import 'checkout'; +@import 'collapsible'; +@import 'distributor_header'; +@import 'embedded_shopfront'; +@import 'expanding-sidebar'; +@import 'footer'; +@import 'forms'; +@import 'groups'; +@import 'help-modal'; +@import 'home_panes'; +@import 'home_tagline'; +@import 'hub_node'; +@import 'hubs'; +@import 'ie_warning'; +@import 'images'; +@import 'lists'; +@import 'loading'; +@import 'map'; +@import 'menu'; +@import 'mixins'; +@import 'modal-enterprises'; +@import 'modals'; +@import 'overrides'; +@import 'page_alert'; +@import 'producer_node'; +@import 'producers'; +@import 'product_table'; +@import 'registration'; +@import 'shop'; +@import 'shop_search'; +@import 'shop_tabs'; +@import 'sidebar'; +@import 'signup'; +@import 'stripe-elements'; +@import 'style'; +@import 'tables'; +@import 'tabset'; +@import 'taxons'; +@import 'typography'; +@import 'ui'; + @import 'pages/login_modal'; @import 'web/all'; diff --git a/app/webpacker/css/darkswarm/base/colors.scss b/app/webpacker/css/darkswarm/base/colors.scss index dfff9cb584..756843c925 100644 --- a/app/webpacker/css/darkswarm/base/colors.scss +++ b/app/webpacker/css/darkswarm/base/colors.scss @@ -1,5 +1,36 @@ @import '../branding'; +//// Foundation base variables +// +//$white : #FFFFFF !default; +//$ghost : #FAFAFA !default; +//$snow : #F9F9F9 !default; +//$vapor : #F6F6F6 !default; +//$white-smoke : #F5F5F5 !default; +//$silver : #EFEFEF !default; +//$smoke : #EEEEEE !default; +//$gainsboro : #DDDDDD !default; +//$iron : #CCCCCC !default; +//$base : #AAAAAA !default; +//$aluminum : #999999 !default; +//$jumbo : #888888 !default; +//$monsoon : #777777 !default; +//$steel : #666666 !default; +//$charcoal : #555555 !default; +//$tuatara : #444444 !default; +//$oil : #333333 !default; +//$jet : #222222 !default; +//$black : #000000 !default; +// +//// We use these as default colors throughout +//$primary-color: #008CBA !default; // bondi-blue +//$secondary-color: #e7e7e7 !default; // white-lilac +//$alert-color: #f04124 !default; // cinnabar +//$success-color: #43AC6A !default; // sea-green +//$warning-color: #f08a24 !default; // carrot +//$info-color: #a0d3e8 !default; // cornflower + + $modal-background-color: #efefef; $modal-content-background-color: #fff; $modal-alert-link-color: #fff; diff --git a/app/webpacker/css/darkswarm/compass/css3/user-interface.scss b/app/webpacker/css/darkswarm/compass/css3/user-interface.scss index 53af4f025e..f0c06a4ab8 100644 --- a/app/webpacker/css/darkswarm/compass/css3/user-interface.scss +++ b/app/webpacker/css/darkswarm/compass/css3/user-interface.scss @@ -55,7 +55,7 @@ $input-placeholder-support-threshold: $graceful-usage-threshold !default; @if $current-prefix == -webkit { &::-webkit-input-placeholder { @content; } } - @elseif $current-prefix == -moz { + @else if $current-prefix == -moz { // for Firefox 19 and below @if support-legacy-browser("firefox", "4", "19", $threshold: $input-placeholder-support-threshold) { &:-moz-placeholder { @content; } @@ -63,7 +63,7 @@ $input-placeholder-support-threshold: $graceful-usage-threshold !default; // for Firefox 20 and above &::-moz-placeholder { @content; } } - @elseif $current-prefix == -ms { + @else if $current-prefix == -ms { &:-ms-input-placeholder { @content; } } } diff --git a/app/webpacker/css/darkswarm/compass/support.scss b/app/webpacker/css/darkswarm/compass/support.scss index a0eacf2d6d..2b39de5d1c 100644 --- a/app/webpacker/css/darkswarm/compass/support.scss +++ b/app/webpacker/css/darkswarm/compass/support.scss @@ -109,3 +109,10 @@ $default-capability-options: ( #{inspect($current-browser-versions)} */ } } + +// Output a property and value using the current prefix. +// It will be unprefixed if $current-prefix is null. +@mixin prefix-prop($property, $value, $prefix: $current-prefix) { + #{prefix-identifier($property, $prefix)}: $value; +} + diff --git a/app/webpacker/css/darkswarm/footer.scss b/app/webpacker/css/darkswarm/footer.scss index 43b5898c7c..b28e9747fa 100644 --- a/app/webpacker/css/darkswarm/footer.scss +++ b/app/webpacker/css/darkswarm/footer.scss @@ -50,7 +50,7 @@ footer { width: 100%; border: 1px solid rgba($dark-grey, 0.35); - background-image: image-url("tile-wide.png"); + background-image: url("../images/tile-wide.png"); background-position: center center; background-color: #bbb; padding: 12px 0 8px 0; diff --git a/app/webpacker/css/darkswarm/home_panes.scss b/app/webpacker/css/darkswarm/home_panes.scss index 20a8d82687..0e63c36bec 100644 --- a/app/webpacker/css/darkswarm/home_panes.scss +++ b/app/webpacker/css/darkswarm/home_panes.scss @@ -42,7 +42,7 @@ } #stats.pane { - background-image: image-url("home/background-blurred-oranges.jpg"); + background-image: url("../images/home/background-blurred-oranges.jpg"); background-position: center center; background-color: $ofn-grey; @@ -94,7 +94,7 @@ } .home-icon-box { - background-image: image-url("ofn-o.png"); + background-image: url("../images/ofn-o.png"); background-position: center center; background-repeat: no-repeat; background-size: auto 100%; @@ -121,15 +121,15 @@ background-size: auto 100%; &.search { - background-image: image-url("icon-mask-magnifier.png"); + background-image: url("../images/icon-mask-magnifier.png"); } &.shop { - background-image: image-url("icon-mask-apple.png"); + background-image: url("../images/icon-mask-apple.png"); } &.pick-up-delivery { - background-image: image-url("icon-mask-truck.png"); + background-image: url("../images/icon-mask-truck.png"); } } } diff --git a/app/webpacker/css/darkswarm/home_tagline.scss b/app/webpacker/css/darkswarm/home_tagline.scss index 7ad1ea0241..e16fa92dbf 100644 --- a/app/webpacker/css/darkswarm/home_tagline.scss +++ b/app/webpacker/css/darkswarm/home_tagline.scss @@ -13,7 +13,7 @@ @include fullbg; background-color: $ofn-grey; - background-image: image-url("home/home.jpg"); + background-image: url("../images/home/home.jpg"); position: fixed; left: 0; right: 0; diff --git a/app/webpacker/css/darkswarm/menu.scss b/app/webpacker/css/darkswarm/menu.scss index 33e4485b9c..850622f50e 100644 --- a/app/webpacker/css/darkswarm/menu.scss +++ b/app/webpacker/css/darkswarm/menu.scss @@ -14,7 +14,7 @@ nav.top-bar { z-index: 190; } -@media #{$large-only} { +@media #{$large-up} { .top-bar--menu-item-with-icon span { display: none; } @@ -237,7 +237,7 @@ nav.top-bar { [role="main"] { margin-top: 2.8em; - @media #{$large-up} { + @media #{$large-up} { margin-top: 0; } } diff --git a/app/webpacker/css/darkswarm/mixins.scss b/app/webpacker/css/darkswarm/mixins.scss index 90febd6009..55fa0e04df 100644 --- a/app/webpacker/css/darkswarm/mixins.scss +++ b/app/webpacker/css/darkswarm/mixins.scss @@ -6,7 +6,7 @@ // Generic \\ @mixin tiledPane { - background-image: image-url("tile-wide.png"); + background-image: url("../images/tile-wide.png"); background-color: $brand-colour; background-position: center center; @@ -180,7 +180,7 @@ @mixin producersbg { background-color: lighten($clr-turquoise, 68%); - background-image: image-url("producers.svg"); + background-image: url("../images/producers.svg"); background-position: center 50px; background-repeat: no-repeat; background-size: 922px 763px; @@ -188,13 +188,13 @@ @mixin hubsbg { background-color: $brand-colour; - background-image: image-url("hubs-bg.jpg"); + background-image: url("../images/hubs-bg.jpg"); background-position: center center; } @mixin groupsbg { background-color: lighten($clr-brick, 56%); - background-image: image-url("groups.svg"); + background-image: url("../images/groups.svg"); background-position: center 50px; background-repeat: no-repeat; background-size: 922px 922px; diff --git a/app/webpacker/css/darkswarm/page_alert.scss b/app/webpacker/css/darkswarm/page_alert.scss index 08f35944c9..bbfde8cb6d 100644 --- a/app/webpacker/css/darkswarm/page_alert.scss +++ b/app/webpacker/css/darkswarm/page_alert.scss @@ -14,7 +14,7 @@ $page-alert-height: 55px; border-left: none; border-right: none; background-color: #bbb; - background-image: image-url("tile-wide.png"); + background-image: url("../images/tile-wide.png"); background-position: center center; padding: 12px 0 8px 0; margin: 0; diff --git a/app/webpacker/css/darkswarm/shop_search.scss b/app/webpacker/css/darkswarm/shop_search.scss index 28e4269b4c..8f375cdfe4 100644 --- a/app/webpacker/css/darkswarm/shop_search.scss +++ b/app/webpacker/css/darkswarm/shop_search.scss @@ -31,7 +31,7 @@ padding: 0 2.25em 0 2.75em; width: 100%; min-width: 0; - background: $white image-url("icn-search-grey.png") 1em center no-repeat; + background: $white url("../images/icn-search-grey.png") 1em center no-repeat; font-size: 1rem; // avoid zoom on iphone, see issue #4535 &::placeholder { diff --git a/app/webpacker/css/darkswarm/sidebar.scss b/app/webpacker/css/darkswarm/sidebar.scss index 587bb8bc14..2e6a7d0a2e 100644 --- a/app/webpacker/css/darkswarm/sidebar.scss +++ b/app/webpacker/css/darkswarm/sidebar.scss @@ -3,9 +3,9 @@ // See https://github.com/zurb/foundation/issues/3855#issuecomment-30372252 @import "variables"; -//@import "foundation/components/global"; -//@import "foundation/components/buttons"; -//@import "foundation/components/panels"; +@import "foundation/components/global"; +@import "foundation/components/buttons"; +@import "foundation/components/panels"; #sidebar { margin-top: 1.875em; diff --git a/app/webpacker/css/darkswarm/style.scss b/app/webpacker/css/darkswarm/style.scss index 9228b0bbe9..77627effe1 100644 --- a/app/webpacker/css/darkswarm/style.scss +++ b/app/webpacker/css/darkswarm/style.scss @@ -1,10 +1,10 @@ @font-face { font-family: 'OFN'; - src: font-url('OFN-v2.eot'); - src: font-url('OFN-v2.eot') format('embedded-opentype'), - font-url('OFN-v2.woff') format('woff'), - font-url('OFN-v2.ttf') format('truetype'), - font-url('OFN-v2.svg') format('svg'); + src: url('../fonts/OFN-v2.eot'); + src: url('../fonts/OFN-v2.eot') format('embedded-opentype'), + url('../fonts/OFN-v2.woff') format('woff'), + url('../fonts/OFN-v2.ttf') format('truetype'), + url('../fonts/OFN-v2.svg') format('svg'); font-weight: normal; font-style: normal; } diff --git a/app/webpacker/css/darkswarm/ui.scss b/app/webpacker/css/darkswarm/ui.scss index ce516b58c4..b2177013cc 100644 --- a/app/webpacker/css/darkswarm/ui.scss +++ b/app/webpacker/css/darkswarm/ui.scss @@ -1,4 +1,4 @@ -//@import "foundation/components/buttons"; +@import "foundation/components/buttons"; @import "branding"; @import "mixins"; @import "typography"; diff --git a/app/webpacker/css/shared/question-mark-icon.scss b/app/webpacker/css/shared/question-mark-icon.scss index 0f4901a98f..c468d93b1a 100644 --- a/app/webpacker/css/shared/question-mark-icon.scss +++ b/app/webpacker/css/shared/question-mark-icon.scss @@ -6,7 +6,7 @@ } .question-mark-icon { - background-image: image-url("question-mark-icon.svg"); + background-image: url("../images/question-mark-icon.svg"); background-size: cover; background-repeat: no-repeat; border-radius: 50%; diff --git a/app/webpacker/css/shared/variables/variables.scss b/app/webpacker/css/shared/variables/variables.scss index 866a20d160..2104c96e5b 100644 --- a/app/webpacker/css/shared/variables/variables.scss +++ b/app/webpacker/css/shared/variables/variables.scss @@ -9,11 +9,11 @@ $modal-zIndex: 1005; @font-face { font-family: 'OFN'; - src: font-url('OFN-v2.eot'); - src: font-url('OFN-v2.eot') format('embedded-opentype'), - font-url('OFN-v2.woff') format('woff'), - font-url('OFN-v2.ttf') format('truetype'), - font-url('OFN-v2.svg') format('svg'); + src: url('../fonts/OFN-v2.eot'); + src: url('../fonts/OFN-v2.eot') format('embedded-opentype'), + url('../fonts/OFN-v2.woff') format('woff'), + url('../fonts/OFN-v2.ttf') format('truetype'), + url('../fonts/OFN-v2.svg') format('svg'); font-weight: normal; font-style: normal; } diff --git a/app/webpacker/images/black-caret.svg b/app/webpacker/images/black-caret.svg new file mode 100644 index 0000000000..818b7411a2 --- /dev/null +++ b/app/webpacker/images/black-caret.svg @@ -0,0 +1,23 @@ + +image/svg+xml \ No newline at end of file diff --git a/app/webpacker/images/browser-logos/chrome.png b/app/webpacker/images/browser-logos/chrome.png new file mode 100644 index 0000000000..a55fcfec96 Binary files /dev/null and b/app/webpacker/images/browser-logos/chrome.png differ diff --git a/app/webpacker/images/browser-logos/firefox.png b/app/webpacker/images/browser-logos/firefox.png new file mode 100644 index 0000000000..91c1f85a95 Binary files /dev/null and b/app/webpacker/images/browser-logos/firefox.png differ diff --git a/app/webpacker/images/browser-logos/internet-explorer.png b/app/webpacker/images/browser-logos/internet-explorer.png new file mode 100644 index 0000000000..af4739dd89 Binary files /dev/null and b/app/webpacker/images/browser-logos/internet-explorer.png differ diff --git a/app/webpacker/images/case-studies/South_East_Food_Hub.png b/app/webpacker/images/case-studies/South_East_Food_Hub.png new file mode 100644 index 0000000000..1eaed1a657 Binary files /dev/null and b/app/webpacker/images/case-studies/South_East_Food_Hub.png differ diff --git a/app/webpacker/images/case-studies/baw-baw.png b/app/webpacker/images/case-studies/baw-baw.png new file mode 100644 index 0000000000..aac409ea35 Binary files /dev/null and b/app/webpacker/images/case-studies/baw-baw.png differ diff --git a/app/webpacker/images/case-studies/bfc_logo_square.png b/app/webpacker/images/case-studies/bfc_logo_square.png new file mode 100644 index 0000000000..30d0c4e935 Binary files /dev/null and b/app/webpacker/images/case-studies/bfc_logo_square.png differ diff --git a/app/webpacker/images/case-studies/bonnie-beef-growers.png b/app/webpacker/images/case-studies/bonnie-beef-growers.png new file mode 100644 index 0000000000..9845874aea Binary files /dev/null and b/app/webpacker/images/case-studies/bonnie-beef-growers.png differ diff --git a/app/webpacker/images/case-studies/jindivick.jpg b/app/webpacker/images/case-studies/jindivick.jpg new file mode 100644 index 0000000000..be3fac1851 Binary files /dev/null and b/app/webpacker/images/case-studies/jindivick.jpg differ diff --git a/app/webpacker/images/case-studies/jonai.png b/app/webpacker/images/case-studies/jonai.png new file mode 100644 index 0000000000..0364e26dad Binary files /dev/null and b/app/webpacker/images/case-studies/jonai.png differ diff --git a/app/webpacker/images/case-studies/longley.png b/app/webpacker/images/case-studies/longley.png new file mode 100644 index 0000000000..ead3b3d2f9 Binary files /dev/null and b/app/webpacker/images/case-studies/longley.png differ diff --git a/app/webpacker/images/case-studies/mt-alexander.png b/app/webpacker/images/case-studies/mt-alexander.png new file mode 100644 index 0000000000..4bb0e54652 Binary files /dev/null and b/app/webpacker/images/case-studies/mt-alexander.png differ diff --git a/app/webpacker/images/case-studies/wandiful.png b/app/webpacker/images/case-studies/wandiful.png new file mode 100644 index 0000000000..d50cca0d49 Binary files /dev/null and b/app/webpacker/images/case-studies/wandiful.png differ diff --git a/app/webpacker/images/collapse.png b/app/webpacker/images/collapse.png new file mode 100644 index 0000000000..d2f5fc73a9 Binary files /dev/null and b/app/webpacker/images/collapse.png differ diff --git a/app/webpacker/images/countdown.png b/app/webpacker/images/countdown.png new file mode 100644 index 0000000000..12c4877a78 Binary files /dev/null and b/app/webpacker/images/countdown.png differ diff --git a/app/webpacker/images/credit_cards/credit_card.gif b/app/webpacker/images/credit_cards/credit_card.gif new file mode 100644 index 0000000000..2e61a23c31 Binary files /dev/null and b/app/webpacker/images/credit_cards/credit_card.gif differ diff --git a/app/webpacker/images/datepicker/cal.gif b/app/webpacker/images/datepicker/cal.gif new file mode 100644 index 0000000000..8526cf5d19 Binary files /dev/null and b/app/webpacker/images/datepicker/cal.gif differ diff --git a/app/webpacker/images/eaterprises_logo.jpg b/app/webpacker/images/eaterprises_logo.jpg new file mode 100644 index 0000000000..a38c7b72c5 Binary files /dev/null and b/app/webpacker/images/eaterprises_logo.jpg differ diff --git a/app/webpacker/images/enterprise-type.png b/app/webpacker/images/enterprise-type.png new file mode 100644 index 0000000000..bee6ee1a13 Binary files /dev/null and b/app/webpacker/images/enterprise-type.png differ diff --git a/app/webpacker/images/expand.png b/app/webpacker/images/expand.png new file mode 100644 index 0000000000..012b3ea8fa Binary files /dev/null and b/app/webpacker/images/expand.png differ diff --git a/app/webpacker/images/gray_jean.png b/app/webpacker/images/gray_jean.png new file mode 100644 index 0000000000..d911ae617e Binary files /dev/null and b/app/webpacker/images/gray_jean.png differ diff --git a/app/webpacker/images/gray_jean_light.png b/app/webpacker/images/gray_jean_light.png new file mode 100644 index 0000000000..2ee033a20a Binary files /dev/null and b/app/webpacker/images/gray_jean_light.png differ diff --git a/app/webpacker/images/groups.svg b/app/webpacker/images/groups.svg new file mode 100644 index 0000000000..a2e353d47f --- /dev/null +++ b/app/webpacker/images/groups.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/webpacker/images/home/background-blurred-oranges.jpg b/app/webpacker/images/home/background-blurred-oranges.jpg new file mode 100644 index 0000000000..611a466132 Binary files /dev/null and b/app/webpacker/images/home/background-blurred-oranges.jpg differ diff --git a/app/webpacker/images/home/tagline-bg.jpg b/app/webpacker/images/home/tagline-bg.jpg new file mode 100644 index 0000000000..68366a9569 Binary files /dev/null and b/app/webpacker/images/home/tagline-bg.jpg differ diff --git a/app/webpacker/images/hubs-bg.jpg b/app/webpacker/images/hubs-bg.jpg new file mode 100644 index 0000000000..021ead1074 Binary files /dev/null and b/app/webpacker/images/hubs-bg.jpg differ diff --git a/app/webpacker/images/icn-close.png b/app/webpacker/images/icn-close.png new file mode 100644 index 0000000000..6ef99bffec Binary files /dev/null and b/app/webpacker/images/icn-close.png differ diff --git a/app/webpacker/images/icn-search-grey.png b/app/webpacker/images/icn-search-grey.png new file mode 100644 index 0000000000..15af5ed712 Binary files /dev/null and b/app/webpacker/images/icn-search-grey.png differ diff --git a/app/webpacker/images/icon-mask-apple.png b/app/webpacker/images/icon-mask-apple.png new file mode 100644 index 0000000000..236e0a78e8 Binary files /dev/null and b/app/webpacker/images/icon-mask-apple.png differ diff --git a/app/webpacker/images/icon-mask-bread.png b/app/webpacker/images/icon-mask-bread.png new file mode 100644 index 0000000000..5b7e3a1c79 Binary files /dev/null and b/app/webpacker/images/icon-mask-bread.png differ diff --git a/app/webpacker/images/icon-mask-magnifier.png b/app/webpacker/images/icon-mask-magnifier.png new file mode 100644 index 0000000000..701f3918f7 Binary files /dev/null and b/app/webpacker/images/icon-mask-magnifier.png differ diff --git a/app/webpacker/images/icon-mask-truck.png b/app/webpacker/images/icon-mask-truck.png new file mode 100644 index 0000000000..e15c54a3b3 Binary files /dev/null and b/app/webpacker/images/icon-mask-truck.png differ diff --git a/app/webpacker/images/logo-australia.png b/app/webpacker/images/logo-australia.png new file mode 100644 index 0000000000..b4e8dce42b Binary files /dev/null and b/app/webpacker/images/logo-australia.png differ diff --git a/app/webpacker/images/logo-black.png b/app/webpacker/images/logo-black.png new file mode 100644 index 0000000000..2a33dc3610 Binary files /dev/null and b/app/webpacker/images/logo-black.png differ diff --git a/app/webpacker/images/logo-black.svg b/app/webpacker/images/logo-black.svg new file mode 100644 index 0000000000..5f69f364c4 --- /dev/null +++ b/app/webpacker/images/logo-black.svg @@ -0,0 +1,82 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/app/webpacker/images/logo-color.png b/app/webpacker/images/logo-color.png new file mode 100644 index 0000000000..fd709b46e9 Binary files /dev/null and b/app/webpacker/images/logo-color.png differ diff --git a/app/webpacker/images/logo-color.svg b/app/webpacker/images/logo-color.svg new file mode 100644 index 0000000000..84de1b4ceb --- /dev/null +++ b/app/webpacker/images/logo-color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/webpacker/images/logo-global-white.png b/app/webpacker/images/logo-global-white.png new file mode 100644 index 0000000000..c24b525bd2 Binary files /dev/null and b/app/webpacker/images/logo-global-white.png differ diff --git a/app/webpacker/images/logo-white-notext.png b/app/webpacker/images/logo-white-notext.png new file mode 100644 index 0000000000..c8f2fb0098 Binary files /dev/null and b/app/webpacker/images/logo-white-notext.png differ diff --git a/app/webpacker/images/logo-white.png b/app/webpacker/images/logo-white.png new file mode 100644 index 0000000000..87cbfa518a Binary files /dev/null and b/app/webpacker/images/logo-white.png differ diff --git a/app/webpacker/images/logo-white.svg b/app/webpacker/images/logo-white.svg new file mode 100644 index 0000000000..c2c22bab40 --- /dev/null +++ b/app/webpacker/images/logo-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/webpacker/images/logo/spree_50.png b/app/webpacker/images/logo/spree_50.png new file mode 100644 index 0000000000..9fefb2ee16 Binary files /dev/null and b/app/webpacker/images/logo/spree_50.png differ diff --git a/app/webpacker/images/matte.png b/app/webpacker/images/matte.png new file mode 100644 index 0000000000..0f6a26429c Binary files /dev/null and b/app/webpacker/images/matte.png differ diff --git a/app/webpacker/images/menu/btn-menu-mobile.png b/app/webpacker/images/menu/btn-menu-mobile.png new file mode 100644 index 0000000000..1d2d414473 Binary files /dev/null and b/app/webpacker/images/menu/btn-menu-mobile.png differ diff --git a/app/webpacker/images/menu/icn-cart.svg b/app/webpacker/images/menu/icn-cart.svg new file mode 100755 index 0000000000..3f5fe008e3 --- /dev/null +++ b/app/webpacker/images/menu/icn-cart.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/webpacker/images/menu/icn-login.svg b/app/webpacker/images/menu/icn-login.svg new file mode 100644 index 0000000000..b790141d11 --- /dev/null +++ b/app/webpacker/images/menu/icn-login.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/webpacker/images/menu/icn-profile.svg b/app/webpacker/images/menu/icn-profile.svg new file mode 100755 index 0000000000..cc30acc595 --- /dev/null +++ b/app/webpacker/images/menu/icn-profile.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/app/webpacker/images/ofn-logo.png b/app/webpacker/images/ofn-logo.png new file mode 100644 index 0000000000..6058b26a75 Binary files /dev/null and b/app/webpacker/images/ofn-logo.png differ diff --git a/app/webpacker/images/ofn-o.png b/app/webpacker/images/ofn-o.png new file mode 100644 index 0000000000..8a5d24f41b Binary files /dev/null and b/app/webpacker/images/ofn-o.png differ diff --git a/app/webpacker/images/ofn-o.svg b/app/webpacker/images/ofn-o.svg new file mode 100644 index 0000000000..2082ae6176 --- /dev/null +++ b/app/webpacker/images/ofn-o.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/webpacker/images/potatoes.png b/app/webpacker/images/potatoes.png new file mode 100644 index 0000000000..baea478c9b Binary files /dev/null and b/app/webpacker/images/potatoes.png differ diff --git a/app/webpacker/images/producers.svg b/app/webpacker/images/producers.svg new file mode 100644 index 0000000000..9804557f4b --- /dev/null +++ b/app/webpacker/images/producers.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/webpacker/images/producers/producers-pg-bg.jpg b/app/webpacker/images/producers/producers-pg-bg.jpg new file mode 100644 index 0000000000..612e2d9404 Binary files /dev/null and b/app/webpacker/images/producers/producers-pg-bg.jpg differ diff --git a/app/webpacker/images/question-mark-icon.svg b/app/webpacker/images/question-mark-icon.svg new file mode 100644 index 0000000000..cbef96910d --- /dev/null +++ b/app/webpacker/images/question-mark-icon.svg @@ -0,0 +1 @@ + diff --git a/app/webpacker/images/select2.png b/app/webpacker/images/select2.png new file mode 100644 index 0000000000..7cef1c04f8 Binary files /dev/null and b/app/webpacker/images/select2.png differ diff --git a/app/webpacker/images/select2x2.png b/app/webpacker/images/select2x2.png new file mode 100644 index 0000000000..62628d1302 Binary files /dev/null and b/app/webpacker/images/select2x2.png differ diff --git a/app/webpacker/images/spinner.gif b/app/webpacker/images/spinner.gif new file mode 100644 index 0000000000..877f43f662 Binary files /dev/null and b/app/webpacker/images/spinner.gif differ diff --git a/app/webpacker/images/spinning-circles.svg b/app/webpacker/images/spinning-circles.svg new file mode 100755 index 0000000000..258d405c49 --- /dev/null +++ b/app/webpacker/images/spinning-circles.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/webpacker/images/tile-wide.png b/app/webpacker/images/tile-wide.png new file mode 100644 index 0000000000..b802d0a334 Binary files /dev/null and b/app/webpacker/images/tile-wide.png differ diff --git a/app/webpacker/images/white-caret.svg b/app/webpacker/images/white-caret.svg new file mode 100644 index 0000000000..eed771fc14 --- /dev/null +++ b/app/webpacker/images/white-caret.svg @@ -0,0 +1,23 @@ + +image/svg+xml \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index a289ae57e8..09b2cabc11 100644 --- a/config/application.rb +++ b/config/application.rb @@ -204,20 +204,14 @@ module Openfoodnetwork # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.2' - config.sass.load_paths += [ - "#{Gem.loaded_specs['foundation-rails'].full_gem_path}/vendor/assets/stylesheets/foundation/components", - "#{Gem.loaded_specs['foundation-rails'].full_gem_path}/vendor/assets/stylesheets/foundation/" - ] - # css and js files other than application.* are not precompiled by default # Instead, they must be explicitly included below # http://stackoverflow.com/questions/8012434/what-is-the-purpose-of-config-assets-precompile config.assets.initialize_on_precompile = true config.assets.precompile += ['iehack.js'] - config.assets.precompile += ['admin/all.css', 'admin/*.js', 'admin/**/*.js'] - config.assets.precompile += ['web/all.css', 'web/all.js'] - config.assets.precompile += ['darkswarm/all.css', 'darkswarm/all.js'] - config.assets.precompile += ['mail/all.css'] + config.assets.precompile += ['admin/*.js', 'admin/**/*.js'] + config.assets.precompile += ['web/all.js'] + config.assets.precompile += ['darkswarm/all.js'] config.assets.precompile += ['shared/*'] config.assets.precompile += ['qz/*'] config.assets.precompile += ['*.jpg', '*.jpeg', '*.png', '*.gif' '*.svg'] diff --git a/config/initializers/compass.rb b/config/initializers/compass.rb deleted file mode 100644 index ea537f0390..0000000000 --- a/config/initializers/compass.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'compass' -Sass.load_paths << Compass::Frameworks['compass'].stylesheets_directory diff --git a/config/webpacker.yml b/config/webpacker.yml index c2f655cce2..3fceed6a77 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -13,6 +13,8 @@ default: &default additional_paths: [ 'vendor', 'app/webpacker/css', + 'app/webpacker/fonts', + 'app/webpacker/images', 'engines/web/app/assets/stylesheets' ] @@ -50,6 +52,9 @@ default: &default - .gif - .jpeg - .jpg + - .eot + - .ttf + - .woff development: <<: *default