diff options
author | ThibG <thib@sitedethib.com> | 2019-05-11 12:35:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-11 12:35:25 +0200 |
commit | fe00f7a7e4469d18b43be2159fa9d953d2050f46 (patch) | |
tree | f2af743c222ad8d9dc81299195d01a3fe6b54e02 /app/javascript/flavours/glitch/styles | |
parent | d4d4e84324701243ce05930f45b2dc876e38c7d0 (diff) | |
parent | 14d855c42985503b525f1a77d00fada3bd15b96f (diff) |
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
-rw-r--r-- | app/javascript/flavours/glitch/styles/contrast/diff.scss | 8 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/polls.scss | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/contrast/diff.scss b/app/javascript/flavours/glitch/styles/contrast/diff.scss index 8429103b8..f78e60597 100644 --- a/app/javascript/flavours/glitch/styles/contrast/diff.scss +++ b/app/javascript/flavours/glitch/styles/contrast/diff.scss @@ -67,3 +67,11 @@ text-decoration: none; } } + +.nothing-here { + color: $darker-text-color; +} + +.public-layout .public-account-header__tabs__tabs .counter.active::after { + border-bottom: 4px solid $ui-highlight-color; +} diff --git a/app/javascript/flavours/glitch/styles/polls.scss b/app/javascript/flavours/glitch/styles/polls.scss index 315fd5782..50bb45e7c 100644 --- a/app/javascript/flavours/glitch/styles/polls.scss +++ b/app/javascript/flavours/glitch/styles/polls.scss @@ -118,11 +118,14 @@ text-decoration: underline; font-size: inherit; - &:hover, - &:focus, - &:active { + &:hover { text-decoration: none; } + + &:active, + &:focus { + background-color: rgba($dark-text-color, .1); + } } .button { |