Compare commits

...

4 Commits

Author SHA1 Message Date
ida schmidt beae58ed02 fix pure black theme 2023-11-15 19:25:19 -07:00
ida schmidt 692635600f fix nzws theme 2023-11-15 19:19:26 -07:00
ida schmidt 607d0cc3e1 fix radtown themes 2023-11-15 19:15:41 -07:00
ida schmidt 8c59741624 Revert "Change header backgrounds to use fewer different colors in web UI (#25577)"
This reverts commit 7b024baf50.
2023-11-15 18:42:27 -07:00
7 changed files with 130 additions and 26 deletions

View File

@ -1,12 +1,26 @@
// Dependent colors // Dependent colors
$black: #000000; $black: #000000;
$white: #ffffff; $white: #ffffff;
$blurple-500: #4b85ac;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #dadada; $classic-base-color: #dadada;
$classic-primary-color: #303030; $classic-primary-color: #303030;
$classic-secondary-color: #222222; $classic-secondary-color: #222222;
$classic-highlight-color: #cc7dcc; $classic-highlight-color: #cc7dcc;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Differences // Differences
$success-green: #3c754d; $success-green: #3c754d;
@ -26,4 +40,4 @@ $action-button-color: #74b8c4;
$inverted-text-color: #597264 !default; $inverted-text-color: #597264 !default;
$lighter-text-color: #594461 !default; $lighter-text-color: #594461 !default;
$light-text-color: #444b5d; $light-text-color: #444b5d;

View File

@ -1,12 +1,26 @@
// Dependent colors // Dependent colors
$black: #000000; $black: #000000;
$white: #ffffff; $white: #ffffff;
$blurple-500: #fa3636;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #a6bbb5; $classic-base-color: #a6bbb5;
$classic-primary-color: #293236; $classic-primary-color: #293236;
$classic-secondary-color: #012429; $classic-secondary-color: #012429;
$classic-highlight-color: #e24b4b; $classic-highlight-color: #e24b4b;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Differences // Differences
$success-green: #509b95; $success-green: #509b95;
@ -26,4 +40,4 @@ $action-button-color: #71a3cc;
$inverted-text-color: $black !default; $inverted-text-color: $black !default;
$lighter-text-color: $classic-base-color !default; $lighter-text-color: $classic-base-color !default;
$light-text-color: #c5e7e7; $light-text-color: #c5e7e7;

View File

@ -1,12 +1,26 @@
// Dependent colors // Dependent colors
$black: #000000; $black: #000000;
$white: #ffffff; $white: #ffffff;
$blurple-500: #f09f5d;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #dadada; $classic-base-color: #dadada;
$classic-primary-color: #303030; $classic-primary-color: #303030;
$classic-secondary-color: #222222; $classic-secondary-color: #222222;
$classic-highlight-color: #cc7dcc; $classic-highlight-color: #cc7dcc;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Differences // Differences
$success-green: #3c754d; $success-green: #3c754d;
@ -26,4 +40,4 @@ $action-button-color: $ui-primary-color;
$inverted-text-color: #597264 !default; $inverted-text-color: #597264 !default;
$lighter-text-color: #594461 !default; $lighter-text-color: #594461 !default;
$light-text-color: #444b5d; $light-text-color: #444b5d;

View File

@ -1,5 +1,10 @@
// Dependent colors // Dependent colors
$black: #000000; $black: #000000;
$white: #ffffff;
$blurple-500: #aaaaaa;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #000000; $classic-base-color: #000000;
$classic-primary-color: #888888; $classic-primary-color: #888888;
@ -10,6 +15,16 @@ $ui-base-color: $classic-base-color !default;
$ui-primary-color: $classic-primary-color !default; $ui-primary-color: $classic-primary-color !default;
$ui-secondary-color: $classic-secondary-color !default; $ui-secondary-color: $classic-secondary-color !default;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Differences // Differences
$gold-star: #aaaaaa; $gold-star: #aaaaaa;
$ui-highlight-color: #aaaaaa; $ui-highlight-color: #aaaaaa;

View File

