summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials/_admin-console.scss
diff options
context:
space:
mode:
authorStas Vovk <stas@vovk.me>2015-10-16 14:21:51 +0300
committerStas Vovk <stas@vovk.me>2015-10-16 14:21:51 +0300
commit79fcb9808421dd93342a9538d05dd2259f5dd14b (patch)
tree33a1a865144f280e37fde07a7c91ed8825c53801 /web/sass-files/sass/partials/_admin-console.scss
parent2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff)
parent50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff)
downloadchat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz
chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2
chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts: web/react/utils/constants.jsx
Diffstat (limited to 'web/sass-files/sass/partials/_admin-console.scss')
-rw-r--r--web/sass-files/sass/partials/_admin-console.scss9
1 files changed, 5 insertions, 4 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index 4b4fc1664..14f1d9c2f 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -15,12 +15,11 @@
.nav {
li {
padding: 0;
+ @include opacity(1);
.icon {
width: 17px;
}
> a {
- padding: 9px 15px;
- display: block;
&:hover, &.active, &:focus {
background-color: #EAEAEA;
}
@@ -117,8 +116,10 @@
.form-group {
margin-bottom: 25px;
}
- ul, ol {
- padding-left: 23px;
+ .help-text {
+ ul, ol {
+ padding-left: 23px;
+ }
}
.help-text {
margin: 10px 0 0 15px;