From e7d7892fd762c71e09d742487193670a98a71742 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 5 Oct 2015 22:32:26 +0500 Subject: Multiple UI Improvements --- web/sass-files/sass/partials/_base.scss | 21 ++++++++++----------- web/sass-files/sass/partials/_forms.scss | 5 +++-- web/sass-files/sass/partials/_headers.scss | 2 +- web/sass-files/sass/partials/_mentions.scss | 4 ---- web/sass-files/sass/partials/_settings.scss | 1 + 5 files changed, 15 insertions(+), 18 deletions(-) (limited to 'web/sass-files') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index fa465ff91..841db7c5a 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -36,14 +36,13 @@ body { .popover { color: #333; - a { - color: $primary-color; - &:hover, &:focus { - color: $primary-color; + &.bottom { + >.arrow:after { + border-bottom-color: rgba(white, 0.5); } } .popover-title { - background: rgba(black, 0.1); + background: rgba(black, 0.05); } } @@ -60,7 +59,7 @@ body { } .word-break--all { - word-break: break-all; + word-break: break-all; } a { @@ -165,9 +164,9 @@ a:focus, a:hover { } .emoji { - width: 1.5em; - height: 1.5em; - display: inline-block; - margin-bottom: 0.25em; - background-size: contain; + width: 1.5em; + height: 1.5em; + display: inline-block; + margin-bottom: 0.25em; + background-size: contain; } diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss index 65ea161d4..6c1f7cc6c 100644 --- a/web/sass-files/sass/partials/_forms.scss +++ b/web/sass-files/sass/partials/_forms.scss @@ -16,11 +16,12 @@ } } .input__help { - color: #777; + color: inherit; margin: 10px 0 0 10px; word-break: break-word; + @include opacity(0.8); &.dark { - color: #222; + @include opacity(1); } &.error { color: #a94442; diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 9b9e5f573..2a4e82fc7 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -37,7 +37,7 @@ &.description { overflow: hidden; text-overflow: ellipsis; - color: #888; + @include opacity(0.6); margin-top: 2px; max-height: 45px; } diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index aff31e418..a2bd0dcea 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -55,10 +55,6 @@ padding-left: 10px; } -.mention-link { - color: $primary-color; -} - .mention-highlight { background-color:#fff2bb; color: #333; diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index 1f785f63c..42475efd5 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -81,6 +81,7 @@ .appearance-section { .premade-themes { + margin-bottom: 10px; .theme-label { font-weight: 400; margin-top: 5px; -- cgit v1.2.3-1-g7c22