mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Fix various visual sign-up flow issues 

Port ca45f896dd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
pull/2921/head
Eugen Rochko 2024-12-09 09:23:19 +01:00 committed by Claire
parent a8f6ed9776
commit 0bf4d49166
5 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/styles/about.scss
View File

@ -21,7 +21,6 @@ $fluid-breakpoint: $maximum-width + 20px;
.rules-list { .rules-list {
font-size: 15px; font-size: 15px;
line-height: 22px; line-height: 22px;
color: $primary-text-color;
counter-reset: list-counter; counter-reset: list-counter;
li { li {
@ -82,6 +81,10 @@ $fluid-breakpoint: $maximum-width + 20px;
} }
} }
&__text {
color: $primary-text-color;
}
&__hint { &__hint {
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;

10
app/javascript/flavours/glitch/styles/components.scss
View File

@ -108,7 +108,7 @@
&:disabled, &:disabled,
&.disabled { &.disabled {
background-color: $ui-primary-color; background-color: $ui-button-disabled-color;
cursor: not-allowed; cursor: not-allowed;
} }
@ -148,14 +148,14 @@
&:disabled, &:disabled,
&.disabled { &.disabled {
opacity: 0.7; opacity: 0.7;
border-color: $ui-primary-color; border-color: $ui-button-disabled-color;
color: $ui-primary-color; color: $ui-button-disabled-color;
&:active, &:active,
&:focus, &:focus,
&:hover { &:hover {
border-color: $ui-primary-color; border-color: $ui-button-disabled-color;
color: $ui-primary-color; color: $ui-button-disabled-color;
} }
} }
} }

14
app/javascript/flavours/glitch/styles/forms.scss
View File

@ -585,8 +585,9 @@ code {
background-color: $ui-button-focus-background-color; background-color: $ui-button-focus-background-color;
} }
&:disabled,
&:disabled:hover { &:disabled:hover {
background-color: $ui-primary-color; background-color: $ui-button-disabled-color;
} }
&.negative { &.negative {
@ -600,16 +601,6 @@ code {
} }
} }
.button.button-tertiary {
padding: 9px;
&:hover,
&:focus,
&:active {
padding: 10px;
}
}
select { select {
appearance: none; appearance: none;
box-sizing: border-box; box-sizing: border-box;
@ -1174,6 +1165,7 @@ code {
align-items: center; align-items: center;
padding-bottom: 30px; padding-bottom: 30px;
margin-bottom: 30px; margin-bottom: 30px;
color: $white;
li { li {
flex: 0 0 auto; flex: 0 0 auto;

6
app/javascript/flavours/glitch/styles/mastodon-light/diff.scss
View File

@ -3,6 +3,12 @@
.simple_form .button.button-tertiary { .simple_form .button.button-tertiary {
color: $highlight-text-color; color: $highlight-text-color;
&:hover,
&:focus,
&:active {
color: $white;
}
} }
.status-card__actions button, .status-card__actions button,

7
app/javascript/flavours/glitch/styles/variables.scss
View File

@ -1,3 +1,5 @@
@use 'sass:color';
// Commonly used web colors // Commonly used web colors
$black: #000000; // Black $black: #000000; // Black
$white: #ffffff; // White $white: #ffffff; // White
@ -46,6 +48,11 @@ $ui-button-focus-background-color: $blurple-600 !default;
$ui-button-focus-outline-color: $blurple-400 !default; $ui-button-focus-outline-color: $blurple-400 !default;
$ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default; $ui-button-focus-outline: solid 2px $ui-button-focus-outline-color !default;
$ui-button-disabled-color: color.adjust(
$ui-button-background-color,
$alpha: -0.3
) !default;
$ui-button-secondary-color: $blurple-500 !default; $ui-button-secondary-color: $blurple-500 !default;
$ui-button-secondary-border-color: $blurple-500 !default; $ui-button-secondary-border-color: $blurple-500 !default;
$ui-button-secondary-focus-border-color: $blurple-300 !default; $ui-button-secondary-focus-border-color: $blurple-300 !default;