summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-08-20 11:58:50 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-08-20 11:58:50 -0400
commit343ff54a32905e468f199e3d6e237422267e3102 (patch)
tree4ba5fc77e73a6f74bddf5570ec87286ef2bd941f /web/sass-files/sass
parent4fafac5225d85c603140df261ab1535a63e918b6 (diff)
downloadchat-343ff54a32905e468f199e3d6e237422267e3102.tar.gz
chat-343ff54a32905e468f199e3d6e237422267e3102.tar.bz2
chat-343ff54a32905e468f199e3d6e237422267e3102.zip
Revert "Multiple UI Improvements"
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_modal.scss7
-rw-r--r--web/sass-files/sass/partials/_popover.scss8
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss13
3 files changed, 7 insertions, 21 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 8462701c9..014f834ed 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -50,13 +50,6 @@
@include clearfix;
.modal-title {
float: left;
- font-size: 16px;
- line-height: 27px;
- color: #f4f4f4;
- .name {
- font-weight: 600;
- color: #fff;
- }
}
.modal-action {
padding: 0;
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index 126d239ec..5008331b4 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -1,8 +1,3 @@
-.channel-header__info .popover-content {
- max-height: 250px;
- overflow: auto;
-}
-
.user-popover {
cursor: pointer;
display: inline-block;
@@ -18,5 +13,4 @@
overflow: hidden;
text-overflow: ellipsis;
display: block;
-}
-
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 22b7426b1..6d9f2ad8b 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -38,25 +38,24 @@
height: 100%;
position: relative;
overflow: auto;
+
}
.nav-pills__unread-indicator {
position: absolute;
left: 0;
right: 0;
- width: 72%;
- color: #777;
- background: #DCF0FF;
- @include border-radius(50px);
+ width: 70%;
+ background-color: darken($primary-color, 5%);
+ color: white;
margin: 0 auto;
- padding: 3px 0 4px;
- font-size: 13.5px;
+ padding: 2px;
text-align: center;
z-index: 1;
}
.nav-pills__unread-indicator-top {
- top: 66px;
+ top: 56px;
}
.nav-pills__unread-indicator-bottom {
bottom: 0px;