diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-24 19:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-24 19:17:11 +0000 |
| commit | 0e10667fbe8b565b05dd2f34c3ee14bed7f36967 (patch) | |
| tree | 272ee0087b95e4f2dfeb08243bbeb60cc5d8a651 /app/javascript/styles | |
| parent | 1b4d79acf8a0667b15a6835479d2cae0c2de5612 (diff) | |
| parent | a3c0a2037314f105e807f9ede4210066a1524229 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript/styles')
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 3eb941a23..b023b208d 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -2393,7 +2393,6 @@ .column-header { display: flex; - padding: 15px; font-size: 16px; background: lighten($ui-base-color, 4%); flex: 0 0 auto; @@ -2408,7 +2407,7 @@ flex: auto; margin: 0; border: none; - padding: 0; + padding: 15px; color: inherit; background: transparent; font: inherit; @@ -2433,7 +2432,6 @@ .column-header__buttons { height: 48px; display: flex; - margin: -15px; margin-left: 0; } |