]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Use pull request #11227 from DanielRuf/style/fix-sasslint-warnings for v6.5.0
authorDaniel Ruf <daniel@daniel-ruf.de>
Sat, 16 Jun 2018 08:15:53 +0000 (10:15 +0200)
committerNicolas Coden <nicolas@ncoden.fr>
Sat, 16 Jun 2018 21:02:15 +0000 (23:02 +0200)
92b2f187c style: fix sasslint warnings

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>
19 files changed:
.sass-lint.yml
scss/_global.scss
scss/components/_accordion-menu.scss
scss/components/_accordion.scss
scss/components/_breadcrumbs.scss
scss/components/_button-group.scss
scss/components/_button.scss
scss/components/_card.scss
scss/components/_drilldown.scss
scss/components/_dropdown-menu.scss
scss/components/_dropdown.scss
scss/components/_flex.scss
scss/components/_table.scss
scss/forms/_error.scss
scss/forms/_input-group.scss
scss/forms/_meter.scss
scss/forms/_progress.scss
scss/forms/_range.scss
scss/forms/_text.scss

index af8d97d34a5e171903cccc278c8e9cad6aec9730..3e6403340825420113fc7a981a5311b22738b7a2 100644 (file)
@@ -45,11 +45,11 @@ rules:
     - 1
     - include: true
 
-  force-attribute-nesting: 1
+  force-attribute-nesting: 0
 
-  force-element-nesting: 1
+  force-element-nesting: 0
 
-  force-pseudo-nesting: 1
+  force-pseudo-nesting: 0
 
   function-name-format:
     - 1
index 78ee3112ab2db1f1dc56c1828269ce1da24f4251..3210c8c295f6e68672adcbbeb5e681fea33f1d52 100644 (file)
@@ -2,7 +2,7 @@
 // foundation.zurb.com
 // Licensed under MIT Open Source
 
-// sass-lint:disable force-attribute-nesting, force-pseudo-nesting, no-color-literals, no-qualifying-elements
+// sass-lint:disable no-color-literals, no-qualifying-elements
 
 ////
 /// @group global
@@ -166,8 +166,8 @@ $global-color-pick-contrast-tolerance: 0 !default;
     color: $body-font-color;
 
     @if ($body-antialiased) {
-      -webkit-font-smoothing: antialiased;
-      -moz-osx-font-smoothing: grayscale;
+      -webkit-font-smoothing: antialiased; // sass-lint:disable-line no-vendor-prefixes
+      -moz-osx-font-smoothing: grayscale; // sass-lint:disable-line no-vendor-prefixes
     }
   }
 
