diff options
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 46 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 7 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 4 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 12 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_search.scss | 5 |
5 files changed, 48 insertions, 26 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 04ba9c51e..6443846e1 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -12,37 +12,37 @@ body { width: 100%; height: 100%; &.white { - background: #fff; - > .container-fluid { - overflow: auto; - } - .inner__wrap { - > .row.content { - min-height: 100%; - margin-bottom: -89px; - } + background: #fff; + > .container-fluid { + overflow: auto; + } + .inner__wrap { + > .row.content { + min-height: 100%; + margin-bottom: -89px; } + } } } .inner__wrap { + height: 100%; + > .row.main { height: 100%; - > .row.main { - height: 100%; - position: relative; - } + position: relative; + } } .container-fluid { - @include legacy-pie-clearfix; - height: 100%; - position: relative; + @include legacy-pie-clearfix; + height: 100%; + position: relative; } .channel-view { - @include clearfix; - height: 100%; - position: relative; + @include clearfix; + height: 100%; + position: relative; } img { @@ -65,7 +65,9 @@ img { background: rgba(black, 0.05); } .popover-content { - white-space: pre-wrap; + p:last-child { + margin-bottom: 5px; + } } } @@ -105,8 +107,8 @@ a:focus, a:hover { } .nopadding { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } .text-danger, a.text-danger { diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index 4a4de5c3b..93cb04198 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -298,8 +298,13 @@ height: 30px; width: 24px; line-height: 26px; - margin-right: 10px; + margin-right: 9px; font-size: 22px; + .channel__wrap.move--left & { + position: absolute; + right: -400px; + top: 14px; + } > a { color: inherit; text-decoration: none; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 77b66a1a8..aba58eed6 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -283,8 +283,8 @@ body.ios { width: 40px; height: 40px; position: absolute; - bottom: 50px; - right: 5px; + bottom: 0; + left: 10px; z-index: 50; @include opacity(0); @include single-transition(all, 0.3s); diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 832481cc5..09d498a69 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -60,6 +60,11 @@ &.move--left { @include translateX(0); + + .search-bar__container { + padding-right: 8px; + } + } } @@ -68,6 +73,13 @@ &.move--left { margin-right: 0; + + .channel-header__links { + position: relative; + right: auto; + top: auto; + } + } } diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 693c59a31..aa398e916 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,11 +1,14 @@ @charset "UTF-8"; #channel-header .search-bar__container { - padding: 0 8px 0 3px; + padding: 0 9px 0 3px; } .search-bar__container { padding: 12px 8px 0 0; @include flex(0 0 56px); + .sidebar--right.move--left & { + padding-right: 42px; + } } .search__clear { display: none; |