Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Materialize library #628

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 3 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -501,8 +488,6 @@ DEPENDENCIES
faker
flamegraph
formulaic
foundation-icons-sass-rails
foundation-rails
google-analytics-rails
guard-rspec
health_check
Expand All @@ -512,6 +497,7 @@ DEPENDENCIES
kaminari
launchy
letter_opener
materialize-sass
memory_profiler
meta-tags
newrelic_rpm
Expand Down
4 changes: 1 addition & 3 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
//= require foundation
//= require_tree .

$(document).foundation();
//= require materialize
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/all.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "forms";
@import "navigation";
@import "notifications";
// @import "navigation";
// @import "notifications";
@import "container";
16 changes: 8 additions & 8 deletions app/assets/stylesheets/components/forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
// }
}
2 changes: 1 addition & 1 deletion app/assets/stylesheets/core/all.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@import "materialize";
@import "settings";
@import "foundation_and_overrides";
10 changes: 6 additions & 4 deletions app/assets/stylesheets/core/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
// 55. Top Bar
// 56. Xy Grid

@import 'util/util';
// @import 'util/util';

// 1. Global
// ---------
Expand All @@ -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;
Expand All @@ -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
// --------------
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/views/application/_navigation.html.slim
Original file line number Diff line number Diff line change
@@ -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

Expand Down