logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 53eb31f124b8cb366f45ac0aec36e346115e334f
parent: 388ec0d5b6d1549abed15802d6bdbfc8b1c05294
Author: Brian Mock <brian@mockbrian.com>
Date:   Sun,  9 Apr 2017 05:45:26 -0700

Fixes #1311 margin shouldn't stay fixed (#1312)


Diffstat:

Mapp/assets/stylesheets/components.scss25++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss @@ -714,7 +714,15 @@ a.status__content__spoiler-link { @media screen and (min-width: 360px) { .columns-area { - margin: 10px; + margin: 0; + } + + .column:first-child, .drawer:first-child { + margin-left: 0; + } + + .column:last-child, .drawer:last-child { + margin-right: 0; } } @@ -816,6 +824,7 @@ a.status__content__spoiler-link { } .column, .drawer { + margin: 10px; margin-left: 5px; margin-right: 5px; flex: 0 0 auto; @@ -823,11 +832,11 @@ a.status__content__spoiler-link { } .column:first-child, .drawer:first-child { - margin-left: 0; + margin-left: 10px; } .column:last-child, .drawer:last-child { - margin-right: 0; + margin-right: 10px; } @media screen and (max-width: 1024px) { @@ -885,6 +894,10 @@ a.status__content__spoiler-link { } @media screen and (min-width: 360px) { + .columns-area { + margin: 10px; + } + .tabs-bar { margin: 10px; margin-bottom: 0; @@ -895,6 +908,12 @@ a.status__content__spoiler-link { } } +@media screen and (min-width: 1024px) { + .columns-area { + margin: 0; + } +} + @media screen and (min-width: 600px) { .tabs-bar__link { .fa {