diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss index cd1b04d284..c2bb1c320f 100644 --- a/app/javascript/flavours/glitch/styles/components.scss +++ b/app/javascript/flavours/glitch/styles/components.scss @@ -2961,6 +2961,11 @@ $ui-header-logo-wordmark-width: 99px; &.privacy-policy { border-top: 1px solid var(--background-border-color); border-radius: 4px; + + @media screen and (max-width: $no-gap-breakpoint) { + border-top: 0; + border-bottom: 0; + } } } } @@ -4726,6 +4731,11 @@ a.status-card { .column-header__collapsible-inner { border: 1px solid var(--background-border-color); border-top: 0; + + @media screen and (max-width: $no-gap-breakpoint) { + border-left: 0; + border-right: 0; + } } .column-header__setting-btn { @@ -8207,6 +8217,11 @@ noscript { width: 100%; } } + + @media screen and (max-width: $no-gap-breakpoint) { + border-left: 0; + border-right: 0; + } } .drawer__backdrop { diff --git a/app/javascript/flavours/glitch/styles/emoji_picker.scss b/app/javascript/flavours/glitch/styles/emoji_picker.scss index 3652ad4abb..68e016d44b 100644 --- a/app/javascript/flavours/glitch/styles/emoji_picker.scss +++ b/app/javascript/flavours/glitch/styles/emoji_picker.scss @@ -83,11 +83,6 @@ max-height: 35vh; padding: 0 6px 6px; will-change: transform; - - &::-webkit-scrollbar-track:hover, - &::-webkit-scrollbar-track:active { - background-color: rgba($base-overlay-background, 0.3); - } } .emoji-mart-search { diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index 73ec36c1b6..2115629068 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -214,12 +214,6 @@ html { border-top-color: lighten($ui-base-color, 8%); } -.column-header__collapsible-inner { - background: darken($ui-base-color, 4%); - border: 1px solid var(--background-border-color); - border-bottom: 0; -} - .column-settings__hashtags .column-select__option { color: $white; } diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss index 9f571b3f26..9d4fd60945 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/variables.scss @@ -21,7 +21,7 @@ $valid-value-color: $success-green !default; $ui-base-color: $classic-secondary-color !default; $ui-base-lighter-color: #b0c0cf; -$ui-primary-color: #9bcbed; +$ui-primary-color: $classic-primary-color !default; $ui-secondary-color: $classic-base-color !default; $ui-highlight-color: $classic-highlight-color !default; diff --git a/app/javascript/flavours/glitch/styles/reset.scss b/app/javascript/flavours/glitch/styles/reset.scss index f54ed5bc79..903b6c804f 100644 --- a/app/javascript/flavours/glitch/styles/reset.scss +++ b/app/javascript/flavours/glitch/styles/reset.scss @@ -56,40 +56,3 @@ table { html { scrollbar-color: lighten($ui-base-color, 4%) rgba($base-overlay-background, 0.1); } - -::-webkit-scrollbar { - width: 12px; - height: 12px; -} - -::-webkit-scrollbar-thumb { - background: lighten($ui-base-color, 4%); - border: 0px none $base-border-color; - border-radius: 50px; -} - -::-webkit-scrollbar-thumb:hover { - background: lighten($ui-base-color, 6%); -} - -::-webkit-scrollbar-thumb:active { - background: lighten($ui-base-color, 4%); -} - -::-webkit-scrollbar-track { - border: 0px none $base-border-color; - border-radius: 0; - background: rgba($base-overlay-background, 0.1); -} - -::-webkit-scrollbar-track:hover { - background: $ui-base-color; -} - -::-webkit-scrollbar-track:active { - background: $ui-base-color; -} - -::-webkit-scrollbar-corner { - background: transparent; -}