diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-02-16 08:19:19 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-16 08:19:19 -0500 |
commit | 6ffcfaa2f38cfb4d4f354c547286d8e29b6efda6 (patch) | |
tree | 670551eadc5008231bb1b838edf3fea01d968ad2 /web/sass-files | |
parent | 2ec3762fb2e0140649d138006323b35726b9b213 (diff) | |
parent | 44fa72066bacb741c3303633b6a3a690f6fc0d01 (diff) | |
download | chat-6ffcfaa2f38cfb4d4f354c547286d8e29b6efda6.tar.gz chat-6ffcfaa2f38cfb4d4f354c547286d8e29b6efda6.tar.bz2 chat-6ffcfaa2f38cfb4d4f354c547286d8e29b6efda6.zip |
Merge pull request #2171 from asaadmahmoodspin/ui-fixes
Multiple UI Improvements
Diffstat (limited to 'web/sass-files')
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post_right.scss | 15 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 49 |
4 files changed, 72 insertions, 4 deletions
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 323691d89..5d0985fc0 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -396,8 +396,8 @@ body.ios { .post-list__content { display: table-cell; vertical-align: bottom; - > div:last-child { - .dropdown-menu { + .dropdown-menu { + &.bottom { top: auto; bottom: 25px; } diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss index bd3d60622..01be9e288 100644 --- a/web/sass-files/sass/partials/_post_right.scss +++ b/web/sass-files/sass/partials/_post_right.scss @@ -11,7 +11,15 @@ .post-right-comments-container { position: relative; - padding: 0.7em 0 0; + + .post { + + &:first-child { + padding-top: 15px; + } + + } + } .post { @@ -19,6 +27,11 @@ &.post--root { padding-bottom: 1.2em; border-bottom: 1px solid #ddd; + + .post__body { + background: transparent !important; + } + } .post__header { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 2374a9dbb..1a8e3f374 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -92,12 +92,14 @@ font-size: 1em; } - .date-separator.hovered--after:before, .new-separator.hovered--after:before { + .date-separator.hovered--before:after, .date-separator.hovered--after:before, .new-separator.hovered--after:before, .new-separator.hovered--before:after { background: none !important; } .post { + background: none !important; + .post__dropdown { line-height: 9px; text-decoration: none; @@ -114,6 +116,10 @@ } + .comment-icon__container { + visibility: visible; + } + .post-list__content & { &:hover { diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index de7df403f..c79b54922 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -144,7 +144,11 @@ select { padding-right: 25px; } + select::-ms-expand { + display: none; + } &:before { + pointer-events: none; position: absolute; top: 11px; right: 50px; @@ -181,12 +185,57 @@ .theme-elements { padding-left:15px; + .element { margin-right:10px; + + &:nth-child(2n) { + margin-right: 0; + } + } } + .theme-elements__header { + margin: 10px 20px 0px 0; + border-bottom: 1px solid #ccc; + padding: 5px 0 10px; + font-size: em(13.5px); + font-weight: 600; + cursor: pointer; + + .fa-minus { + display: none; + } + + &.open { + .fa-minus { + display: inline-block; + } + .fa-plus { + display: none; + } + } + + .header__icon { + float: right; + @include opacity(0.5); + } + + } + + .theme-elements__body { + padding-top: 5px; + display: none; + @include legacy-pie-clearfix; + background: rgba(255, 255, 255, 0.05); + padding: 20px 0 0 20px; + margin: 0 20px 0 0; + @include border-radius(0 0 3px 3px); + } + .custom-label { + white-space: nowrap; font-weight: normal; font-size: 12px; width: 100%; |