about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorNolan Lawson <nolan@nolanlawson.com>2017-10-29 08:11:32 -0700
committerYamagishi Kazutoshi <ykzts@desire.sh>2017-10-30 00:11:32 +0900
commit512feab222932875a334cc618464810d05082ed9 (patch)
treefe940907c638f998bb33e60b053e55519e2e3e60 /app/javascript
parent5e111ce16dcfde66afcd9dcee5f3819ee00cc6bc (diff)
Add margin to account for Edge disappearing scrollbar (#5522)
* Add margin to account for Edge disappearing scrollbar

* Fix 16px margin for DMs and horizontal line
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/styles/mastodon/components.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 9230fa8ba..3f3fe51d3 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -620,6 +620,12 @@
   border-bottom: 1px solid lighten($ui-base-color, 8%);
   cursor: default;
 
+  @supports (-ms-overflow-style: -ms-autohiding-scrollbar) {
+    // Add margin to avoid Edge auto-hiding scrollbar appearing over content.
+    // On Edge 16 this is 16px and Edge <=15 it's 12px, so aim for 16px.
+    padding-right: 26px; // 10px + 16px
+  }
+
   @keyframes fade {
     0% { opacity: 0; }
     100% { opacity: 1; }