Skip to content

Commit 5dfee7d

Browse files
authored
Merge pull request #29 from rootstrap/use-stylelint
Change unmaintained sass-lint for stylelint
2 parents cd8ac5c + 4afaf3d commit 5dfee7d

File tree

7 files changed

+1968
-1258
lines changed

7 files changed

+1968
-1258
lines changed

.sass-lint.yml

Lines changed: 0 additions & 7 deletions
This file was deleted.

.stylelintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "stylelint-config-standard"
3+
}

app/assets/stylesheets/active_admin_chat.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
background-image: linear-gradient(180deg, $active-admin-chat__lighter-grey, $active-admin-chat__light-grey);
1515
border: solid 1px $active-admin-chat__grey;
1616
border-color: $active-admin-chat__light-grey $active-admin-chat__light-grey $active-admin-chat__grey;
17-
box-shadow: 0 1px 3px rgba($active-admin-chat__black, .12), 0 0 1px $active-admin-chat__white inset;
17+
box-shadow: 0 1px 3px rgba($active-admin-chat__black, 0.12), 0 0 1px $active-admin-chat__white inset;
1818
font-size: 14px;
1919
font-weight: bold;
2020
margin: 0;
@@ -85,15 +85,6 @@
8585
margin-top: auto;
8686
}
8787

88-
&.admin {
89-
text-align: right;
90-
91-
div {
92-
background-color: $active-admin-chat__green;
93-
border-radius: 10px 10px 0;
94-
}
95-
}
96-
9788
div {
9889
background-color: $active-admin-chat__white;
9990
border-radius: 10px 10px 10px 0;
@@ -112,6 +103,15 @@
112103
font-size: 10px;
113104
}
114105
}
106+
107+
&.admin {
108+
text-align: right;
109+
110+
div {
111+
background-color: $active-admin-chat__green;
112+
border-radius: 10px 10px 0;
113+
}
114+
}
115115
}
116116

117117
.active-admin-chat__send-message-container {

app/assets/stylesheets/colors.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ $active-admin-chat__lightest-grey: #fafafa;
22
$active-admin-chat__lighter-grey: #efefef;
33
$active-admin-chat__light-grey: #d4d4d4;
44
$active-admin-chat__grey: #cdcdcd;
5-
$active-admin-chat__black: #000000;
6-
$active-admin-chat__white: #ffffff;
5+
$active-admin-chat__black: #000;
6+
$active-admin-chat__white: #fff;
77
$active-admin-chat__green: #cbe6b8;

0 commit comments

Comments
 (0)