From 0f6659c17a26ad43b7e51bd210fe2aa348dc9318 Mon Sep 17 00:00:00 2001 From: Daniel Ruf Date: Mon, 9 Apr 2018 23:52:54 +0200 Subject: [PATCH] chore: use short named mixin parameters --- scss/settings/_settings.scss | 44 ++++++++++++++++++++++++------------ scss/xy-grid/_layout.scss | 2 +- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/scss/settings/_settings.scss b/scss/settings/_settings.scss index fb447f895..7b015b255 100644 --- a/scss/settings/_settings.scss +++ b/scss/settings/_settings.scss @@ -95,12 +95,10 @@ $global-menu-nested-margin: 1rem; $global-text-direction: ltr; $global-flexbox: true; $global-prototype-breakpoints: false; -$global-button-cursor: pointer; +$global-button-cursor: auto; $global-color-pick-contrast-tolerance: 0; $print-transparent-backgrounds: true; -@include add-foundation-colors; - // 2. Breakpoints // -------------- @@ -161,12 +159,7 @@ $header-small-font-color: $medium-gray; $paragraph-lineheight: 1.6; $paragraph-margin-bottom: 1rem; $paragraph-text-rendering: optimizeLegibility; -$code-color: $black; -$code-font-family: $font-family-monospace; -$code-font-weight: $global-weight-normal; -$code-background: $light-gray; -$code-border: 1px solid $medium-gray; -$code-padding: rem-calc(2 5 1); +$enable-code-inline: true; $anchor-color: $primary-color; $anchor-color-hover: scale-color($anchor-color, $lightness: -14%); $anchor-text-decoration: none; @@ -186,9 +179,7 @@ $defnlist-term-margin-bottom: 0.3rem; $blockquote-color: $dark-gray; $blockquote-padding: rem-calc(9 20 0 19); $blockquote-border: 1px solid $medium-gray; -$cite-font-size: rem-calc(13); -$cite-color: $dark-gray; -$cite-pseudo-content: '\2014 \0020'; +$enable-cite-block: true; $keystroke-font: $font-family-monospace; $keystroke-color: $black; $keystroke-background: $light-gray; @@ -207,6 +198,17 @@ $subheader-font-weight: $global-weight-normal; $subheader-margin-top: 0.2rem; $subheader-margin-bottom: 0.5rem; $stat-font-size: 2.5rem; +$cite-color: $dark-gray; +$cite-font-size: rem-calc(13); +$cite-pseudo-content: '\2014 \0020'; +$code-color: $black; +$code-font-family: $font-family-monospace; +$code-font-weight: $global-weight-normal; +$code-background: $light-gray; +$code-border: 1px solid $medium-gray; +$code-padding: rem-calc(2 5 1); +$code-block-padding: 1rem; +$code-block-margin-bottom: 1.5rem; // 6. Abide // -------- @@ -224,6 +226,8 @@ $input-error-font-weight: $global-weight-bold; $accordion-background: $white; $accordion-plusminus: true; +$accordion-plus-content: '\002B'; +$accordion-minus-content: '\2013'; $accordion-title-font-size: rem-calc(12); $accordion-item-color: $primary-color; $accordion-item-background-hover: $light-gray; @@ -279,6 +283,7 @@ $breadcrumbs-item-separator-color: $medium-gray; // ---------- $button-font-family: inherit; +$button-font-weight: null; $button-padding: 0.85em 1em; $button-margin: 0 0 $global-margin 0; $button-fill: solid; @@ -287,6 +292,7 @@ $button-background-hover: scale-color($button-background, $lightness: -15%); $button-color: $white; $button-color-alt: $black; $button-radius: $global-radius; +$button-border: 1px solid transparent; $button-hollow-border-width: 1px; $button-sizes: ( tiny: 0.6rem, @@ -299,6 +305,7 @@ $button-opacity-disabled: 0.25; $button-background-hover-lightness: -20%; $button-hollow-hover-lightness: -50%; $button-transition: background-color 0.25s ease-out, color 0.25s ease-out; +$button-responsive-expanded: false; // 12. Button Group // ---------------- @@ -316,7 +323,11 @@ $callout-background: $white; $callout-background-fade: 85%; $callout-border: 1px solid rgba($black, 0.25); $callout-margin: 0 0 1rem 0; -$callout-padding: 1rem; +$callout-sizes: ( + small: 0.5rem, + default: 1rem, + large: 3rem, +); $callout-font-color: $body-font-color; $callout-font-color-alt: $body-background; $callout-radius: $global-radius; @@ -475,7 +486,6 @@ $menu-simple-margin: 1rem; $menu-item-color-active: $white; $menu-item-background-active: get-color(primary); $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; @@ -545,6 +555,8 @@ $pagination-ellipsis-color: $black; $pagination-mobile-items: false; $pagination-mobile-current-item: false; $pagination-arrows: true; +$pagination-arrow-previous: '\00AB'; +$pagination-arrow-next: '\00BB'; // 28. Progress Bar // ---------------- @@ -766,6 +778,8 @@ $switch-paddle-background: $white; $switch-paddle-offset: 0.25rem; $switch-paddle-radius: $global-radius; $switch-paddle-transition: all 0.25s ease-out; +$switch-opacity-disabled: .5; +$switch-cursor-disabled: not-allowed; // 50. Table // --------- @@ -808,7 +822,7 @@ $tab-content-padding: 1rem; // 52. Thumbnail // ------------- -$thumbnail-border: solid 4px $white; +$thumbnail-border: 4px solid $white; $thumbnail-margin-bottom: $global-margin; $thumbnail-shadow: 0 0 0 1px rgba($black, 0.2); $thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, 0.5); diff --git a/scss/xy-grid/_layout.scss b/scss/xy-grid/_layout.scss index 309abe944..3b7650e32 100644 --- a/scss/xy-grid/_layout.scss +++ b/scss/xy-grid/_layout.scss @@ -28,6 +28,6 @@ $size: percentage(1/$n); & > #{$selector} { - @include xy-cell($size, $gutter-output: $gutter-output, $gutters: $gutters, $gutter-type: $gutter-type, $gutter-position: $gutter-position, $breakpoint: $breakpoint, $vertical: $vertical); + @include xy-cell($size, $gutter-output, $gutters, $gutter-type, $gutter-position, $breakpoint, $vertical); } } -- 2.47.2