Skip to content
This repository has been archived by the owner on Mar 13, 2021. It is now read-only.

Commit

Permalink
Lint scss sources #10
Browse files Browse the repository at this point in the history
  • Loading branch information
ed-asriyan committed Aug 25, 2018
1 parent 992344b commit dddae20
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 33 deletions.
9 changes: 9 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"plugins": [
"stylelint-scss"
],
"extends": "stylelint-config-recommended",
"rules": {
"at-rule-no-unknown": null
}
}
3 changes: 3 additions & 0 deletions app/styles/component-styles/core/loader-component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
width: 64px;
height: 64px;
}

.lds-dual-ring:after {
content: " ";
display: block;
Expand All @@ -15,10 +16,12 @@
border-color: #252525 transparent #252525 transparent;
animation: lds-dual-ring 1.2s linear infinite;
}

@keyframes lds-dual-ring {
0% {
transform: rotate(0deg);
}

100% {
transform: rotate(360deg);
}
Expand Down
4 changes: 1 addition & 3 deletions app/styles/component-styles/object-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@
}

.header-wrapper {
background-size: cover;
background-clip: border-box;
background: url('http://europeya.ru.opt-images.1c-bitrix-cdn.ru/upload/medialibrary/78e/78e62266dbe348925c434101403e1219.jpg?1481011582195555') center;
background: url('http://europeya.ru.opt-images.1c-bitrix-cdn.ru/upload/medialibrary/78e/78e62266dbe348925c434101403e1219.jpg?') center;
overflow: hidden;

height: $grid-step * 10;
Expand Down
2 changes: 1 addition & 1 deletion app/styles/component-styles/sensor-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
&__bar-chart {
height: 2px;
width: 100%;
background: #000;
background: black;
}

display: flex;
Expand Down
12 changes: 6 additions & 6 deletions app/styles/constants.scss
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
$btn-neutral-bg-start: rgb(120, 160, 159);
$btn-neutral-bg-end: rgb(97, 136, 135);
$btn-neutral-color: rgb(255, 255, 255);
$btn-neutral-color: white;

$btn-warning-bg-start: rgb(172, 23, 35);
$btn-warning-bg-end: rgb(155, 6, 26);
$btn-warning-hov-bg-start: rgb(190, 24, 24);
$btn-warning-hov-bg-end: rgb(179, 8, 8);
$btn-warning-color: rgb(255, 255, 255);
$btn-warning-color: white;

$btn-ok-bg-start: rgb(23, 172, 166);
$btn-ok-bg-end: rgb(6, 155, 151);
$btn-ok-hov-bg-start: rgb(24, 190, 185);
$btn-ok-hov-bg-end: rgb(8, 179, 173);
$btn-ok-color: rgb(255, 255, 255);
$btn-ok-color: white;

$mark-ok-background: rgb(14, 188, 186);
$mark-ok-color: rgb(255, 255, 255);
$mark-ok-color: white;
$mark-error-background: rgb(188, 14, 14);
$mark-error-color: rgb(255, 255, 255);
$mark-error-color: white;
$object-card-header-ok-background: rgba(158, 214, 183, 0.85);
$object-card-header-error-background: rgba(214, 158, 158, 0.85);
$object-card-header-color: rgb(27, 27, 27);
$object-card-body-background: rgb(255, 255, 255);
$object-card-body-background: white;
$object-card-footer-background: rgb(230, 236, 236);

$font-inactive-color: rgb(141, 141, 141);
Expand Down
24 changes: 5 additions & 19 deletions app/styles/grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -106,26 +106,12 @@ $max-grid-size: 32;
&-bottom {
align-items: flex-end;
}
}

.col-full {
@extend ._base_col;

flex: 1;
overflow: hidden;
box-sizing: border-box;
}
&-full {
@extend ._base_col;

.col {
&-top {
align-self: flex-start;
}

&-center {
align-self: center;
}

&-bottom {
align-self: flex-end;
flex: 1;
overflow: hidden;
box-sizing: border-box;
}
}
2 changes: 1 addition & 1 deletion app/styles/typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body {
border-radius: 50px;
font-style: normal;

color: rgb(255, 255, 255);
color: white;
background: rgb(14, 188, 186);
}

Expand Down
11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
"repository": "",
"scripts": {
"build": "ember build",
"lint": "eslint app/ tests/ && ./node_modules/.bin/ember-template-lint app/templates/",
"lint": "npm run lint:js && npm run lint:hbs && npm run lint:scss",
"lint:js": "eslint app/ tests/",
"lint:hbs": "./node_modules/.bin/ember-template-lint app/templates/",
"lint:scss": "stylelint app/styles",
"start": "ember serve",
"test": "ember test"
"test": "npm run lint && ember test"
},
"devDependencies": {
"@ember-decorators/babel-transforms": "^2.0.2",
Expand Down Expand Up @@ -48,7 +51,9 @@
"ember-welcome-page": "^3.0.0",
"eslint": "^5.2.0",
"eslint-config-google": "^0.9.1",
"loader.js": "^4.2.3"
"loader.js": "^4.2.3",
"stylelint": "^9.5.0",
"stylelint-scss": "^3.3.0"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
Expand Down

0 comments on commit dddae20

Please sign in to comment.