@ -3104,7 +3104,7 @@ $ui-header-height: 55px;
.column-back-button { .column-back-button {
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
background: $ui-base-color; background: lighten($ui-base-color, 4%);
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
color: $highlight-text-color; color: $highlight-text-color;
cursor: pointer; cursor: pointer;
@ -3112,7 +3112,6 @@ $ui-header-height: 55px;
font-size: 16px; font-size: 16px;
line-height: inherit; line-height: inherit;
border: 0; border: 0;
border-bottom: 1px solid lighten($ui-base-color, 8%);
text-align: unset; text-align: unset;
padding: 15px; padding: 15px;
margin: 0; margin: 0;
@ -3125,7 +3124,7 @@ $ui-header-height: 55px;
} }
.column-header__back-button { .column-header__back-button {
background: $ui-base-color; background: lighten($ui-base-color, 4%);
border: 0; border: 0;
font-family: inherit; font-family: inherit;
color: $highlight-text-color; color: $highlight-text-color;
@ -3160,7 +3159,7 @@ $ui-header-height: 55px;
padding: 15px; padding: 15px;
position: absolute; position: absolute;
inset-inline-end: 0; inset-inline-end: 0;
top: -50px; top: -48px;
} }
.react-toggle { .react-toggle {
@ -3903,8 +3902,7 @@ a.status-card {
.column-header { .column-header {
display: flex; display: flex;
font-size: 16px; font-size: 16px;
background: $ui-base-color; background: lighten($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
flex: 0 0 auto; flex: 0 0 auto;
cursor: pointer; cursor: pointer;
@ -3962,7 +3960,7 @@ a.status-card {
} }
.column-header__button { .column-header__button {
background: $ui-base-color; background: lighten($ui-base-color, 4%);
border: 0; border: 0;
color: $darker-text-color; color: $darker-text-color;
cursor: pointer; cursor: pointer;
@ -3974,7 +3972,7 @@ a.status-card {
} }
&:hover { &:hover {
color: lighten($darker-text-color, 4%); color: lighten($darker-text-color, 7%);
} }
&:focus-visible { &:focus-visible {
@ -3983,10 +3981,11 @@ a.status-card {
&.active { &.active {
color: $primary-text-color; color: $primary-text-color;
background: lighten($ui-base-color, 4%); background: lighten($ui-base-color, 8%);
&:hover { &:hover {
color: $primary-text-color; color: $primary-text-color;
background: lighten($ui-base-color, 8%);
} }
} }
@ -4000,7 +3999,6 @@ a.status-card {
max-height: 70vh; max-height: 70vh;
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
border-bottom: 1px solid lighten($ui-base-color, 8%);
color: $darker-text-color; color: $darker-text-color;
transition: transition:
max-height 150ms ease-in-out, max-height 150ms ease-in-out,
@ -4022,13 +4020,13 @@ a.status-card {
height: 0; height: 0;
background: transparent; background: transparent;
border: 0; border: 0;
border-top: 1px solid lighten($ui-base-color, 8%); border-top: 1px solid lighten($ui-base-color, 12%);
margin: 10px 0; margin: 10px 0;
} }
} }
.column-header__collapsible-inner { .column-header__collapsible-inner {
background: $ui-base-color; background: lighten($ui-base-color, 8%);
padding: 15px; padding: 15px;
} }
@ -4448,13 +4446,17 @@ a.status-card {
color: $white; color: $white;
margin-bottom: 4px; margin-bottom: 4px;
display: block; display: block;
background-color: rgba($black, 0.45); background-color: $base-overlay-background;
backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
font-size: 11px;
text-transform: uppercase; text-transform: uppercase;
font-weight: 700; font-size: 11px;
padding: 2px 6px; font-weight: 500;
padding: 4px;
border-radius: 4px; border-radius: 4px;
opacity: 0.7;
&:hover {
opacity: 1;
}
} }
.setting-toggle { .setting-toggle {
@ -4514,7 +4516,6 @@ a.status-card {
.follow_requests-unlocked_explanation { .follow_requests-unlocked_explanation {
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
contain: initial; contain: initial;
flex-grow: 0; flex-grow: 0;
} }
@ -6218,7 +6219,6 @@ a.status-card {
display: block; display: block;
color: $white; color: $white;
background: rgba($black, 0.65); background: rgba($black, 0.65);
backdrop-filter: blur(10px) saturate(180%) contrast(75%) brightness(70%);
padding: 2px 6px; padding: 2px 6px;
border-radius: 4px; border-radius: 4px;
font-size: 11px; font-size: 11px;
@ -6879,6 +6879,24 @@ a.status-card {
} }
} }
} }
&.directory__section-headline {
background: darken($ui-base-color, 2%);
border-bottom-color: transparent;
a,
button {
&.active {
&::before {
display: none;
}
&::after {
border-color: transparent transparent darken($ui-base-color, 7%);
}
}
}
}
} }
.filter-form { .filter-form {
@ -7397,6 +7415,7 @@ noscript {
.account__header { .account__header {
overflow: hidden; overflow: hidden;
background: lighten($ui-base-color, 4%);
&.inactive { &.inactive {
opacity: 0.5; opacity: 0.5;
@ -7418,7 +7437,6 @@ noscript {
height: 145px; height: 145px;
position: relative; position: relative;
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
border-bottom: 1px solid lighten($ui-base-color, 8%);
img { img {
object-fit: cover; object-fit: cover;
@ -7432,7 +7450,7 @@ noscript {
&__bar { &__bar {
position: relative; position: relative;
padding: 0 20px; padding: 0 20px;
border-bottom: 1px solid lighten($ui-base-color, 8%); border-bottom: 1px solid lighten($ui-base-color, 12%);
.avatar { .avatar {
display: block; display: block;
@ -7441,7 +7459,7 @@ noscript {
.account__avatar { .account__avatar {
background: darken($ui-base-color, 8%); background: darken($ui-base-color, 8%);
border: 2px solid $ui-base-color; border: 2px solid lighten($ui-base-color, 4%);
} }
} }
} }

View File

@ -4,6 +4,10 @@ $success-green: #79bd9a !default; // Padua
$error-red: #df405a !default; // Cerise $error-red: #df405a !default; // Cerise
$warning-red: #ff5050 !default; // Sunset Orange $warning-red: #ff5050 !default; // Sunset Orange
$gold-star: #ca8f04 !default; // Dark Goldenrod $gold-star: #ca8f04 !default; // Dark Goldenrod
$blurple-500: #f5584c;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #332624; $classic-base-color: #332624;
$classic-primary-color: #F7B2AD; $classic-primary-color: #F7B2AD;
@ -25,6 +29,17 @@ $ui-primary-color: $classic-primary-color !default; // Lighter
$ui-secondary-color: $classic-secondary-color !default; // Lightest $ui-secondary-color: $classic-secondary-color !default; // Lightest
$ui-highlight-color: $classic-highlight-color !default; $ui-highlight-color: $classic-highlight-color !default;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Variables for texts // Variables for texts
$primary-text-color: $white !default; $primary-text-color: $white !default;
$darker-text-color: $ui-primary-color !default; $darker-text-color: $ui-primary-color !default;

View File

@ -1,12 +1,26 @@
// Dependent colors // Dependent colors
$black: #000000; $black: #000000;
$white: #ffffff; $white: #ffffff;
$blurple-500: #ff2e62;
$blurple-600: darken($blurple-500, 8%);
$blurple-400: lighten($blurple-500, 8%);
$blurple-300: lighten($blurple-500, 12%);
$classic-base-color: #a6abbb; $classic-base-color: #a6abbb;
$classic-primary-color: #f372e2; $classic-primary-color: #f372e2;
$classic-secondary-color: #011929; $classic-secondary-color: #011929;
$classic-highlight-color: #e342f8; $classic-highlight-color: #e342f8;
$ui-button-background-color: $blurple-500 !default;
$ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-tertiary-color: $blurple-300 !default;
$ui-button-tertiary-border-color: $blurple-300 !default;
$ui-button-tertiary-focus-background-color: $blurple-600 !default;
$ui-button-tertiary-focus-color: $white !default;
// Differences // Differences
$success-green: #3c754d; $success-green: #3c754d;
@ -26,4 +40,4 @@ $action-button-color: #bd9ac4;
$inverted-text-color: $black !default; $inverted-text-color: $black !default;
$lighter-text-color: $classic-base-color !default; $lighter-text-color: $classic-base-color !default;
$light-text-color: #444b5d; $light-text-color: #444b5d;