diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2018-04-26 11:34:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:34:14 -0400 |
| commit | f4ed38272be7cce814e3d3e7e5a2d1f352279e19 (patch) | |
| tree | 4e26499478b18d2338be90f21428f1bd76481b89 /app/javascript/flavours/glitch/styles | |
| parent | 8f12afb5996c58ddf41ceaa20f6c4e036273d3a6 (diff) | |
| parent | b383c0688a0939d25b9184e61dac72cda71f6926 (diff) | |
Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread
Port the “unfold thread” feature from Mastodon's UI to glitch-soc flavour
Diffstat (limited to 'app/javascript/flavours/glitch/styles')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/columns.scss | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss index 5dcfab4d1..34175685e 100644 --- a/app/javascript/flavours/glitch/styles/components/columns.scss +++ b/app/javascript/flavours/glitch/styles/components/columns.scss @@ -243,7 +243,6 @@ .column-header { display: flex; font-size: 16px; - padding: 15px; background: lighten($ui-base-color, 4%); flex: 0 0 auto; cursor: pointer; @@ -255,7 +254,7 @@ & > button { margin: 0; border: none; - padding: 15px 0 15px 15px; + padding: 15px; color: inherit; background: transparent; font: inherit; @@ -266,6 +265,10 @@ flex: 1; } + & > .column-header__back-button { + color: $ui-highlight-color; + } + &.active { box-shadow: 0 1px 0 rgba($ui-highlight-color, 0.3); @@ -303,7 +306,6 @@ .column-header__buttons { height: 48px; display: flex; - margin: -15px; margin-left: 0; } |