From e07f2efc9fd8e34f94e394503f962a717e108a79 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 22 Feb 2022 06:20:04 +0100 Subject: [Glitch] Fix wrong styles on strike page Port SCSS changes from 83388269631f377e9853858916aa8c3897f90bb4 Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/admin.scss | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'app/javascript/flavours/glitch') diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 33e115c1a..32500410f 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -1513,6 +1513,25 @@ a.sparkline { &:last-child { margin-bottom: 0; } + + strong { + font-weight: 700; + } + } + + &__rules { + list-style: disc; + padding-left: 15px; + margin-bottom: 20px; + color: $darker-text-color; + + &:last-child { + margin-bottom: 0; + } + + &__text { + color: $primary-text-color; + } } &__statuses-list { -- cgit From 5169a9f9d9a1c4532c49c36aeeb9021f443c5565 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 22 Feb 2022 15:27:25 +0100 Subject: [Glitch] Fix link colors in report and strike details Port SCSS changes from 51e67f3243d5709361bde722f341b8a5e74d63ca to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/styles/admin.scss | 47 ++++++++++++------------ 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'app/javascript/flavours/glitch') diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 32500410f..a1b99636c 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -661,18 +661,6 @@ body, text-decoration: underline; } } - - &--inactive { - .log-entry__title { - text-decoration: line-through; - } - - a, - .username, - .target { - color: $darker-text-color; - } - } } a.name-tag, @@ -1208,17 +1196,6 @@ a.sparkline { font-weight: 600; padding: 4px 0; } - - a { - color: $ui-highlight-color; - text-decoration: none; - - &:hover, - &:focus, - &:active { - text-decoration: underline; - } - } } &--horizontal { @@ -1306,6 +1283,30 @@ a.sparkline { background: linear-gradient(to left, $ui-base-color, transparent); pointer-events: none; } + + a { + color: $secondary-text-color; + text-decoration: none; + unicode-bidi: isolate; + + &:hover { + text-decoration: underline; + + .fa { + color: lighten($dark-text-color, 7%); + } + } + + &.mention { + &:hover { + text-decoration: none; + + span { + text-decoration: underline; + } + } + } + } } &__actions { -- cgit