diff options
author | Reverite <github@reverite.sh> | 2019-05-11 18:06:12 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-05-11 18:06:12 -0700 |
commit | cdb159f27e2aeb2cf3bb184ac20b7056b013f714 (patch) | |
tree | 01a185cccbaedb031eaf592706349907dc6decd4 /app/javascript/styles | |
parent | b403052b6759c8a87fc8e20304c0c31c05412313 (diff) | |
parent | f6838a28f64a2e1a955d7062d8b4270312df802f (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/contrast/diff.scss | 8 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 40 | ||||
-rw-r--r-- | app/javascript/styles/mastodon/polls.scss | 17 |
3 files changed, 57 insertions, 8 deletions
diff --git a/app/javascript/styles/contrast/diff.scss b/app/javascript/styles/contrast/diff.scss index 8429103b8..f78e60597 100644 --- a/app/javascript/styles/contrast/diff.scss +++ b/app/javascript/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/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 1ba6fa5b1..f8f64bdd6 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -268,9 +268,34 @@ padding: 10px; padding-top: 0; - .icon-button { - font-size: 14px; - font-weight: 500; + font-size: 14px; + font-weight: 500; + + &.active { + color: $highlight-text-color; + } + + input[type=checkbox] { + display: none; + } + + .checkbox { + display: inline-block; + position: relative; + border: 1px solid $ui-primary-color; + box-sizing: border-box; + width: 18px; + height: 18px; + flex: 0 0 auto; + margin-right: 10px; + top: -1px; + border-radius: 4px; + vertical-align: middle; + + &.active { + border-color: $highlight-text-color; + background: $highlight-text-color; + } } } @@ -319,6 +344,7 @@ } .autosuggest-textarea, + .autosuggest-input, .spoiler-input { position: relative; } @@ -4829,6 +4855,14 @@ a.status-card.compact:hover { border-radius: 4px; overflow: hidden; margin: 2px; + + &__icons { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + font-size: 24px; + } } .notification__filter-bar, diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss index d8bc5473a..0d55afda4 100644 --- a/app/javascript/styles/mastodon/polls.scss +++ b/app/javascript/styles/mastodon/polls.scss @@ -37,11 +37,14 @@ display: none; } + .autossugest-input { + flex: 1 1 auto; + } + input[type=text] { display: block; box-sizing: border-box; - flex: 1 1 auto; - width: 20px; + width: 100%; font-size: 14px; color: $inverted-text-color; display: block; @@ -64,6 +67,7 @@ &.editable { display: flex; align-items: center; + overflow: visible; } } @@ -114,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 { |