diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-14 09:02:05 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-14 09:02:05 -0400 |
commit | 962a5d8beb8b0eb634b1bff9258b209142041dc9 (patch) | |
tree | 64e636b204f2845349893d659c29117c762d8b16 /web/sass-files/sass | |
parent | cdbe6342bb018e16d6eb3f04c0c6c8457805e61a (diff) | |
parent | 99f243b44443babe3fd332538d2b102218834462 (diff) | |
download | chat-962a5d8beb8b0eb634b1bff9258b209142041dc9.tar.gz chat-962a5d8beb8b0eb634b1bff9258b209142041dc9.tar.bz2 chat-962a5d8beb8b0eb634b1bff9258b209142041dc9.zip |
Merge pull request #1046 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 7 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_content.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_error-bar.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 7 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_navbar.scss | 6 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 18 |
9 files changed, 37 insertions, 18 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 470db16dc..44a474213 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -45,9 +45,9 @@ img { .popover { color: #333; - &.bottom { + &.bottom, &.right, &.top, &.left { >.arrow:after { - border-bottom-color: rgba(white, 0.5); + border-color: transparent; } } .popover-title { @@ -83,6 +83,9 @@ a:focus, a:hover { .tooltip { .tooltip-inner { word-break: break-word; + font-size: 13px; + padding: 3px 10px 4px; + font-weight: 500; } } diff --git a/web/sass-files/sass/partials/_content.scss b/web/sass-files/sass/partials/_content.scss index 64d253283..49b3916a9 100644 --- a/web/sass-files/sass/partials/_content.scss +++ b/web/sass-files/sass/partials/_content.scss @@ -28,7 +28,7 @@ bottom: 0; left: 0; width: 100%; - z-index: 6; + z-index: 3; } .post-list { .new-messages-hr { diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss index 2e3d3c87e..8b7432bbb 100644 --- a/web/sass-files/sass/partials/_error-bar.scss +++ b/web/sass-files/sass/partials/_error-bar.scss @@ -3,7 +3,7 @@ text-align:center; position: relative; color: #fff; - position: fixed; + position: absolute; top: 0; width: 100%; z-index: 9999; diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index a797dfba6..2d7b6cd26 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -40,5 +40,6 @@ .help-block { font-size: 0.95em; + margin: 10px 0 0; color: #999; } diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index feaa5acfb..8bf163f90 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -291,11 +291,6 @@ display: inline-block; width: 15px; margin: 9px 6px 3px 0; - &:hover { - svg { - fill: #777; - } - } a { height: 100%; display: block; @@ -303,6 +298,6 @@ svg { vertical-align: top; margin-top: 8px; - fill: #aaa; + fill: inherit; } } diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss index a8c3c0da2..2e78a8728 100644 --- a/web/sass-files/sass/partials/_navbar.scss +++ b/web/sass-files/sass/partials/_navbar.scss @@ -95,12 +95,6 @@ } } -.close-btn { - position: absolute; - right: 10px; - top: 5px; -} - .badge-notify { background:red; position: absolute; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index b457d0dd2..0f3cc0ef6 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -408,7 +408,7 @@ body.ios { } .post-body { position: relative; - z-index: 5; + z-index: 1; max-width: 100%; width: 600px; float: left; @@ -439,7 +439,7 @@ body.ios { padding-left: 0px; &.post-header-post { position: relative; - z-index: 5; + z-index: 1; width: 200px; text-align: right; float: left; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 447f47d87..dbe6029ec 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -48,6 +48,7 @@ } .post-header { &.post-header-post { + z-index: inherit; width: auto; float: none; text-align: left; @@ -138,6 +139,7 @@ } .post-header { &.post-header-post { + z-index: inherit; width: auto; float: none; text-align: left; @@ -624,6 +626,12 @@ &:hover, &:focus { background: transparent; } + &.has-close { + .btn-close { + display: block; + @include opacity(0.5); + } + } } } } diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 7cb530d2c..24aaef059 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -100,6 +100,24 @@ } &.has-close { padding-right: 30px; + &:hover { + .btn-close { + display: block; + @include opacity(0.8); + } + } + .btn-close { + position: absolute; + right: 15px; + top: -1px; + font-size: 20px; + font-weight: 600; + @include opacity(0); + display: none; + &:hover { + @include opacity(1); + } + } } &.nav-more { text-decoration: underline; |