diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-21 21:28:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-21 21:28:13 +0100 |
| commit | 368d6fe54f94ad2ecd2a1c1e7e5a2359dc37ad30 (patch) | |
| tree | 716c7c9a4e7f5717e982de3c67a462aa75d3aae4 /app/javascript/flavours/glitch | |
| parent | c4a5e0ca0e89b2f8abd69ed9b8a4da3f82d0ccaf (diff) | |
| parent | 3c76f1f6c2a95e80a02419b83478b89714a9d430 (diff) | |
Merge pull request #2092 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/mastodon-light/diff.scss | 8 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/polls.scss | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index 2ec2da833..c23a05c51 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -12,6 +12,14 @@ html { &.button-alternative-2 { color: $white; } + + &.button-tertiary { + color: $highlight-text-color; + } +} + +.simple_form .button.button-tertiary { + color: $highlight-text-color; } .status-card__actions button, diff --git a/app/javascript/flavours/glitch/styles/polls.scss b/app/javascript/flavours/glitch/styles/polls.scss index 43924829d..407d71888 100644 --- a/app/javascript/flavours/glitch/styles/polls.scss +++ b/app/javascript/flavours/glitch/styles/polls.scss @@ -117,7 +117,7 @@ width: 18px; height: 18px; flex: 0 0 auto; - margin-right: 10px; + margin-inline-end: 10px; top: -1px; border-radius: 50%; vertical-align: middle; @@ -212,7 +212,7 @@ .button { height: 36px; padding: 0 16px; - margin-right: 10px; + margin-inline-end: 10px; font-size: 14px; } } @@ -250,7 +250,7 @@ line-height: inherit; color: $action-button-color; border-color: $action-button-color; - margin-right: 5px; + margin-inline-end: 5px; } li { @@ -260,7 +260,7 @@ .poll__option { flex: 0 0 auto; width: calc(100% - (23px + 6px)); - margin-right: 6px; + margin-inline-end: 6px; } } |