diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-08 15:07:34 -0500 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-08 15:07:34 -0500 |
commit | 415145d62fd5195fc03759b5b4ed42c255529d7b (patch) | |
tree | 11e7149396fdbff3efc6c06c536ada1f2a89bd64 /webapp/sass | |
parent | 5e2b4d1282dc374b54ca2c77fbf84c6533ce8519 (diff) | |
parent | 09d98b486e8245ae84a452331e36e2978a6d01ab (diff) | |
download | chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.gz chat-415145d62fd5195fc03759b5b4ed42c255529d7b.tar.bz2 chat-415145d62fd5195fc03759b5b4ed42c255529d7b.zip |
Merge branch 'release-3.3'
Diffstat (limited to 'webapp/sass')
-rw-r--r-- | webapp/sass/components/_modal.scss | 1 | ||||
-rw-r--r-- | webapp/sass/layout/_headers.scss | 2 | ||||
-rw-r--r-- | webapp/sass/layout/_sidebar-right.scss | 2 | ||||
-rw-r--r-- | webapp/sass/responsive/_desktop.scss | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 5ea1337f1..b7772c16d 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -531,6 +531,7 @@ flex-grow: 1; flex-shrink: 1; overflow: hidden; + padding-left: 10px; text-overflow: ellipsis; } diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index 832bed50e..c3a5f8fda 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -396,7 +396,7 @@ .icon__flag { svg { - height: 18px; + height: 19px; position: relative; top: 2px; width: 19px; diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss index 497cd3cea..d43ddf5b9 100644 --- a/webapp/sass/layout/_sidebar-right.scss +++ b/webapp/sass/layout/_sidebar-right.scss @@ -178,7 +178,7 @@ } .usage__icon { - @include opacity(.6); + @include opacity(.9); margin: 0 3px; position: relative; top: 1px; diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss index 38037d105..d891fe17f 100644 --- a/webapp/sass/responsive/_desktop.scss +++ b/webapp/sass/responsive/_desktop.scss @@ -34,9 +34,7 @@ } } } -} -@media screen and (max-width: 1258px) { .backstage-content { margin: 46px 46px 46px 150px; } |