From f0904fff63de940c1bae084dc4dd51ff069cb1b5 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Tue, 19 Jun 2018 14:25:24 +0200 Subject: [PATCH] Update to Zurb Foundation 6.4 --- Gemfile | 2 +- Gemfile.lock | 2 +- app/assets/stylesheets/_settings.scss | 15 ++++++++++++--- .../stylesheets/foundation_and_overrides.scss | 15 +++++++++------ 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 22769fc..ee77e1f 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ end # Zurb Foundation # https://github.com/zurb/foundation-rails -gem 'foundation-rails', '~> 6.3' +gem 'foundation-rails', '~> 6.4' # Pagination gem 'will_paginate' diff --git a/Gemfile.lock b/Gemfile.lock index a5d93f9..6978545 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -333,7 +333,7 @@ DEPENDENCIES devise fancybox-rails font-awesome-rails - foundation-rails (~> 6.3) + foundation-rails (~> 6.4) guard-minitest guard-rails jbuilder (~> 2.5) diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss index 126c30f..26f74f9 100644 --- a/app/assets/stylesheets/_settings.scss +++ b/app/assets/stylesheets/_settings.scss @@ -69,7 +69,7 @@ $global-font-size: 100%; $global-width: rem-calc(1200); $global-lineheight: 1.5; $foundation-palette: ( - primary: $debian-color, + primary: #1779ba, secondary: #767676, success: #3adb76, warning: #ffae00, @@ -90,11 +90,12 @@ $global-position: 1rem; $global-weight-normal: normal; $global-weight-bold: bold; $global-radius: 0; -$global-menu-padding: 0 1rem; +$global-menu-padding: 0.7rem 1rem; $global-menu-nested-margin: 1rem; $global-text-direction: ltr; $global-flexbox: true; $global-prototype-breakpoints: false; +$global-button-cursor: auto; $global-color-pick-contrast-tolerance: 0; $print-transparent-backgrounds: true; @@ -477,6 +478,7 @@ $menu-icon-spacing: 0.25rem; $menu-item-background-hover: $light-gray; $menu-state-back-compat: true; $menu-centered-back-compat: true; +$menu-icons-back-compat: true; // 24. Meter // --------- @@ -491,6 +493,12 @@ $meter-fill-bad: $alert-color; // 25. Off-canvas // -------------- +$offcanvas-sizes: ( + small: 250px, +); +$offcanvas-vertical-sizes: ( + small: 250px, +); $offcanvas-background: $light-gray; $offcanvas-shadow: 0 0 10px rgba($black, 0.7); $offcanvas-inner-shadow-size: 20px; @@ -857,4 +865,5 @@ $grid-margin-gutters: ( $grid-padding-gutters: $grid-margin-gutters; $grid-container-padding: $grid-padding-gutters; $grid-container-max: $global-width; -$block-grid-max: 8; +$xy-block-grid-max: 8; + diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss index 4ee5d58..8d8891e 100644 --- a/app/assets/stylesheets/foundation_and_overrides.scss +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -13,12 +13,13 @@ $debian-color: #c70338; // We include everything by default. To slim your CSS, remove components you don't use. @include foundation-global-styles; -@include foundation-grid; +@include foundation-xy-grid-classes; +//@include foundation-grid; +//@include foundation-flex-grid; +@include foundation-flex-classes; @include foundation-typography; -@include foundation-button; @include foundation-forms; -@include foundation-visibility-classes; -@include foundation-float-classes; +@include foundation-button; @include foundation-accordion; @include foundation-accordion-menu; @include foundation-badge; @@ -27,14 +28,14 @@ $debian-color: #c70338; @include foundation-callout; @include foundation-card; @include foundation-close-button; +@include foundation-menu; +@include foundation-menu-icon; @include foundation-drilldown-menu; @include foundation-dropdown; @include foundation-dropdown-menu; @include foundation-responsive-embed; @include foundation-label; @include foundation-media-object; -@include foundation-menu; -@include foundation-menu-icon; @include foundation-off-canvas; @include foundation-orbit; @include foundation-pagination; @@ -49,6 +50,8 @@ $debian-color: #c70338; @include foundation-title-bar; @include foundation-tooltip; @include foundation-top-bar; +@include foundation-visibility-classes; +@include foundation-float-classes; // If you'd like to include motion-ui the foundation-rails gem comes prepackaged with it, uncomment the 3 @imports, if you are not using the gem you need to install the motion-ui sass package. //