Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makes stylelint config match prettier settings (https://github.com/woocommerce/woocommerce-admin/pull/733) 

* Makes stylelint config match prettier settings

* Fix/all css lints (https://github.com/woocommerce/woocommerce-admin/pull/734)

* Fix all sass lints!

* Delete settings.json

* Update newline rule, which also conflicts with prettier

* Fix remaining stylelint issues

* Disable stylelint rule for a line to avoid prettier/linter fights
This commit is contained in:
Jonathan Belcher 2018-11-01 17:03:00 -04:00 committed by Kelly Dwan
parent 1a46b29b73
commit b16c056c32
7 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/woocommerce-admin/.stylelintrc.json
View File

@ -5,6 +5,7 @@
"at-rule-no-unknown": null, "at-rule-no-unknown": null,
"comment-empty-line-before": null, "comment-empty-line-before": null,
"declaration-block-no-duplicate-properties": null, "declaration-block-no-duplicate-properties": null,
"declaration-colon-newline-after": null,
"declaration-property-unit-whitelist": null, "declaration-property-unit-whitelist": null,
"font-weight-notation": null, "font-weight-notation": null,
"max-line-length": null, "max-line-length": null,
@ -12,6 +13,8 @@
"no-duplicate-selectors": null, "no-duplicate-selectors": null,
"rule-empty-line-before": null, "rule-empty-line-before": null,
"selector-class-pattern": null, "selector-class-pattern": null,
"value-keyword-case": null "string-quotes": "single",
"value-keyword-case": null,
"value-list-comma-newline-after": null
} }
} }

2
plugins/woocommerce-admin/client/components/card/style.scss
View File

@ -2,7 +2,7 @@
.woocommerce-card { .woocommerce-card {
margin-bottom: $gap-large; margin-bottom: $gap-large;
background: white; background: $white;
border: 1px solid $core-grey-light-700; border: 1px solid $core-grey-light-700;
@include breakpoint( '<782px' ) { @include breakpoint( '<782px' ) {

2
plugins/woocommerce-admin/client/components/chart/style.scss
View File

@ -2,7 +2,7 @@
.woocommerce-chart { .woocommerce-chart {
margin-top: -$gap; margin-top: -$gap;
margin-bottom: $gap-large; margin-bottom: $gap-large;
background: white; background: $white;
border: 1px solid $core-grey-light-700; border: 1px solid $core-grey-light-700;
border-top: 0; border-top: 0;

2
plugins/woocommerce-admin/client/components/table/style.scss
View File

@ -123,7 +123,7 @@
padding-top: $gap; padding-top: $gap;
padding-bottom: $gap; padding-bottom: $gap;
z-index: 1; z-index: 1;
background: white; background: $white;
position: relative; position: relative;
} }
} }

4
plugins/woocommerce-admin/client/header/activity-panel/style.scss
View File

@ -10,7 +10,7 @@
@include breakpoint( '<782px' ) { @include breakpoint( '<782px' ) {
position: relative; position: relative;
background: #fff; background: $white;
margin: 0; margin: 0;
padding: 0; padding: 0;
top: -3px; top: -3px;
@ -167,7 +167,7 @@
position: absolute; position: absolute;
padding: 1px; padding: 1px;
background: $core-orange; background: $core-orange;
border: 2px solid white; border: 2px solid $white;
width: 4px; width: 4px;
height: 4px; height: 4px;
display: inline-block; display: inline-block;

8
plugins/woocommerce-admin/client/stylesheets/abstracts/_breakpoints.scss
View File

@ -1,5 +1,7 @@
/** @format */ /** @format */
/* stylelint-disable block-closing-brace-newline-after */
// Breakpoints // Breakpoints
// Forked from https://github.com/Automattic/wp-calypso/blob/46ae24d8800fb85da6acf057a640e60dac988a38/assets/stylesheets/shared/mixins/_breakpoints.scss // Forked from https://github.com/Automattic/wp-calypso/blob/46ae24d8800fb85da6acf057a640e60dac988a38/assets/stylesheets/shared/mixins/_breakpoints.scss
@ -44,14 +46,16 @@ $breakpoints: 320px, 400px, 600px, 782px, 960px, 1100px, 1365px;
@each $breakpoint in $breakpoints { @each $breakpoint in $breakpoints {
$sizes: $sizes + ' ' + $breakpoint; $sizes: $sizes + ' ' + $breakpoint;
} }
@warn "ERROR in breakpoint( #{ $size } ) : You can only use these sizes[ #{$sizes} ] using the following syntax [ <#{ nth( $breakpoints, 1 ) } >#{ nth( $breakpoints, 1 ) } #{ nth( $breakpoints, 1 ) }-#{ nth( $breakpoints, 2 ) } ]"; @warn 'ERROR in breakpoint( #{ $size } ) : You can only use these sizes[ #{$sizes} ] using the following syntax [ <#{ nth( $breakpoints, 1 ) } >#{ nth( $breakpoints, 1 ) } #{ nth( $breakpoints, 1 ) }-#{ nth( $breakpoints, 2 ) } ]';
} }
} @else { } @else {
$sizes: ''; $sizes: '';
@each $breakpoint in $breakpoints { @each $breakpoint in $breakpoints {
$sizes: $sizes + ' ' + $breakpoint; $sizes: $sizes + ' ' + $breakpoint;
} }
@error "ERROR in breakpoint( #{ $size } ) : Please wrap the breakpoint $size in parenthesis. You can use these sizes[ #{$sizes} ] using the following syntax [ <#{ nth( $breakpoints, 1 ) } >#{ nth( $breakpoints, 1 ) } #{ nth( $breakpoints, 1 ) }-#{ nth( $breakpoints, 2 ) } ]"; @error 'ERROR in breakpoint( #{ $size } ) : Please wrap the breakpoint $size in parenthesis. You can use these sizes[ #{$sizes} ] using the following syntax [ <#{ nth( $breakpoints, 1 ) } >#{ nth( $breakpoints, 1 ) } #{ nth( $breakpoints, 1 ) }-#{ nth( $breakpoints, 2 ) } ]';
} }
} }
} }
/* stylelint-enable */

2
plugins/woocommerce-admin/client/stylesheets/abstracts/_variables.scss
View File

@ -24,7 +24,9 @@ $dark-gray-300: $core-grey-dark-300;
$dark-gray-900: $core-grey-dark-900; $dark-gray-900: $core-grey-dark-900;
$alert-red: $error-red; $alert-red: $error-red;
/* stylelint-disable */
:export { :export {
gaplarge: $gap-large; gaplarge: $gap-large;
gap: $gap; gap: $gap;
} }
/* stylelint-enable */