diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-13 10:57:33 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-13 10:57:33 +0000 |
| commit | 7403c6c3dcad9bcf31bb11c271a1ea7d4225c2af (patch) | |
| tree | 782d7938d8bdbcc1071acda9f49fdeafce50dc84 /src/App.scss | |
| parent | 03190ab124253f30ddce40c6541afe6154b58339 (diff) | |
| parent | 4cc73cfe217ebc15136451ede050e5b8d5024328 (diff) | |
Merge branch 'fix/replace-sidepanel-scroll-js-with-css' into 'develop'
Get rid of the js to scale sidepanel, add an additional div and a css class to fix the same issue.
See merge request pleroma/pleroma-fe!156
Diffstat (limited to 'src/App.scss')
| -rw-r--r-- | src/App.scss | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/App.scss b/src/App.scss index c3c9013e..5a117f04 100644 --- a/src/App.scss +++ b/src/App.scss @@ -191,7 +191,7 @@ nav { flex-shrink: 1; } -.sidebar { +.sidebar-bounds { flex: 0; flex-basis: 35%; } @@ -222,21 +222,25 @@ nav { body { overflow-y: scroll; } - .sidebar { + .sidebar-bounds { overflow: hidden; max-height: 100vh; width: 345px; position: fixed; margin-top: -10px; - .sidebar-container { + .sidebar-scroller { height: 96vh; width: 365px; padding-top: 10px; - padding-right: 20px; + padding-right: 50px; overflow-x: hidden; overflow-y: scroll; } + + .sidebar { + width: 345px; + } } .sidebar-flexer { max-height: 96vh; |
