From a790dc640ff3e6b6b4433b268a6c336147d961c5 Mon Sep 17 00:00:00 2001 From: Tim Lange Date: Sat, 22 Feb 2020 14:45:45 +0100 Subject: [PATCH] Fix: Changed overflow scroll to overflow auto (#523) Co-authored-by: Nithin David Thomas --- app/javascript/dashboard/assets/scss/_layout.scss | 4 ++-- app/javascript/dashboard/assets/scss/_mixins.scss | 4 ++-- .../dashboard/assets/scss/views/settings/inbox.scss | 2 +- .../dashboard/assets/scss/widgets/_conversation-view.scss | 2 +- app/javascript/dashboard/assets/scss/widgets/_emojiinput.scss | 2 +- app/javascript/dashboard/assets/scss/widgets/_login.scss | 2 +- app/javascript/dashboard/assets/scss/widgets/_modal.scss | 2 +- app/javascript/dashboard/assets/scss/widgets/_reply-box.scss | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/javascript/dashboard/assets/scss/_layout.scss b/app/javascript/dashboard/assets/scss/_layout.scss index e636b2873..cdb81c76a 100644 --- a/app/javascript/dashboard/assets/scss/_layout.scss +++ b/app/javascript/dashboard/assets/scss/_layout.scss @@ -35,11 +35,11 @@ body { flex-direction: column; @include margin($zero); @include padding($space-normal); - overflow-y: scroll; + overflow-y: auto; } .content-box { - overflow: scroll; + overflow: auto; @include padding($space-normal); } diff --git a/app/javascript/dashboard/assets/scss/_mixins.scss b/app/javascript/dashboard/assets/scss/_mixins.scss index 953ab11a4..7b64b5119 100644 --- a/app/javascript/dashboard/assets/scss/_mixins.scss +++ b/app/javascript/dashboard/assets/scss/_mixins.scss @@ -133,13 +133,13 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7); overflow: hidden; &:hover { - overflow-y: scroll; + overflow-y: auto; } } @mixin horizontal-scroll() { - overflow-y: scroll; + overflow-y: auto; } @mixin elegent-shadow() { diff --git a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss index b6865213e..0059816d8 100644 --- a/app/javascript/dashboard/assets/scss/views/settings/inbox.scss +++ b/app/javascript/dashboard/assets/scss/views/settings/inbox.scss @@ -212,7 +212,7 @@ .code { max-height: $space-mega; - overflow: scroll; + overflow: auto; white-space: nowrap; @include padding($space-one); background: $color-background; diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss index 777d69cda..a97d47479 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss @@ -169,7 +169,7 @@ // Firefox flexbox fix height: 100%; margin-bottom: $space-small; - overflow-y: scroll; + overflow-y: auto; >li { @include flex; diff --git a/app/javascript/dashboard/assets/scss/widgets/_emojiinput.scss b/app/javascript/dashboard/assets/scss/widgets/_emojiinput.scss index 8fd11ec4d..7a4e2f2ec 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_emojiinput.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_emojiinput.scss @@ -23,7 +23,7 @@ @include padding($space-small); box-sizing: border-box; height: 180px; - overflow-y: scroll; + overflow-y: auto; .emoji { border-radius: 4px; diff --git a/app/javascript/dashboard/assets/scss/widgets/_login.scss b/app/javascript/dashboard/assets/scss/widgets/_login.scss index 608823d39..8720c6b57 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_login.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_login.scss @@ -5,7 +5,7 @@ // Outside login wrapper .login { @include full-height; - overflow-y: scroll; + overflow-y: auto; padding-top: $space-larger * 1.2; .login__hero { diff --git a/app/javascript/dashboard/assets/scss/widgets/_modal.scss b/app/javascript/dashboard/assets/scss/widgets/_modal.scss index 5a2cc7b3d..641400b1e 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_modal.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_modal.scss @@ -40,7 +40,7 @@ background-color: $color-white; border-radius: $space-small; max-height: 100%; - overflow: scroll; + overflow: auto; position: relative; width: 60rem; diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss index 11350ceaf..15dde2966 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss @@ -24,7 +24,7 @@ left: 0; max-height: 14rem; - overflow: scroll; + overflow: auto; position: absolute; width: 24rem; z-index: 100;