diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-12-14 19:01:22 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-12-14 19:01:22 -0500 |
commit | 74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb (patch) | |
tree | b063683a1ec022c3ccbb2561d30734e0a9156905 /web/sass-files/sass | |
parent | 6c7c04f38d0485dadcd7dd0ea2ba3a95bdfde448 (diff) | |
parent | f51d45f6cba0e5a1249146afe4a1c78cf32b7598 (diff) | |
download | chat-74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb.tar.gz chat-74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb.tar.bz2 chat-74f427fb1a5da8ccd0bbc4e4104830cfa12c70fb.zip |
Merge branch 'release-1.3'
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 2 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--right.scss | 6 |
4 files changed, 5 insertions, 5 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 61ad186e0..4f9e1d5c7 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -9,6 +9,7 @@ body { -webkit-font-smoothing: antialiased; background: $body-bg; position: relative; + width: 100%; height: 100%; &.white { background: #fff; diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 3ec1c4434..fbebb4e98 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -209,6 +209,7 @@ body.ios { @include flex(1 1 auto); position: relative; overflow-y: hidden; + height: 100%; .post-list-holder-by-time { background: #fff; diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 66aaede8d..2aa130fa9 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -54,9 +54,7 @@ @media screen and (max-width: 960px) { .sidebar--right { - width: 400px; z-index: 5; - right: 0; @include translateX(100%); &.move--left { diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index f6c8d37a9..e39f7730b 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -1,17 +1,17 @@ @charset "UTF-8"; .sidebar--right { - position: absolute; + position: fixed; width: 400px; height: 100%; right: 0px; padding: 0; background: #fff; @include single-transition(transform, 0.5s, ease); - right: -400px; + @include translateX(400px); &.move--left { - right: 0; + @include translateX(0); } .post-body { |