diff --git a/app/javascript/flavours/glitch/styles/_mixins.scss b/app/javascript/flavours/glitch/styles/_mixins.scss index 444d2e0160..f139bef21b 100644 --- a/app/javascript/flavours/glitch/styles/_mixins.scss +++ b/app/javascript/flavours/glitch/styles/_mixins.scss @@ -17,7 +17,7 @@ background: $ui-base-color; color: $darker-text-color; border-radius: 4px; - border: 1px solid lighten($ui-base-color, 8%); + border: 1px solid var(--background-border-color); font-size: 17px; line-height: normal; margin: 0; diff --git a/app/javascript/flavours/glitch/styles/components.scss b/app/javascript/flavours/glitch/styles/components.scss index b8647cd559..306e25443f 100644 --- a/app/javascript/flavours/glitch/styles/components.scss +++ b/app/javascript/flavours/glitch/styles/components.scss @@ -403,7 +403,7 @@ body > [data-popper-placement] { &__suggestions { box-shadow: var(--dropdown-shadow); background: $ui-base-color; - border: 1px solid lighten($ui-base-color, 14%); + border: 1px solid var(--background-border-color); border-radius: 0 0 4px 4px; color: $secondary-text-color; font-size: 14px; diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss index 4877170275..d206af1f18 100644 --- a/app/javascript/flavours/glitch/styles/forms.scss +++ b/app/javascript/flavours/glitch/styles/forms.scss @@ -442,11 +442,6 @@ code { border-radius: 4px; padding: 10px 16px; - &::placeholder { - color: $dark-text-color; - opacity: 1; - } - &:invalid { box-shadow: none; } @@ -608,8 +603,7 @@ code { inset-inline-end: 3px; top: 1px; padding: 10px; - padding-bottom: 9px; - font-size: 16px; + font-size: 14px; color: $dark-text-color; font-family: inherit; pointer-events: none; @@ -626,11 +620,6 @@ code { inset-inline-end: 0; bottom: 1px; width: 5px; - background-image: linear-gradient( - to right, - rgba(darken($ui-base-color, 10%), 0), - darken($ui-base-color, 10%) - ); } } } diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index e97b40d3f7..73ec36c1b6 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -559,11 +559,11 @@ html { .compose-form .autosuggest-textarea__textarea, .compose-form__highlightable, +.autosuggest-textarea__suggestions, .search__input, .search__popout, .emoji-mart-search input, .language-dropdown__dropdown .emoji-mart-search input, -// .strike-card, .poll__option input[type='text'] { background: darken($ui-base-color, 10%); } diff --git a/app/javascript/flavours/glitch/styles/rtl.scss b/app/javascript/flavours/glitch/styles/rtl.scss index 1091a13238..3f03051ce1 100644 --- a/app/javascript/flavours/glitch/styles/rtl.scss +++ b/app/javascript/flavours/glitch/styles/rtl.scss @@ -90,16 +90,6 @@ body.rtl { direction: rtl; } - .simple_form .label_input__append { - &::after { - background-image: linear-gradient( - to left, - rgba(darken($ui-base-color, 10%), 0), - darken($ui-base-color, 10%) - ); - } - } - .simple_form select { background: $ui-base-color url("data:image/svg+xml;utf8,") diff --git a/app/javascript/flavours/glitch/styles/tables.scss b/app/javascript/flavours/glitch/styles/tables.scss index dd73f6e205..992ad0cbe4 100644 --- a/app/javascript/flavours/glitch/styles/tables.scss +++ b/app/javascript/flavours/glitch/styles/tables.scss @@ -273,8 +273,8 @@ a.table-action-link { } } - &:nth-child(even) { - background: var(--background-color); + &:last-child { + border-radius: 0 0 4px 4px; } &__content { diff --git a/app/javascript/flavours/glitch/styles/widgets.scss b/app/javascript/flavours/glitch/styles/widgets.scss index dd349526ad..ac419b4570 100644 --- a/app/javascript/flavours/glitch/styles/widgets.scss +++ b/app/javascript/flavours/glitch/styles/widgets.scss @@ -211,7 +211,7 @@ display: flex; align-items: center; justify-content: space-between; - border: 1px solid lighten($ui-base-color, 8%); + border: 1px solid var(--background-border-color); border-radius: 4px; padding: 15px; text-decoration: none;