mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 00:54:49 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian Mock 2017-04-09 05:45:26 -07:00 committed by Eugen
parent 388ec0d5b6
commit 53eb31f124
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/assets/stylesheets/components.scss
View File

@ -714,7 +714,15 @@ a.status__content__spoiler-link {
@media screen and (min-width: 360px) { @media screen and (min-width: 360px) {
.columns-area { .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 { .column, .drawer {
margin: 10px;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
flex: 0 0 auto; flex: 0 0 auto;
@ -823,11 +832,11 @@ a.status__content__spoiler-link {
} }
.column:first-child, .drawer:first-child { .column:first-child, .drawer:first-child {
margin-left: 0; margin-left: 10px;
} }
.column:last-child, .drawer:last-child { .column:last-child, .drawer:last-child {
margin-right: 0; margin-right: 10px;
} }
@media screen and (max-width: 1024px) { @media screen and (max-width: 1024px) {
@ -885,6 +894,10 @@ a.status__content__spoiler-link {
} }
@media screen and (min-width: 360px) { @media screen and (min-width: 360px) {
.columns-area {
margin: 10px;
}
.tabs-bar { .tabs-bar {
margin: 10px; margin: 10px;
margin-bottom: 0; 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) { @media screen and (min-width: 600px) {
.tabs-bar__link { .tabs-bar__link {
.fa { .fa {