From 5feb6cd606d9bf115c52fdf4cc297042d6518ab3 Mon Sep 17 00:00:00 2001 From: Nicolas Coden Date: Wed, 9 Nov 2016 00:50:45 +0100 Subject: [PATCH] Sass lint: fix various unsorted properties --- .sass-lint.yml | 7 ++++--- scss/components/_accordion-menu.scss | 2 +- scss/components/_accordion.scss | 6 +++--- scss/components/_button.scss | 4 ++-- scss/components/_dropdown-menu.scss | 8 ++++---- scss/components/_menu.scss | 4 ++-- scss/components/_off-canvas.scss | 8 ++++---- scss/components/_orbit.scss | 4 ++-- scss/components/_progress-bar.scss | 2 +- scss/components/_responsive-embed.scss | 2 +- scss/components/_switch.scss | 3 ++- scss/typography/_base.scss | 2 +- scss/util/_mixins.scss | 21 ++++++++++----------- 13 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.sass-lint.yml b/.sass-lint.yml index 99d69ef0d..d60f1b4e4 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -269,12 +269,13 @@ rules: # Background - 'background' + - 'background-image' + - 'background-color' - 'background-attachment' - 'background-clip' - - 'background-color' - - 'background-image' - - 'background-repeat' + - 'background-origin' - 'background-position' + - 'background-repeat' - 'background-size' # Shadow diff --git a/scss/components/_accordion-menu.scss b/scss/components/_accordion-menu.scss index eb02e7bd2..7719c0c2e 100644 --- a/scss/components/_accordion-menu.scss +++ b/scss/components/_accordion-menu.scss @@ -41,8 +41,8 @@ $accordionmenu-arrow-color: $primary-color !default; } .is-accordion-submenu-parent[aria-expanded='true'] > span::after { - transform-origin: 50% 50%; transform: scaleY(-1); + transform-origin: 50% 50%; } } diff --git a/scss/components/_accordion.scss b/scss/components/_accordion.scss index cfc96ab0d..3678f6607 100644 --- a/scss/components/_accordion.scss +++ b/scss/components/_accordion.scss @@ -78,8 +78,8 @@ $accordion-content-padding: 1rem !default; color: $accordion-item-color; :last-child:not(.is-active) > & { - border-radius: 0 0 $global-radius $global-radius; border-bottom: $accordion-content-border; + border-radius: 0 0 $global-radius $global-radius; } &:hover, @@ -89,11 +89,11 @@ $accordion-content-padding: 1rem !default; @if $accordion-plusminus { &::before { - content: '+'; position: absolute; - #{$global-right}: 1rem; top: 50%; + #{$global-right}: 1rem; margin-top: -0.5rem; + content: '+'; } .is-active > &::before { diff --git a/scss/components/_button.scss b/scss/components/_button.scss index 529cb7353..ecb0d3455 100644 --- a/scss/components/_button.scss +++ b/scss/components/_button.scss @@ -73,8 +73,8 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau @include disable-mouse-outline; display: inline-block; vertical-align: middle; - padding: $button-padding; margin: $button-margin; + padding: $button-padding; -webkit-appearance: none; border: 1px solid transparent; @@ -82,8 +82,8 @@ $button-transition: background-color 0.25s ease-out, color 0.25s ease-out !defau transition: $button-transition; font-size: map-get($button-sizes, default); - text-align: center; line-height: 1; + text-align: center; cursor: pointer; } diff --git a/scss/components/_dropdown-menu.scss b/scss/components/_dropdown-menu.scss index 2ff07f758..1961df7cb 100644 --- a/scss/components/_dropdown-menu.scss +++ b/scss/components/_dropdown-menu.scss @@ -50,17 +50,17 @@ $dropdownmenu-border-width: nth($dropdownmenu-border, 1); @if $dir == horizontal { > li.opens-left { > .is-dropdown-submenu { - left: auto; - right: 0; top: 100%; + right: 0; + left: auto; } } > li.opens-right { > .is-dropdown-submenu { + top: 100%; right: auto; left: 0; - top: 100%; } } @@ -194,8 +194,8 @@ $dropdownmenu-border-width: nth($dropdownmenu-border, 1); display: none; min-width: $dropdownmenu-min-width; - background: $dropdownmenu-background; border: $dropdownmenu-border; + background: $dropdownmenu-background; .is-dropdown-submenu-parent { @if $dropdownmenu-arrows { diff --git a/scss/components/_menu.scss b/scss/components/_menu.scss index 3176935a6..7cafc0657 100644 --- a/scss/components/_menu.scss +++ b/scss/components/_menu.scss @@ -122,8 +122,8 @@ $menu-border: $light-gray !default; } > li > a { - align-items: flex-start; justify-content: flex-start; + align-items: flex-start; } } @else { @@ -306,8 +306,8 @@ $menu-border: $light-gray !default; // Active state .active > a { - color: $menu-item-color-active; background: $menu-item-background-active; + color: $menu-item-color-active; } // Menu with border diff --git a/scss/components/_off-canvas.scss b/scss/components/_off-canvas.scss index c282b1df7..8ed13b49d 100644 --- a/scss/components/_off-canvas.scss +++ b/scss/components/_off-canvas.scss @@ -109,9 +109,9 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default; z-index: $offcanvas-zindex; max-height: 100%; - overflow-y: auto; - background: $offcanvas-background; transform: translateX(0) translateY(0); + background: $offcanvas-background; + overflow-y: auto; } @mixin off-canvas-position( @@ -121,13 +121,13 @@ $maincontent-shadow: 0 0 10px rgba($black, 0.5) !default; $vertical-size: $offcanvas-vertical-size ) { @if $position == left { - left: -$size; top: 0; + left: -$size; width: $size; } @else if $position == right { - right: -$size; top: 0; + right: -$size; width: $size; } @else if $position == top { diff --git a/scss/components/_orbit.scss b/scss/components/_orbit.scss index b8a341c47..11a627673 100644 --- a/scss/components/_orbit.scss +++ b/scss/components/_orbit.scss @@ -58,10 +58,10 @@ $orbit-control-zindex: 10 !default; /// Adds styles for the inner Orbit slide container. These styles are used on the `.orbit-container` class. @mixin orbit-container { position: relative; + height: 0px; // Prevent FOUC by not showing until JS sets height margin: 0; - overflow: hidden; list-style: none; - height: 0px; // Prevent FOUC by not showing until JS sets height + overflow: hidden; } /// Adds styles for the individual slides of an Orbit slider. These styles are used on the `.orbit-slide` class. diff --git a/scss/components/_progress-bar.scss b/scss/components/_progress-bar.scss index cd7b066f5..342cfe6cb 100644 --- a/scss/components/_progress-bar.scss +++ b/scss/components/_progress-bar.scss @@ -6,8 +6,8 @@ @mixin progress-container { height: $progress-height; margin-bottom: $progress-margin-bottom; - background-color: $progress-background; border-radius: $progress-radius; + background-color: $progress-background; } /// Adds styles for the inner meter of a progress bar. diff --git a/scss/components/_responsive-embed.scss b/scss/components/_responsive-embed.scss index 719d01998..a476c1495 100644 --- a/scss/components/_responsive-embed.scss +++ b/scss/components/_responsive-embed.scss @@ -32,8 +32,8 @@ $responsive-embed-ratio-widescreen: 16 by 9 !default; @mixin responsive-embed($ratio: $responsive-embed-ratio) { position: relative; height: 0; - padding-bottom: responsive-embed($ratio); margin-bottom: $responsive-embed-margin-bottom; + padding-bottom: responsive-embed($ratio); overflow: hidden; iframe, diff --git a/scss/components/_switch.scss b/scss/components/_switch.scss index 44b430b15..3b3f0dd72 100644 --- a/scss/components/_switch.scss +++ b/scss/components/_switch.scss @@ -95,12 +95,13 @@ $switch-paddle-transition: all 0.25s ease-out !default; border-radius: $switch-radius; background: $switch-background; transition: $switch-paddle-transition; - cursor: pointer; // Resetting these