summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-08-21 09:24:42 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-08-21 09:24:42 -0400
commitddcdcc3e2c85efbfd1d91d69c0f5c0af7c7cb1c7 (patch)
tree66c24ca52a23f9b0475830a6d64f2c2abe96e26d /web/sass-files/sass/partials
parent4a022752faf9a2b6c4de5cfa65f23adb578a96a5 (diff)
parent332a4d1628f38b34930bff4bafe1b194012f443a (diff)
downloadchat-ddcdcc3e2c85efbfd1d91d69c0f5c0af7c7cb1c7.tar.gz
chat-ddcdcc3e2c85efbfd1d91d69c0f5c0af7c7cb1c7.tar.bz2
chat-ddcdcc3e2c85efbfd1d91d69c0f5c0af7c7cb1c7.zip
Merge pull request #420 from asaadmahmoodspin/ui-changes
Multiple UI Improvements
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_headers.scss3
-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
4 files changed, 24 insertions, 7 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index da648a170..571c7ff1f 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -65,6 +65,9 @@
}
.channel-intro-img {
float:left;
+ img {
+ @include border-radius(100px);
+ }
}
.channel-intro__title {
font-weight:600;
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index 014f834ed..dec08b567 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -50,6 +50,13 @@
@include clearfix;
.modal-title {
float: left;
+ font-size: 17px;
+ 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 5008331b4..126d239ec 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -1,3 +1,8 @@
+.channel-header__info .popover-content {
+ max-height: 250px;
+ overflow: auto;
+}
+
.user-popover {
cursor: pointer;
display: inline-block;
@@ -13,4 +18,5 @@
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 7bbaa21cb..6b827eaee 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -38,24 +38,25 @@
height: 100%;
position: relative;
overflow: auto;
-
}
.nav-pills__unread-indicator {
position: absolute;
left: 0;
right: 0;
- width: 70%;
- background-color: darken($primary-color, 5%);
- color: white;
+ width: 72%;
+ color: #777;
+ background: #DCF0FF;
+ @include border-radius(50px);
margin: 0 auto;
- padding: 2px;
+ padding: 3px 0 4px;
+ font-size: 13.5px;
text-align: center;
z-index: 1;
}
.nav-pills__unread-indicator-top {
- top: 56px;
+ top: 66px;
}
.nav-pills__unread-indicator-bottom {
bottom: 0px;