Updated stylelint and fixed scss for 'stylelint-config-recommended-scss'

This commit is contained in:
orangemug 2018-04-17 14:55:13 +01:00
parent 52821cd1df
commit d0ca732fe7
5 changed files with 1577 additions and 728 deletions

2228
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -62,7 +62,10 @@
"esversion": 6 "esversion": 6
}, },
"stylelint": { "stylelint": {
"extends": "stylelint-config-standard" "extends": "stylelint-config-recommended-scss",
"rules": {
"no-descending-specificity": null
}
}, },
"eslintConfig": { "eslintConfig": {
"plugins": [ "plugins": [
@ -126,8 +129,9 @@
"sass-loader": "^7.0.1", "sass-loader": "^7.0.1",
"selenium-standalone": "^6.14.0", "selenium-standalone": "^6.14.0",
"style-loader": "^0.20.3", "style-loader": "^0.20.3",
"stylelint": "^7.13.0", "stylelint": "^9.2.0",
"stylelint-config-standard": "^15.0.1", "stylelint-config-recommended-scss": "^3.2.0",
"stylelint-scss": "^3.0.0",
"transform-loader": "^0.2.4", "transform-loader": "^0.2.4",
"uglifyjs-webpack-plugin": "^1.2.4", "uglifyjs-webpack-plugin": "^1.2.4",
"uuid": "^3.1.0", "uuid": "^3.1.0",

View file

@ -3,24 +3,34 @@
} }
.maputnik-filter-editor { .maputnik-filter-editor {
@extend .clearfix;
color: $color-lowgray; color: $color-lowgray;
} }
.maputnik-filter-editor-property { .maputnik-filter-editor-property {
display: inline-block; display: inline-block;
width: '22%'; width: 25%;
} }
.maputnik-filter-editor-operator { .maputnik-filter-editor-operator {
display: inline-block;
width: 19%;
margin-left: 2%; margin-left: 2%;
display: inline-block;
width: 17%;
.maputnik-select {
width: 100%;
}
} }
.maputnik-filter-editor-args { .maputnik-filter-editor-args {
display: inline-block; display: inline-block;
width: 54%; width: 54%;
margin-left: 2%; margin-left: 2%;
.maputnik-string,
.maputnik-number {
width: 100%;
}
} }
.maputnik-filter-editor-compound-select { .maputnik-filter-editor-compound-select {
@ -40,10 +50,6 @@
color: $color-midgray; color: $color-midgray;
} }
.maputnik-filter-editor {
@extend .clearfix;
}
.maputnik-add-filter { .maputnik-add-filter {
display: inline-block; display: inline-block;
float: right; float: right;
@ -57,9 +63,6 @@
.maputnik-filter-editor-block-action { .maputnik-filter-editor-block-action {
margin-top: $margin-2; margin-top: $margin-2;
margin-bottom: $margin-2; margin-bottom: $margin-2;
}
.maputnik-filter-editor-block-action {
display: inline-block; display: inline-block;
width: 6%; width: 6%;
margin-right: 1.5%; margin-right: 1.5%;
@ -70,27 +73,3 @@
width: 92.5%; width: 92.5%;
} }
.maputnik-filter-editor-property {
display: inline-block;
width: 25%;
}
.maputnik-filter-editor-operator {
display: inline-block;
width: 17%;
.maputnik-select {
width: 100%;
}
}
.maputnik-filter-editor-args {
display: inline-block;
width: 54%;
.maputnik-string,
.maputnik-number {
width: 100%;
}
}

View file

@ -10,6 +10,7 @@
} }
.maputnik-toolbar-logo { .maputnik-toolbar-logo {
flex: 0 0 170px;
width: 180px; width: 180px;
text-align: left; text-align: left;
background-color: $color-black; background-color: $color-black;
@ -67,10 +68,6 @@
margin-left: $margin-1; margin-left: $margin-1;
} }
.maputnik-toolbar-logo {
flex: 0 0 170px;
}
.maputnik-toolbar__inner { .maputnik-toolbar__inner {
display: flex; display: flex;
} }

View file

@ -64,10 +64,6 @@
margin-right: $margin-3; margin-right: $margin-3;
} }
.maputnik-zoom-spec-property .maputnik-input-block:not(:first-child) .maputnik-input-block-label {
visibility: hidden;
}
// DATA FUNC // DATA FUNC
.maputnik-make-data-function { .maputnik-make-data-function {
background-color: transparent; background-color: transparent;
@ -79,16 +75,15 @@
@extend .maputnik-icon-button; @extend .maputnik-icon-button;
} }
// DATA PROPERTY
.maputnik-data-spec-block {
overflow: auto;
}
.maputnik-data-spec-property { .maputnik-data-spec-property {
.maputnik-input-block-label { .maputnik-input-block-label {
width: 30%; width: 30%;
} }
.maputnik-input-block:not(:first-child) .maputnik-input-block-label {
visibility: hidden;
}
.maputnik-input-block-content { .maputnik-input-block-content {
width: 70%; width: 70%;
} }
@ -117,6 +112,8 @@
} }
.maputnik-data-spec-block { .maputnik-data-spec-block {
overflow: auto;
.maputnik-data-spec-property-stop-edit, .maputnik-data-spec-property-stop-edit,
.maputnik-data-spec-property-stop-data { .maputnik-data-spec-property-stop-data {
display: inline-block; display: inline-block;