index 7d254466079ff2323cf94eb50c8ce9970f4a0e1e..272cb8613dab6cf1c28947e52f835a0e42bb2c0b 100644 (file)
@@ -51,7 +51,7 @@ $accordionmenu-submenu-toggle-height: $accordionmenu-submenu-toggle-width !defau
 $accordionmenu-arrow-size: 6px !default;
 
 @mixin zf-accordion-menu-left-right-arrows {
-  .is-accordion-submenu-parent:not(.has-submenu-toggle) > a {
+  .is-accordion-submenu-parent:not(.has-submenu-toggle) > a {  // sass-lint:disable-line force-element-nesting force-pseudo-nesting
     position: relative;
 
     &::after {
@@ -62,11 +62,13 @@ $accordionmenu-arrow-size: 6px !default;
       #{$global-right}: 1rem;
     }
   }
-  &.align-left .is-accordion-submenu-parent > a::after {
-    left: auto;
+
+  &.align-left .is-accordion-submenu-parent > a::after { // sass-lint:disable-line force-element-nesting force-pseudo-nesting
     right: 1rem;
+    left: auto;
   }
-  &.align-right .is-accordion-submenu-parent > a::after {
+
+  &.align-right .is-accordion-submenu-parent > a::after { // sass-lint:disable-line force-element-nesting force-pseudo-nesting
     right: auto;
     left: 1rem;
   }
@@ -93,17 +95,17 @@ $accordionmenu-arrow-size: 6px !default;
       }
       padding: $accordionmenu-padding;
     }
-    
-    .is-accordion-submenu a {
+
+    .is-accordion-submenu a { // sass-lint:disable-line force-element-nesting
       padding: $accordionmenu-submenu-padding;
     }
 
-    .nested.is-accordion-submenu {
+    .nested.is-accordion-submenu { // sass-lint:disable-line force-element-nesting
       @include menu-nested($accordionmenu-nested-margin);
     }
 
     &.align-#{$global-right} {
-      .nested.is-accordion-submenu {
+      .nested.is-accordion-submenu { // sass-lint:disable-line force-element-nesting
         @include menu-nested($accordionmenu-nested-margin, right);
       }
     }
@@ -111,14 +113,14 @@ $accordionmenu-arrow-size: 6px !default;
     @if $accordionmenu-arrows {
       @include zf-accordion-menu-left-right-arrows;
 
-      .is-accordion-submenu-parent[aria-expanded='true'] > a::after {
+      .is-accordion-submenu-parent[aria-expanded='true'] > a::after { // sass-lint:disable-line force-element-nesting force-pseudo-nesting force-attribute-nesting
         transform: rotate(180deg);
         transform-origin: 50% 50%;
       }
     }
   }
 
-  .is-accordion-submenu li {
+  .is-accordion-submenu li { // sass-lint:disable-line force-element-nesting force-attribute-nesting
     @if $accordionmenu-border {
       border-right: 0;
       border-left: 0;
@@ -138,11 +140,12 @@ $accordionmenu-arrow-size: 6px !default;
     position: absolute;
     top: 0;
     #{$global-right}: 0;
-    cursor: pointer;
 
     width: $accordionmenu-submenu-toggle-width;
     height: $accordionmenu-submenu-toggle-height;
 
+    cursor: pointer;
+
     border-#{$global-left}: $accordion-submenu-toggle-border;
 
     @if $accordionmenu-submenu-toggle-background {
@@ -160,7 +163,7 @@ $accordionmenu-arrow-size: 6px !default;
   }
 
   // Rotate the arrow when menu is open
-  .submenu-toggle[aria-expanded='true']::after {
+  .submenu-toggle[aria-expanded='true']::after { // sass-lint:disable-line force-element-nesting force-pseudo-nesting force-attribute-nesting
     transform: scaleY(-1);
     transform-origin: 50% 50%;
   }
index c646be7d151ee3e0454d956dbef36801de315226..7325c2ab052efebe93fb2fd444e2c68b611a8543 100644 (file)
@@ -53,6 +53,7 @@ $accordion-content-padding: 1rem !default;
   margin-#{$global-left}: 0;
   background: $background;
   list-style-type: none;
+
   &[disabled] {
     .accordion-title {
       cursor: not-allowed;
@@ -90,9 +91,11 @@ $accordion-content-padding: 1rem !default;
   line-height: 1;
   color: $color;
 
-  :last-child:not(.is-active) > & {
-    border-bottom: $border;
-    border-radius: 0 0 $global-radius $global-radius;
+  :last-child {
+    &:not(.is-active) > & {
+      border-bottom: $border;
+      border-radius: 0 0 $global-radius $global-radius;
+    }
   }
 
   &:hover,
index 75eb9a1569577ca556ef015e906499777e53fba2..e48cc0b7db756264bb36367a18147b1523e9c506 100644 (file)
@@ -82,12 +82,14 @@ $breadcrumbs-item-separator-color: $medium-gray !default;
       // Need to escape the backslash
       $separator: if($global-text-direction == 'ltr', $breadcrumbs-item-separator-item, $breadcrumbs-item-separator-item-rtl);
 
-      &:not(:last-child)::after {
-        position: relative;
-        margin: 0 $breadcrumbs-item-margin;
-        opacity: 1;
-        content: $separator;
-        color: $breadcrumbs-item-separator-color;
+      &:not(:last-child) {
+        &::after {
+          position: relative;
+          margin: 0 $breadcrumbs-item-margin;
+          opacity: 1;
+          content: $separator;
+          color: $breadcrumbs-item-separator-color;
+        }
       }
     }
     @else {
index 8ef10d76246f80d6294feb1fc03ebbb4013378b8..7001d4dcf37d65fd3bdec68ebf0a43f22fb9e9e7 100644 (file)
@@ -99,14 +99,16 @@ $buttongroup-radius-on-each: true !default;
     }
     @else {
       // One child
-      &:first-child:last-child {
-        width: calc(100% - #{$spacing});
+      &:first-child {
+        &:last-child {
+          width: calc(100% - #{$spacing});
+        }
       }
 
       // Two or more childreen
       @for $i from 2 through $buttongroup-expand-max {
-        &:first-child:nth-last-child(#{$i}) {
-          &, &:first-child:nth-last-child(#{$i}) ~ #{$selector} {
+        &:first-child:nth-last-child(#{$i}) { // sass-lint:disable-line force-pseudo-nesting
+          &, &:first-child:nth-last-child(#{$i}) ~ #{$selector} { // sass-lint:disable-line force-pseudo-nesting
             display: inline-block;
             width: calc(#{percentage(1 / $i)} - #{$spacing});
             margin-#{$global-right}: $spacing;
@@ -146,7 +148,7 @@ $buttongroup-radius-on-each: true !default;
     @if not $buttongroup-radius-on-each {
       border-radius: 0;
 
-      &:first-child{
+      &:first-child {
         border-top-#{$global-left}-radius: $global-radius;
         border-top-#{$global-right}-radius: $global-radius;
       }
@@ -198,7 +200,7 @@ $buttongroup-radius-on-each: true !default;
 
     // Sizes
     @each $size, $value in map-remove($button-sizes, default) {
-      &.#{$size} #{$buttongroup-child-selector} {
+      &.#{$size} #{$buttongroup-child-selector} { // sass-lint:disable-line force-element-nesting
         font-size: $value;
       }
     }
@@ -216,7 +218,7 @@ $buttongroup-radius-on-each: true !default;
         }
       }
       @else {
-        &.#{$name} #{$buttongroup-child-selector} {
+        &.#{$name} #{$buttongroup-child-selector} { // sass-lint:disable-line force-element-nesting
           @include button-hollow;
           @include button-hollow-style($color);
         }
@@ -245,7 +247,7 @@ $buttongroup-radius-on-each: true !default;
       }
     }
 
-    &.stacked-for-small.expanded { // sass-lint:disable-line force-element-nesting
+    &.stacked-for-small.expanded {
       @include breakpoint(small only) {
         display: block;
 
@@ -256,7 +258,7 @@ $buttongroup-radius-on-each: true !default;
       }
     }
 
-    &.stacked-for-medium.expanded { // sass-lint:disable-line force-element-nesting
+    &.stacked-for-medium.expanded {
       @include breakpoint(medium down) {
         display: block;
 
index 0a9173e1a28d934333edb311c2b96732753fa9a5..f9b41422c44d71c5ba3ff2dca7ad367692d6acb3 100644 (file)
@@ -90,7 +90,6 @@ $button-responsive-expanded: false !default;
   display: inline-block;
   vertical-align: middle;
   margin: $button-margin;
-  font-family: $button-font-family;
 
   @if (type-of($button-padding) == 'map') {
     @each $size, $padding in $button-padding {
@@ -103,11 +102,12 @@ $button-responsive-expanded: false !default;
     padding: $button-padding;
   }
 
-  -webkit-appearance: none;
   border: 1px solid transparent;
   border-radius: $button-radius;
   transition: $button-transition;
+  font-family: $button-font-family;
   font-size: map-get($button-sizes, default);
+  -webkit-appearance: none; // sass-lint:disable-line no-vendor-prefixes
   line-height: 1;
   text-align: center;
   cursor: pointer;
@@ -403,7 +403,8 @@ $button-responsive-expanded: false !default;
       margin-#{$global-left}: 0;
     }
   }
-  a.button {
+
+  a.button { // sass-lint:disable-line no-qualifying-elements
     &:hover,
     &:focus {
       text-decoration: none;
index c282b89dd005324c189753c195fd4b2fed456c77..a5bc78c86e158be046ee3dd296d7583af175e225 100644 (file)
@@ -81,8 +81,8 @@ $card-margin-bottom: $global-margin !default;
   $padding: $card-padding
 ) {
   @if $global-flexbox {
-    flex: 0 1 auto;
     display: flex;
+    flex: 0 1 auto;
   }
 
   padding: $padding;
index 1719080780e3a2fa1c485273d0ecef4588bc3174..81b82cba7c0a617af84bb9932ff81178a31e2347 100644 (file)
@@ -45,25 +45,26 @@ $drilldown-arrow-size: 6px !default;
 @mixin zf-drilldown-left-right-arrows {
   .is-drilldown-submenu-parent > a {
     position: relative;
+
     &::after {
+      @include css-triangle($drilldown-arrow-size, $drilldown-arrow-color, $global-right);
       position: absolute;
       top: 50%;
       margin-top: -1 * $drilldown-arrow-size;
       #{$global-right}: 1rem;
-      @include css-triangle($drilldown-arrow-size, $drilldown-arrow-color, $global-right);
     }
   }
 
   &.align-left .is-drilldown-submenu-parent > a::after {
-    left: auto;
-    right: 1rem;
     @include css-triangle($dropdownmenu-arrow-size, $dropdownmenu-arrow-color, right);
+    right: 1rem;
+    left: auto;
   }
 
   &.align-right .is-drilldown-submenu-parent > a::after {
+    @include css-triangle($dropdownmenu-arrow-size, $dropdownmenu-arrow-color, left);
     right: auto;
     left: 1rem;
-    @include css-triangle($dropdownmenu-arrow-size, $dropdownmenu-arrow-color, left);
   }
 
 }
@@ -134,8 +135,6 @@ $drilldown-arrow-size: 6px !default;
         display: inline-block;
         vertical-align: middle;
         margin-#{$global-right}: 0.75rem; // Creates space between the arrow and the text
-
-        border-#{$global-left}-width: 0;
       }
     }
   }
index 463f78a9ba12c77366638235eba67a1b44214018..bcbc0f00c29d57ee28e42e47284641ac3ab8d6f5 100644 (file)
@@ -69,9 +69,9 @@ $dropdown-menu-item-background-active: transparent !default;
   }
 
   &.opens-left > a::after {
+    @include css-triangle($dropdownmenu-arrow-size, $dropdownmenu-arrow-color, left);
     right: auto;
     left: 5px;
-    @include css-triangle($dropdownmenu-arrow-size, $dropdownmenu-arrow-color, left);
   }
 
   &.opens-right > a::after {
@@ -81,7 +81,7 @@ $dropdown-menu-item-background-active: transparent !default;
 
 @mixin dropdown-menu-direction($dir: horizontal) {
   @if $dir == horizontal {
-    > li.opens-left {
+    > li.opens-left { // sass-lint:disable-line no-qualifying-elements
       > .is-dropdown-submenu {
         top: 100%;
         right: 0;
@@ -89,7 +89,7 @@ $dropdown-menu-item-background-active: transparent !default;
       }
     }
 
-    > li.opens-right {
+    > li.opens-right { // sass-lint:disable-line no-qualifying-elements
       > .is-dropdown-submenu {
         top: 100%;
         right: auto;
@@ -98,12 +98,12 @@ $dropdown-menu-item-background-active: transparent !default;
     }
 
     @if $dropdownmenu-arrows {
-      > li.is-dropdown-submenu-parent > a {
+      > li.is-dropdown-submenu-parent > a { // sass-lint:disable-line no-qualifying-elements
         position: relative;
         padding-#{$global-right}: $dropdownmenu-arrow-padding;
       }
 
-      > li.is-dropdown-submenu-parent > a::after {
+      > li.is-dropdown-submenu-parent > a::after { // sass-lint:disable-line no-qualifying-elements
         @include css-triangle($dropdownmenu-arrow-size, $dropdownmenu-arrow-color, down);
         #{$global-right}: 5px;
         #{$global-left}: auto;
@@ -119,9 +119,9 @@ $dropdown-menu-item-background-active: transparent !default;
 
       &.opens-left {
         > .is-dropdown-submenu {
+          top: 0;
           right: 100%;
           left: auto;
-          top: 0;
         }
       }
 
index 2d6366e943d08ca5f831982ae1d9f2763880915e..53afeade83f84e30d52ddd4e8b9cea903782a167 100644 (file)
@@ -43,11 +43,12 @@ $dropdown-sizes: (
   position: absolute;
   z-index: 10;
 
+  display: none;
+
   width: $dropdown-width;
   padding: $dropdown-padding;
 
   visibility: hidden;
-  display: none;
   border: $dropdown-border;
   border-radius: $dropdown-radius;
   background-color: $dropdown-background;
@@ -61,8 +62,8 @@ $dropdown-sizes: (
   }
 
   &.is-open {
-    visibility: visible;
     display: block;
+    visibility: visible;
   }
 }
 
@@ -72,8 +73,10 @@ $dropdown-sizes: (
   }
 
   @each $name, $size in $dropdown-sizes {
-    .dropdown-pane.#{$name} {
-      width: $size;
+    .dropdown-pane {
+      &.#{$name} {
+        width: $size;
+      }
     }
   }
 }
index 47d0da4f11d4c9aace2b96072eff5d9cc09b890c..eed2ebac762895c72a74ce764780ec8ff74d7b17 100644 (file)
@@ -80,8 +80,10 @@ $flexbox-responsive-breakpoints: true !default;
   // Horizontal alignment Specifically for Vertical Menu
   @each $hdir, $prop in map-remove($-zf-flex-justify, 'justify', 'spaced') {
     .align-#{$hdir} {
-      &.vertical.menu > li > a { 
-        @include flex-align($x: $hdir);
+      &.vertical {
+        &.menu > li > a {
+          @include flex-align($x: $hdir);
+        }
       }
     }
   }
index 44f92ed5849c9de616393ca4c75c29597eca9d70..bf6df2659e89a74025141a71dd8840230d6a76ee 100644 (file)
@@ -2,7 +2,7 @@
 // foundation.zurb.com
 // Licensed under MIT Open Source
 
-// sass-lint:disable force-element-nesting, no-qualifying-elements
+// sass-lint:disable no-qualifying-elements
 
 ////
 /// @group table
index 30e538913b5fcb99468d5513da6e2a589eb73535..eb2fdc1bc2aba5e32a32fe4664c9320fe1714703 100644 (file)
@@ -45,6 +45,7 @@ $input-error-font-weight: $global-weight-bold !default;
   &:not(:focus) {
     border-color: $background;
     background-color: mix($background, $white, $background-lighten);
+
     &::placeholder {
       color: $background;
     }
index 804a27bf2843627ed21857a5c4679acdc493ed0c..f74013c8caecf3bca382b0afb271dae6668a81d6 100644 (file)
@@ -22,7 +22,7 @@ $input-prefix-border: 1px solid $medium-gray !default;
 $input-prefix-padding: 1rem !default;
 
 @mixin foundation-form-prepostfix {
-  $height: ($input-font-size * $input-line-height) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1);;
+  $height: ($input-font-size * $input-line-height) + (get-side($input-padding, 'top') + get-side($input-padding, 'bottom')) - rem-calc(1);
 
   .input-group {
     display: if($global-flexbox, flex, table);
@@ -117,8 +117,8 @@ $input-prefix-padding: 1rem !default;
       @extend %input-group-child;
 
       @if $global-flexbox {
-        height: auto;
         align-self: stretch;
+        height: auto;
       }
       @else {
         height: $height;
@@ -131,8 +131,10 @@ $input-prefix-padding: 1rem !default;
 
   // Specificity bump needed to prevent override by buttons
   @if not $global-flexbox {
-    .input-group .input-group-button {
-      display: table-cell;
+    .input-group {
+      .input-group-button {
+        display: table-cell;
+      }
     }
   }
 }
index c31b2f9e1126ce76e0df5b7625626c7b2c22865f..adc7457ac1ed0ef895a654230b4e7a1608d5a161 100644 (file)
@@ -42,8 +42,8 @@ $meter-fill-bad: $alert-color !default;
     // `-moz-appearance: none` as a prefix and neglecting the webkit.
     
     /*! autoprefixer: off */
-    -moz-appearance: none;
-         appearance: none;
+    -moz-appearance: none; // sass-lint:disable-line no-vendor-prefixes
+    appearance: none;
 
     @if has-value($meter-radius) {
       border-radius: $meter-radius;
@@ -101,15 +101,15 @@ $meter-fill-bad: $alert-color !default;
       }
     }
 
-    &:-moz-meter-optimum::-moz-meter-bar { // sass-lint:disable-line force-pseudo-nesting
+    &:-moz-meter-optimum::-moz-meter-bar {
       background: $meter-fill-good;
     }
 
-    &:-moz-meter-sub-optimum::-moz-meter-bar { // sass-lint:disable-line force-pseudo-nesting
+    &:-moz-meter-sub-optimum::-moz-meter-bar {
       background: $meter-fill-medium;
     }
 
-    &:-moz-meter-sub-sub-optimum::-moz-meter-bar { // sass-lint:disable-line force-pseudo-nesting
+    &:-moz-meter-sub-sub-optimum::-moz-meter-bar {
       background: $meter-fill-bad;
     }
   }
index 4dd37f1f35143e430cca581596f5efdf58fe0d5d..a802fa9085b0ab234109cff4be0a9f12b460c88d 100644 (file)
@@ -83,7 +83,7 @@ $progress-radius: $global-radius !default;
     }
 
     // For IE and Edge
-    &::-ms-fill {
+    &::-ms-fill { // sass-lint:disable-line no-vendor-prefixes
       @if hasvalue($progress-radius) {
         border-radius: $progress-radius;
       }
index 96a720ad845ca37a038cd5833b15a025d187e569..fa0de82f0eab7354b71360d9a752afa7725b0330 100644 (file)
@@ -39,7 +39,7 @@ $slider-opacity-disabled: 0.25 !default;
 $slider-radius: $global-radius !default;
 
 @mixin foundation-range-input {
-  input[type="range"] {  // sass-lint:disable-line no-qualifying-elements
+  input[type='range'] {  // sass-lint:disable-line no-qualifying-elements force-attribute-nesting
     $margin: ($slider-handle-height - $slider-height) / 2;
 
     display: block;
@@ -78,7 +78,7 @@ $slider-radius: $global-radius !default;
       height: $slider-handle-height;
       margin-top: -$margin;
 
-      -webkit-appearance: none;
+      -webkit-appearance: none; // sass-lint:disable-line no-vendor-prefixes
       background: $slider-handle-background;
 
       @if has-value($slider-radius) {
@@ -89,7 +89,7 @@ $slider-radius: $global-radius !default;
     // Firefox
     &::-moz-range-track {
       height: $slider-height;
-      -moz-appearance: none;
+      -moz-appearance: none; // sass-lint:disable-line no-vendor-prefixes
       background: $slider-background;
     }
 
@@ -98,7 +98,7 @@ $slider-radius: $global-radius !default;
       height: $slider-handle-height;
       margin-top: -$margin;
 
-      -moz-appearance: none;
+      -moz-appearance: none; // sass-lint:disable-line no-vendor-prefixes
       background: $slider-handle-background;
 
       @if has-value($slider-radius) {
index 4277490b27510e2808b90f8bf49ba0eab7359cd4..ad7e00d2f70545f79b66c88b674979dd41724c21 100644 (file)
@@ -155,18 +155,18 @@ $form-button-radius: $global-radius !default;
   }
 
   // Reset Normalize setting content-box to search elements
-  input[type='search'] { // sass-lint:disable-line no-qualifying-elements
+  input[type='search'] { // sass-lint:disable-line no-qualifying-elements force-attribute-nesting
     box-sizing: border-box;
   }
 
   // Number input styles
   [type='number'] {
     @if not $input-number-spinners {
-      -moz-appearance: textfield; // sass-lint:disable-line no-vendor-prefix
+      -moz-appearance: textfield; // sass-lint:disable-line no-vendor-prefixes
 
       &::-webkit-inner-spin-button,
       &::-webkit-outer-spin-button {
-        -webkit-appearance: none; // sass-lint:disable-line no-vendor-prefix
+        -webkit-appearance: none; // sass-lint:disable-line no-vendor-prefixes
         margin: 0;
       }
     }