diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-08 12:50:23 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-08 12:50:23 -0800 |
commit | 90791dd98ea0f26439a13c1ec05a610514988b5c (patch) | |
tree | acb09a106bba92243d7b1db278fe4da698082563 /web/sass-files/sass/partials | |
parent | 14775d4f148848143dab07d59cca899303d10966 (diff) | |
parent | bf9814f2653575a4c3f375c887eff484fcd1e706 (diff) | |
download | chat-90791dd98ea0f26439a13c1ec05a610514988b5c.tar.gz chat-90791dd98ea0f26439a13c1ec05a610514988b5c.tar.bz2 chat-90791dd98ea0f26439a13c1ec05a610514988b5c.zip |
Merge pull request #1659 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_error-bar.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_files.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_modal.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 12 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_search.scss | 9 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 25 |
8 files changed, 45 insertions, 22 deletions
diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss index 249bbeaa5..0bfcbe0be 100644 --- a/web/sass-files/sass/partials/_error-bar.scss +++ b/web/sass-files/sass/partials/_error-bar.scss @@ -19,6 +19,7 @@ font-weight: 600; text-decoration: none; padding: 0 10px; + font-family: 'Open Sans', sans-serif; &:hover { color: #FFF; text-decoration: none; diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss index aeb04e931..2c341f61e 100644 --- a/web/sass-files/sass/partials/_files.scss +++ b/web/sass-files/sass/partials/_files.scss @@ -2,7 +2,7 @@ .preview-container { position: relative; - margin-top: 25px; + margin: 1px 0 10px; width: 100%; max-height: 100px; height: 100px; diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss index 55725abe0..9279cf0c4 100644 --- a/web/sass-files/sass/partials/_modal.scss +++ b/web/sass-files/sass/partials/_modal.scss @@ -186,6 +186,7 @@ padding: 8px 15px 8px 8px; width: 80px; vertical-align: middle; + position: relative; &.lg { width: 110px; } diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 81cc311e1..df519c752 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -319,13 +319,11 @@ body.ios { @include clearfix; padding: 3px 0 0 0; font-size: 13px; - .has-error { - .control-label { - height: 0; - display: block; - font-weight: normal; - margin-bottom: 0; - } + .control-label { + font-weight: normal; + margin-bottom: 0; + top: -5px; + position: relative; } .msg-typing { min-height: 25px; diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index 4f04a266b..fa52e2972 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -44,6 +44,9 @@ .textarea-wrapper { min-height: 100px; } + .btn { + margin-bottom: 10px; + } .custom-textarea { min-height: 100px; } @@ -123,6 +126,11 @@ overflow: auto; -webkit-overflow-scrolling: touch; @include flex(1 1 auto); + + .preview-container { + margin-top: 5px; + } + } .post-right-comment-time { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index bdf04ff82..ed2d0bbe9 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -377,10 +377,8 @@ .msg-typing { display: none; } - .has-error { - .control-label { - height: auto; - } + .control-label { + top: 0; } } .post-create-body { @@ -409,8 +407,7 @@ } } .preview-container { - padding: 0px; - margin-top: 5px; + margin: 5px 0 0; .preview-div { margin-top: 0; } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index a29e940e6..a5b2a78dd 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -111,7 +111,14 @@ .search-item__jump { position: absolute; right: 0; - top: 0; + top: 0px; + font-size: 13px; + @include opacity(0.8); + + &:hover { + @include opacity(1); + } + } .search-item-time { diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index ee0c40067..f078cafb4 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -135,9 +135,10 @@ .input-group-addon { padding: 4px 5px; width: 40px; - img { - border: 1px solid rgba(black, 0.15); - } + } + img { + border: 1px solid rgba(black, 0.15); + width: 29px; } } .premade-themes { @@ -325,12 +326,22 @@ overflow: hidden; text-overflow: ellipsis; } +} + +.member-role, .member-drop { + position:absolute; + right: 15px; + top: 8px; + + .fa { + margin-right: 5px; + } - .member-role, .member-drop { - position:absolute; - right: 15px; - top: 8px; + .member-menu { + top: -50%; + right: 110%; } + } .member-invite { |