summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-11 09:59:32 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-11 09:59:32 -0700
commit714f47e015adf4a455d29cbddfb5f58f84d9973e (patch)
treeedc51236ee974d70d7e63b3c107408f2eb79e032 /web/sass-files/sass
parente5e88d16049f4527eaab6b066c731fbe4247b574 (diff)
parent471e7839966ad013ac9c61ec37d7ecdd352e87dd (diff)
downloadchat-714f47e015adf4a455d29cbddfb5f58f84d9973e.tar.gz
chat-714f47e015adf4a455d29cbddfb5f58f84d9973e.tar.bz2
chat-714f47e015adf4a455d29cbddfb5f58f84d9973e.zip
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_modal.scss3
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss2
2 files changed, 3 insertions, 2 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index d32306cbc..a046cd904 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -123,6 +123,7 @@
}
.more-channel-table {
margin: 0;
+ table-layout: fixed;
p {
font-size: 0.9em;
overflow: hidden;
@@ -154,7 +155,7 @@
&.td--action {
text-align: right;
padding: 8px 15px 8px 8px;
- width: 70px;
+ width: 80px;
vertical-align: middle;
}
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index d4ed41130..3d89e53b3 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -49,7 +49,7 @@
left: 0;
right: 0;
width: 72%;
- color: #777;
+ color: #fff;
background: #2389D7;
@include border-radius(50px);
margin: 0 auto;