From 80809ef33efcb80e18ff2193eb6ec30b3bb0fdf7 Mon Sep 17 00:00:00 2001
From: Trevor Wolf <teeerevor@gmail.com>
Date: Mon, 24 Jul 2023 21:48:09 +1000
Subject: [PATCH] change poll form element colors to fit with the rest of the
ui (#26139)
---
app/javascript/styles/mastodon/basics.scss | 4 ++++
app/javascript/styles/mastodon/polls.scss | 17 ++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 234c703f23..a77f8425dd 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -175,6 +175,10 @@ a {
button {
font-family: inherit;
cursor: pointer;
+
+ &:focus:not(:focus-visible) {
+ outline: none;
+ }
}
.app-holder {
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index bdb87d7cfa..bcc8cfaaec 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -105,7 +105,7 @@
&__input {
display: inline-block;
position: relative;
- border: 1px solid $ui-primary-color;
+ border: 1px solid $ui-button-background-color;
box-sizing: border-box;
width: 18px;
height: 18px;
@@ -121,15 +121,10 @@
border-radius: 4px;
}
- &.active {
- border-color: $valid-value-color;
- background: $valid-value-color;
- }
-
&:active,
&:focus,
&:hover {
- border-color: lighten($valid-value-color, 15%);
+ border-color: $ui-button-focus-background-color;
border-width: 4px;
}
@@ -241,6 +236,14 @@
color: $action-button-color;
border-color: $action-button-color;
margin-inline-end: 5px;
+
+ &:hover,
+ &:focus,
+ &.active {
+ border-color: $action-button-color;
+ background-color: $action-button-color;
+ color: $ui-button-color;
+ }
}
li {