From 7bf26a109437f5f519f9d3405e5325cf777e6ea2 Mon Sep 17 00:00:00 2001 From: Rin Date: Thu, 8 Dec 2022 16:31:42 +1100 Subject: [PATCH 1/4] fix missing link style in admin.scss - actually this time --- .../flavours/glitch/styles/admin.scss | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 4ae2c9650e..3b542bb4b6 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -10,17 +10,6 @@ $content-width: 840px; width: 100%; min-height: 100vh; - - a { - color: $highlight-text-color; - - &:hover, - &:active, - &:focus { - text-decoration: none; - } - } - .sidebar-wrapper { min-height: 100vh; overflow: hidden; @@ -1692,6 +1681,16 @@ a.sparkline { box-sizing: border-box; min-height: 100%; + a { + color: $highlight-text-color; + + &:hover, + &:active, + &:focus { + text-decoration: none; + } + } + p { margin-bottom: 20px; unicode-bidi: plaintext; -- 2.41.0 From 06a2259577501f20a5afc5626fc66220c384743c Mon Sep 17 00:00:00 2001 From: Rin Date: Thu, 8 Dec 2022 16:58:48 +1100 Subject: [PATCH 2/4] fix default masto style too --- app/javascript/styles/mastodon/admin.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 2372573d54..d0b441f5a8 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1681,6 +1681,16 @@ a.sparkline { box-sizing: border-box; min-height: 100%; + a { + color: $highlight-text-color; + + &:hover, + &:active, + &:focus { + text-decoration: none; + } + } + p { margin-bottom: 20px; unicode-bidi: plaintext; -- 2.41.0 From 0cd76aa22a0fabeeedb056e6d6a7b27e18753ec8 Mon Sep 17 00:00:00 2001 From: Rin Date: Thu, 8 Dec 2022 18:24:41 +1100 Subject: [PATCH 3/4] make default masto style consistent --- app/javascript/styles/mastodon/admin.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index d0b441f5a8..3de70c969d 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -1683,11 +1683,10 @@ a.sparkline { a { color: $highlight-text-color; + text-decoration: none; - &:hover, - &:active, - &:focus { - text-decoration: none; + &:hover { + text-decoration: underline; } } -- 2.41.0 From aa24b2d07261a3c6c4194d677b83fe951831f566 Mon Sep 17 00:00:00 2001 From: Rin Date: Thu, 8 Dec 2022 18:26:32 +1100 Subject: [PATCH 4/4] make glitch style consistent --- app/javascript/flavours/glitch/styles/admin.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss index 3b542bb4b6..7d5b28a12c 100644 --- a/app/javascript/flavours/glitch/styles/admin.scss +++ b/app/javascript/flavours/glitch/styles/admin.scss @@ -1683,11 +1683,10 @@ a.sparkline { a { color: $highlight-text-color; + text-decoration: none; - &:hover, - &:active, - &:focus { - text-decoration: none; + &:hover { + text-decoration: underline; } } -- 2.41.0