diff options
Diffstat (limited to 'webapp/sass')
-rw-r--r-- | webapp/sass/layout/_forms.scss | 2 | ||||
-rw-r--r-- | webapp/sass/layout/_post.scss | 1 | ||||
-rw-r--r-- | webapp/sass/layout/_team-sidebar.scss | 39 | ||||
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 17 | ||||
-rw-r--r-- | webapp/sass/routes/_settings.scss | 1 |
5 files changed, 30 insertions, 30 deletions
diff --git a/webapp/sass/layout/_forms.scss b/webapp/sass/layout/_forms.scss index 100b618e8..7552290d8 100644 --- a/webapp/sass/layout/_forms.scss +++ b/webapp/sass/layout/_forms.scss @@ -23,7 +23,7 @@ .input__help { @include opacity(.8); color: inherit; - margin: 10px 0 0 10px; + margin: 10px 0 0 0; word-break: break-word; &.dark { diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 258b29ed8..370e67729 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -1022,6 +1022,7 @@ li { ul, ol { + font-size: 1em; margin: 0; padding: 0 0 0 20px; } diff --git a/webapp/sass/layout/_team-sidebar.scss b/webapp/sass/layout/_team-sidebar.scss index dd80a4d12..562944984 100644 --- a/webapp/sass/layout/_team-sidebar.scss +++ b/webapp/sass/layout/_team-sidebar.scss @@ -4,7 +4,7 @@ left: 0; position: fixed; text-align: center; - width: 75px; + width: 65px; z-index: 5; .team-wrapper { @@ -14,41 +14,40 @@ padding-top: 15px; .team-container { - width: 100%; - text-align: center; display: table; margin-bottom: 10px; position: relative; + text-align: center; + width: 100%; .team-btn { - border: none; - height: 42px; - text-align: center; + @include border-radius(2px); + background-color: alpha-color($black, .3); + display: table-cell; font-weight: bold; - border-radius: 5px; + height: 35px; position: relative; - width: 42px; - background-color: rgba(0, 0, 0, 0.3); - display: table-cell; + text-align: center; vertical-align: middle; + width: 35px; .badge { + font-size: 10px; position: absolute; - top: -3px; right: -6px; - font-size: 10px; + top: -3px; } } &.active { .team-btn { - border: 1px solid #fff; background-color: transparent; + border: 1px solid $white; } } &.active:before { - background: black; + background: $black; content: ''; height: 100%; left: 0; @@ -58,7 +57,7 @@ } &.unread:before { - background: black; + background: $black; border-radius: 50%; content: ''; height: 5px; @@ -69,8 +68,8 @@ } a.team-disabled { + @include opacity(.5); cursor: not-allowed; - opacity: 0.5; } } @@ -81,10 +80,14 @@ } .sidebar--left { - left: 75px; + left: 65px; + + .nav-pills__unread-indicator { + left: 80px; + } } .app__content { - margin-left: 295px; + margin-left: 285px; } } diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index ab305a5b0..a969a74d5 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -1165,9 +1165,6 @@ } .multi-teams { - .team-sidebar { - width: 75px; - } .app__content { margin-left: 0; @@ -1177,7 +1174,11 @@ left: 0; &.move--right { - left: 75px; + left: 65px; + + .nav-pills__unread-indicator { + left: 15px; + } } } @@ -1521,15 +1522,11 @@ @media screen and (max-width: 320px) { .multi-teams { - .team-sidebar { - width: 65px; - } - .sidebar--left { width: 220px; - &.move--right { - left: 65px; + .nav-pills__unread-indicator { + width: 190px; } } } diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss index 6b7f8a5f1..a150e8904 100644 --- a/webapp/sass/routes/_settings.scss +++ b/webapp/sass/routes/_settings.scss @@ -15,7 +15,6 @@ } .authorized-apps__wrapper { - background-color: #fff; padding: 10px 0; } |