1
0

Copy in new CSS for about page.

This commit is contained in:
David Yip 2018-03-03 11:01:24 -06:00
parent 1b8fcd4df5
commit 6176e278f4
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC

View File

@ -15,76 +15,129 @@ $small-breakpoint: 960px;
} }
} }
.show-xs, .landing-page {
.show-sm { .grid {
display: grid;
grid-gap: 10px;
grid-template-columns: 1fr 2fr;
grid-auto-columns: 25%;
grid-auto-rows: max-content;
.column-0 {
display: none; display: none;
} }
.show-m { .column-1 {
grid-column: 1;
grid-row: 1;
}
.column-2 {
grid-column: 2;
grid-row: 1;
}
.column-3 {
grid-column: 3;
grid-row: 1 / 3;
}
.column-4 {
grid-column: 1 / 3;
grid-row: 2;
}
}
@media screen and (max-width: $small-breakpoint) {
.grid {
grid-template-columns: 40% 60%;
.column-0 {
display: none;
}
.column-1 {
grid-column: 1;
grid-row: 1;
&.non-preview .landing-page__forms {
height: 100%;
}
}
.column-2 {
grid-column: 2;
grid-row: 1 / 3;
&.non-preview {
grid-column: 2;
grid-row: 1;
}
}
.column-3 {
grid-column: 1;
grid-row: 2 / 4;
}
.column-4 {
grid-column: 2;
grid-row: 3;
&.non-preview {
grid-column: 1 / 3;
grid-row: 2;
}
}
}
}
@media screen and (max-width: $column-breakpoint) {
.grid {
grid-template-columns: auto;
.column-0 {
display: block; display: block;
grid-column: 1;
grid-row: 1;
} }
@media screen and (max-width: $small-breakpoint) { .column-1 {
.hide-sm { grid-column: 1;
display: none !important; grid-row: 3;
}
.show-sm { .brand {
display: block !important; display: none;
} }
} }
@media screen and (max-width: $column-breakpoint) { .column-2 {
.hide-xs { grid-column: 1;
display: none !important; grid-row: 2;
.landing-page__logo,
.landing-page__call-to-action {
display: none;
} }
.show-xs { &.non-preview {
display: block !important; grid-column: 1;
grid-row: 2;
} }
} }
.row { .column-3 {
display: flex; grid-column: 1;
flex-wrap: wrap; grid-row: 5;
margin: 0 -5px;
@for $i from 1 through 15 {
.column-#{$i} {
box-sizing: border-box;
min-height: 1px;
flex: 0 0 percentage($i / 15);
max-width: percentage($i / 15);
padding: 0 5px;
@media screen and (max-width: $small-breakpoint) {
&-sm {
box-sizing: border-box;
min-height: 1px;
flex: 0 0 percentage($i / 15);
max-width: percentage($i / 15);
padding: 0 5px;
@media screen and (max-width: $column-breakpoint) {
max-width: 100%;
flex: 0 0 100%;
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
}
}
} }
@media screen and (max-width: $column-breakpoint) { .column-4 {
max-width: 100%; grid-column: 1;
flex: 0 0 100%; grid-row: 4;
margin-bottom: 10px;
&:last-child { &.non-preview {
margin-bottom: 0; grid-column: 1;
} grid-row: 4;
} }
} }
} }
@ -125,7 +178,6 @@ $small-breakpoint: 960px;
} }
} }
.landing-page {
p, p,
li { li {
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: 'mastodon-font-sans-serif', sans-serif;
@ -502,7 +554,7 @@ $small-breakpoint: 960px;
display: block; display: block;
width: 80px; width: 80px;
height: 80px; height: 80px;
border-radius: $ui-avatar-border-size; border-radius: 48px;
} }
} }
@ -539,6 +591,7 @@ $small-breakpoint: 960px;
img { img {
position: static; position: static;
padding: 10px 0;
} }
@media screen and (max-width: $small-breakpoint) { @media screen and (max-width: $small-breakpoint) {
@ -558,18 +611,33 @@ $small-breakpoint: 960px;
} }
&__call-to-action { &__call-to-action {
margin-bottom: 10px;
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
border-radius: 4px; border-radius: 4px;
padding: 25px 40px; padding: 25px 40px;
overflow: hidden; overflow: hidden;
.row { .row {
display: flex;
flex-direction: row-reverse;
flex-wrap: wrap;
justify-content: space-between;
align-items: center; align-items: center;
} }
.row__information-board {
display: flex;
justify-content: flex-end;
align-items: flex-end;
.information-board__section { .information-board__section {
padding: 0; flex: 1 0 auto;
padding: 0 10px;
}
}
.row__mascot {
flex: 1;
margin: 10px -50px 0 0;
} }
} }
@ -619,6 +687,8 @@ $small-breakpoint: 960px;
&__short-description { &__short-description {
.row { .row {
display: flex;
flex-wrap: wrap;
align-items: center; align-items: center;
margin-bottom: 40px; margin-bottom: 40px;
} }
@ -668,7 +738,6 @@ $small-breakpoint: 960px;
height: 100%; height: 100%;
@media screen and (max-width: $small-breakpoint) { @media screen and (max-width: $small-breakpoint) {
margin-bottom: 10px;
height: auto; height: auto;
} }
@ -717,15 +786,16 @@ $small-breakpoint: 960px;
width: 100%; width: 100%;
flex: 1 1 auto; flex: 1 1 auto;
overflow: hidden; overflow: hidden;
height: 100%;
.column-header { .column-header {
color: inherit; color: inherit;
font-family: inherit; font-family: inherit;
font-size: 16px; font-size: 16px;
padding: 15px;
line-height: inherit; line-height: inherit;
font-weight: inherit; font-weight: inherit;
margin: 0; margin: 0;
padding: 0;
} }
.column { .column {
@ -942,26 +1012,20 @@ $small-breakpoint: 960px;
} }
&.tag-page { &.tag-page {
.features { .grid {
padding: 30px 0; @media screen and (min-width: $small-breakpoint) {
grid-template-columns: 33% 67%;
.container-alt {
max-width: 820px;
#mastodon-timeline {
margin-right: 0;
border-top-right-radius: 0;
} }
.about-mastodon { .column-2 {
.about-hashtag { grid-column: 2;
background: darken($ui-base-color, 4%); grid-row: 1;
padding: 0 20px 20px 30px; }
border-radius: 0 5px 5px 0; }
.brand { .brand {
padding-top: 20px; text-align: unset;
margin-bottom: 20px; padding: 0;
img { img {
height: 48px; height: 48px;
@ -969,13 +1033,6 @@ $small-breakpoint: 960px;
} }
} }
p {
strong {
color: $ui-secondary-color;
font-weight: 700;
}
}
.cta { .cta {
margin: 0; margin: 0;
@ -983,53 +1040,27 @@ $small-breakpoint: 960px;
margin-right: 4px; margin-right: 4px;
} }
} }
@media screen and (max-width: $column-breakpoint) {
.grid {
.column-1 {
grid-column: 1;
grid-row: 2;
} }
.features-list { .column-2 {
margin-left: 30px; grid-column: 1;
margin-right: 10px; grid-row: 1;
}
}
} }
} }
@media screen and (max-width: 675px) { .brand {
.features { margin: 0;
padding: 10px 0;
.container-alt {
display: flex;
flex-direction: column;
#mastodon-timeline {
order: 2;
flex: 0 0 auto;
height: 60vh;
margin-bottom: 20px;
border-top-right-radius: 4px;
} }
.about-mastodon { .landing-page__features {
order: 1;
flex: 0 0 auto;
max-width: 100%;
.about-hashtag {
background: unset;
padding: 0;
border-radius: 0;
.cta {
margin: 20px 0;
}
}
.features-list {
display: none; display: none;
} }
} }
} }
} }
}
}
}