diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-05 18:44:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 18:44:15 +0100 |
| commit | ad17e1944aa4c01c5637199b464c9d78b7e54af2 (patch) | |
| tree | dee9d23334a0d23fbc3737e3c17033727805a141 /app/javascript/styles | |
| parent | 7e9d5bdbb9125197afb5b3df69ce49a79451d697 (diff) | |
| parent | c4649ae9d4ef34cc0bad9d5df0da8e8b6c729522 (diff) | |
Merge pull request #2071 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/admin.scss | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 4 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/polls.scss | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 5e7fedf48..4250cf2b6 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1216,7 +1216,7 @@ a.name-tag, path:first-child { fill: rgba($highlight-text-color, 0.25) !important; - fill-opacity: 100% !important; + fill-opacity: 1 !important; } path:last-child { diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 713144f7d..23c29260b 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -4268,7 +4268,7 @@ a.status-card.compact:hover { } @keyframes heartbeat { - from { + 0% { transform: scale(1); animation-timing-function: ease-out; } @@ -7343,7 +7343,7 @@ noscript { path:first-child { fill: rgba($highlight-text-color, 0.25) !important; - fill-opacity: 100% !important; + fill-opacity: 1 !important; } path:last-child { diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss index f553c5501..6812d5462 100644 --- a/app/javascript/styles/mastodon/polls.scss +++ b/app/javascript/styles/mastodon/polls.scss @@ -279,10 +279,10 @@ color: $dark-text-color; &__chart { - background: rgba(darken($ui-primary-color, 14%), 0.2); + background: rgba(darken($ui-primary-color, 14%), 0.7); &.leading { - background: rgba($ui-highlight-color, 0.2); + background: rgba($ui-highlight-color, 0.5); } } } |