diff --git a/.jekyll-metadata b/.jekyll-metadata deleted file mode 100644 index bf135eef..00000000 Binary files a/.jekyll-metadata and /dev/null differ diff --git a/_sass/foundation/_foundation.scss b/_sass/foundation/_foundation.scss index 4cc625e1..bdf43f8a 100644 --- a/_sass/foundation/_foundation.scss +++ b/_sass/foundation/_foundation.scss @@ -1,13 +1,13 @@ -// Foundation for Sites by ZURB -// foundation.zurb.com -// Licensed under MIT Open Source +/** + * Foundation for Sites by ZURB + * Version 6.2.0 + * foundation.zurb.com + * Licensed under MIT Open Source + */ // Settings @import 'settings/settings'; -// Third-party libraries -@import 'vendor/normalize'; - // Sass utilities @import 'util/util'; @@ -16,8 +16,94 @@ // Components @import 'grid/grid'; +//@import 'typography/typography'; +//@import 'forms/forms'; @import 'components/visibility'; +//@import 'components/float'; +//@import 'components/button'; +//@import 'components/button-group'; +//@import 'components/accordion-menu'; +//@import 'components/accordion'; +//@import 'components/badge'; +//@import 'components/breadcrumbs'; +//@import 'components/callout'; +//@import 'components/close-button'; +//@import 'components/drilldown'; +//@import 'components/dropdown-menu'; +//@import 'components/dropdown'; +//@import 'components/flex'; +//@import 'components/flex-video'; +//@import 'components/label'; +//@import 'components/media-object'; +//@import 'components/menu'; +//@import 'components/menu-icon'; +//@import 'components/off-canvas'; +//@import 'components/orbit'; +//@import 'components/pagination'; +//@import 'components/progress-bar'; +//@import 'components/reveal'; +//@import 'components/slider'; +//@import 'components/sticky'; +//@import 'components/switch'; +//@import 'components/table'; +//@import 'components/tabs'; +//@import 'components/title-bar'; +//@import 'components/top-bar'; +//@import 'components/thumbnail'; +//@import 'components/tooltip'; @include foundation-global-styles; @include foundation-grid; -@include foundation-visibility-classes; \ No newline at end of file +@include foundation-visibility-classes; + +@mixin foundation-everything($flex: false) { + @if $flex { + $global-flexbox: true !global; + } + + @include foundation-global-styles; + @if not $flex { + @include foundation-grid; + } + @else { + @include foundation-flex-grid; + } + //@include foundation-typography; + //@include foundation-forms; + //@include foundation-button; + //@include foundation-accordion; + //@include foundation-accordion-menu; + //@include foundation-badge; + //@include foundation-breadcrumbs; + //@include foundation-button-group; + //@include foundation-callout; + //@include foundation-close-button; + //@include foundation-menu; + //@include foundation-menu-icon; + //@include foundation-drilldown-menu; + //@include foundation-dropdown; + //@include foundation-dropdown-menu; + //@include foundation-flex-video; + //@include foundation-label; + //@include foundation-media-object; + //@include foundation-off-canvas; + //@include foundation-orbit; + //@include foundation-pagination; + //@include foundation-progress-bar; + //@include foundation-slider; + //@include foundation-sticky; + //@include foundation-reveal; + //@include foundation-switch; + //@include foundation-table; + //@include foundation-tabs; + //@include foundation-thumbnail; + //@include foundation-title-bar; + //@include foundation-tooltip; + //@include foundation-top-bar; + @include foundation-visibility-classes; + //@include foundation-float-classes; + + @if $flex { + @include foundation-flex-classes; + } +} diff --git a/_sass/foundation/_global.scss b/_sass/foundation/_global.scss index 1df78e50..1d168614 100644 --- a/_sass/foundation/_global.scss +++ b/_sass/foundation/_global.scss @@ -2,41 +2,33 @@ // foundation.zurb.com // Licensed under MIT Open Source +// scss-lint:disable ColorVariable, QualifyingElement, VendorPrefix + //// /// @group global //// -/// Global width of your site. Used by the grid to determine row width. -/// @type Number -$global-width: rem-calc(1200) !default; - /// Font size attribute applied to `` and ``. We use 100% by default so the value is inherited from the user's browser settings. /// @type Number $global-font-size: 100% !default; +/// Global width of your site. Used by the grid to determine row width. +/// @type Number +$global-width: rem-calc(1200) !default; + /// Default line height for all type. `$global-lineheight` is 24px while `$global-font-size` is 16px /// @type Number $global-lineheight: 1.5 !default; -/// Primary color for interactive components like links and buttons. -/// @type Color -$primary-color: #2199e8 !default; - -/// Secondary color, used with components that support the `.secondary` class. -/// @type Color -$secondary-color: #777 !default; - -/// Color to indicate a positive status or action, used with the `.success` class. -/// @type Color -$success-color: #3adb76 !default; - -/// Color to indicate a caution status or action, used with the `.warning` class. -/// @type Color -$warning-color: #ffae00 !default; - -/// Color to indicate a negative status or action, used with the `.alert` class. -/// @type Color -$alert-color: #ec5840 !default; +/// Colors used for buttons, callouts, links, etc. There must always be a color called `primary`. +/// @type Map +$foundation-palette: ( + primary: #2199e8, + secondary: #777, + success: #3adb76, + warning: #ffae00, + alert: #ec5840, +) !default; /// Color used for light gray UI items. /// @type Color @@ -82,10 +74,6 @@ $global-margin: 1rem !default; /// @type Number $global-padding: 1rem !default; -/// Global value used for margin between components. -/// @type Number -$global-margin: 1rem !default; - /// Global font weight used for normal type. /// @type Keyword | Number $global-weight-normal: normal !default; @@ -99,32 +87,49 @@ $global-weight-bold: bold !default; $global-radius: 0 !default; /// Sets the text direction of the CSS. Can be either `ltr` or `rtl`. +/// @type Keyword $global-text-direction: ltr !default; +/// Enables flexbox for components that support it. +/// @type Boolean +$global-flexbox: false !default; + +@if not map-has-key($foundation-palette, primary) { + @error 'In $foundation-palette, you must have a color named "primary".'; +} + // Internal variables used for text direction $global-left: if($global-text-direction == rtl, right, left); $global-right: if($global-text-direction == rtl, left, right); -// Internal map used to iterate through colors, to generate CSS classes with less code -$foundation-colors: ( - primary: $primary-color, - secondary: $secondary-color, - success: $success-color, - alert: $alert-color, - warning: $warning-color, -); +// Internal variables used for colors +$primary-color: map-get($foundation-palette, primary); +$secondary-color: map-get($foundation-palette, secondary); +$success-color: map-get($foundation-palette, success); +$warning-color: map-get($foundation-palette, warning); +$alert-color: map-get($foundation-palette, alert); + +// Remove this in 6.3 +$-zf-menu-icon-imported: false; +$-zf-flex-classes-imported: false; @mixin foundation-global-styles { - html, - body { + @include -zf-normalize; + + // These styles are applied to a tag, which is read by the Foundation JavaScript + .foundation-mq { + font-family: '#{-zf-bp-serialize($breakpoints)}'; + } + + html { font-size: $global-font-size; box-sizing: border-box; } // Set box-sizing globally to handle padding and border widths *, - *:before, - *:after { + *::before, + *::after { box-sizing: inherit; } @@ -182,6 +187,7 @@ $foundation-colors: ( // Reset