diff --git a/Gemfile b/Gemfile index bb486680..76f914bf 100644 --- a/Gemfile +++ b/Gemfile @@ -9,8 +9,7 @@ gem "rails", "~> 6.0.3" # assets gem "autoprefixer-rails" gem "aws-sdk-s3" -gem "foundation-icons-sass-rails" -gem "foundation-rails" +gem "materialize-sass" gem "image_processing" gem "premailer-rails" gem "sass-rails", "~> 5.0.0", ">= 5.0.6" diff --git a/Gemfile.lock b/Gemfile.lock index 07effd89..ef222161 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,10 +94,6 @@ GEM aws-sigv4 (~> 1.1) aws-sigv4 (1.1.4) aws-eventstream (~> 1.0, >= 1.0.2) - babel-source (5.8.35) - babel-transpiler (0.7.0) - babel-source (>= 4.0, < 6) - execjs (~> 2.0) bcrypt (3.1.16) bindex (0.8.1) bootsnap (1.4.6) @@ -172,13 +168,6 @@ GEM activesupport capybara i18n - foundation-icons-sass-rails (3.0.0) - railties (>= 3.1.1) - sass-rails (>= 3.1.1) - foundation-rails (6.6.2.0) - railties (>= 3.1.0) - sass (>= 3.3.0) - sprockets-es6 (>= 0.9.0) foundation_emails (2.2.1.0) globalid (0.4.2) activesupport (>= 4.2.0) @@ -238,6 +227,8 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.1) + materialize-sass (1.0.0) + autoprefixer-rails (>= 6.0.3) memory_profiler (0.9.7) meta-tags (2.14.0) actionpack (>= 3.2.0, < 6.2) @@ -432,10 +423,6 @@ GEM sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-es6 (0.9.2) - babel-source (>= 5.8.11) - babel-transpiler - sprockets (>= 3.0.0) sprockets-rails (3.2.2) actionpack (>= 4.0) activesupport (>= 4.0) @@ -501,8 +488,6 @@ DEPENDENCIES faker flamegraph formulaic - foundation-icons-sass-rails - foundation-rails google-analytics-rails guard-rspec health_check @@ -512,6 +497,7 @@ DEPENDENCIES kaminari launchy letter_opener + materialize-sass memory_profiler meta-tags newrelic_rpm diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 4e308204..a4132ea9 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -1,4 +1,2 @@ -//= require foundation //= require_tree . - -$(document).foundation(); +//= require materialize diff --git a/app/assets/stylesheets/components/all.scss b/app/assets/stylesheets/components/all.scss index 73eddee1..f4a00b6f 100644 --- a/app/assets/stylesheets/components/all.scss +++ b/app/assets/stylesheets/components/all.scss @@ -1,4 +1,4 @@ @import "forms"; -@import "navigation"; -@import "notifications"; +// @import "navigation"; +// @import "notifications"; @import "container"; diff --git a/app/assets/stylesheets/components/forms.scss b/app/assets/stylesheets/components/forms.scss index cb56c314..61d6fed2 100644 --- a/app/assets/stylesheets/components/forms.scss +++ b/app/assets/stylesheets/components/forms.scss @@ -3,13 +3,13 @@ color: $form-label-color-invalid; } - input, - textarea, - select { - @include form-input-error; - } + // input, + // textarea, + // select { + // @include form-input-error; + // } - .error { - @include form-error; - } + // .error { + // @include form-error; + // } } diff --git a/app/assets/stylesheets/core/all.scss b/app/assets/stylesheets/core/all.scss index 9a49afb4..bdabb0e1 100644 --- a/app/assets/stylesheets/core/all.scss +++ b/app/assets/stylesheets/core/all.scss @@ -1,2 +1,2 @@ +@import "materialize"; @import "settings"; -@import "foundation_and_overrides"; diff --git a/app/assets/stylesheets/core/settings.scss b/app/assets/stylesheets/core/settings.scss index 8a9ab56a..89cd0879 100644 --- a/app/assets/stylesheets/core/settings.scss +++ b/app/assets/stylesheets/core/settings.scss @@ -60,7 +60,7 @@ // 55. Top Bar // 56. Xy Grid -@import 'util/util'; +// @import 'util/util'; // 1. Global // --------- @@ -75,6 +75,8 @@ $foundation-palette: ( warning: #ffae00, alert: #cc4b37, ); +$warning-color: #ffae00; +$alert-color: #cc4b37; $light-gray: #e6e6e6; $medium-gray: #cacaca; $dark-gray: #8a8a8a; @@ -100,7 +102,7 @@ $global-color-pick-contrast-tolerance: 0; $print-transparent-backgrounds: true; $print-hrefs: true; -@include add-foundation-colors; +// @include add-foundation-colors; // 2. Breakpoints // -------------- @@ -808,9 +810,9 @@ $table-is-striped: true; $table-striped-background: smart-scale($table-background, $table-color-scale); $table-stripe: even; $table-head-background: smart-scale($table-background, $table-color-scale / 2); -$table-head-row-hover: darken($table-head-background, $table-hover-scale); +// $table-head-row-hover: darken($table-head-background, $table-hover-scale); $table-foot-background: smart-scale($table-background, $table-color-scale); -$table-foot-row-hover: darken($table-foot-background, $table-hover-scale); +// $table-foot-row-hover: darken($table-foot-background, $table-hover-scale); $table-head-font-color: $body-font-color; $table-foot-font-color: $body-font-color; $show-header-for-stacked: false; diff --git a/app/views/application/_navigation.html.slim b/app/views/application/_navigation.html.slim index 67402405..0609dc6f 100755 --- a/app/views/application/_navigation.html.slim +++ b/app/views/application/_navigation.html.slim @@ -1,4 +1,4 @@ -.title-bar data-hide-for="medium" data-responsive-toggle="navigation_menu" +.title-bar.hide-on-med-and-up data-responsive-toggle="navigation_menu" button.menu-icon data-toggle="" type="button" title-bar-title Menu