diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-22 19:53:36 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-22 19:53:36 +0100 |
commit | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (patch) | |
tree | 6f5f64b7e4e49f652712236b923d5da8c6455176 /app/javascript/flavours | |
parent | e0d94323bc8f6c5d249452e2baf1f103c15546b8 (diff) | |
parent | 5169a9f9d9a1c4532c49c36aeeb9021f443c5565 (diff) |
Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours')
-rw-r--r-- | app/javascript/flavours/glitch/styles/admin.scss | 66 |
1 files changed, 43 insertions, 23 deletions
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 33e115c1a..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 { @@ -1513,6 +1514,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 { |