aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust styles of landing pages. (#4682)

Browse Source 
* Adjust about.scss

* Delete trailing whitespace.
pull/4698/head
Lynx Kotoura 8 years ago committed by Eugen Rochko
parent 04c3fb2189
commit 18f69fb964
1 changed files with 395 additions and 461 deletions
Show Stats Download Patch File Download Diff File

704
app/javascript/styles/about.scss
Unescape Escape View File

@ -1,73 +1,13 @@
.about-body { .landing-page {
.wrapper {
max-width: 600px;
margin: 0 auto;
color: $ui-primary-color;
padding-top: 50px;
padding-bottom: 50px;
&.thicc {
max-width: 800px;
}
}
h1 {
font: 46px/52px 'mastodon-font-sans-serif', sans-serif;
font-weight: 600;
margin-bottom: 20px;
color: $ui-highlight-color;
padding: 20px 0;
img {
margin-bottom: -5px;
margin-right: 5px;
width: 46px;
height: 46px;
}
}
h2 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 24px;
line-height: 28px;
font-weight: 400;
margin-bottom: 20px;
color: $primary-text-color;
}
h3 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 20px;
line-height: 28px;
font-weight: 400;
margin-bottom: 20px;
color: $ui-secondary-color;
}
ul,
ol {
list-style: inherit;
margin-left: 20px;
&[type='a'] {
list-style-type: lower-alpha;
}
&[type='i'] {
list-style-type: lower-roman;
}
}
li > ol,
li > ul {
margin-top: 20px;
}
p, p,
li { li {
font: 16px/28px 'mastodon-font-sans-serif', sans-serif; font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 16px;
font-weight: 400; font-weight: 400;
font-size: 16px;
line-height: 30px;
margin-bottom: 12px; margin-bottom: 12px;
color: $ui-primary-color;
a { a {
color: $ui-highlight-color; color: $ui-highlight-color;
@ -76,202 +16,116 @@
} }
em { em {
display: inline-block; display: inline;
padding: 7px 7px 5px; margin: 0;
margin: 0 2px; padding: 0;
background: $ui-primary-color; font-weight: 500;
color: $ui-base-color; background: transparent;
font: 16px/16px 'mastodon-font-sans-serif', sans-serif; font-family: inherit;
font-weight: 300; font-size: inherit;
line-height: inherit;
color: lighten($ui-primary-color, 10%);
} }
.screenshot { h1 {
box-shadow: 0 0 15px rgba($base-shadow-color, 0.4); font-family: 'mastodon-font-display', sans-serif;
margin-bottom: 26px; font-size: 26px;
line-height: 30px;
font-weight: 500;
margin-bottom: 20px;
color: $ui-secondary-color;
img { small {
max-width: 100%; font-family: 'mastodon-font-sans-serif', sans-serif;
height: auto;
display: block; display: block;
font-size: 18px;
font-weight: 400;
color: $ui-base-lighter-color;
} }
} }
.actions { h2 {
overflow: hidden; font-family: 'mastodon-font-display', sans-serif;
font-size: 22px;
line-height: 26px;
font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color;
.info {
float: right;
text-align: right;
line-height: 36px;
a {
color: $ui-primary-color;
text-decoration: underline;
}
}
}
@media screen and (max-width: 625px) {
.wrapper {
padding: 20px;
}
}
} }
.information-board { h3 {
background: darken($ui-base-color, 4%);
padding: 20px 0;
.panel {
position: absolute;
width: 280px;
box-sizing: border-box;
background: darken($ui-base-color, 8%);
padding: 20px;
padding-top: 10px;
border-radius: 4px 4px 0 0;
right: 0;
bottom: -40px;
.panel-header {
font-family: 'mastodon-font-display', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-size: 14px; font-size: 18px;
line-height: 24px; line-height: 24px;
font-weight: 500; font-weight: 500;
color: $ui-primary-color; margin-bottom: 20px;
padding-bottom: 5px; color: $ui-secondary-color;
margin-bottom: 15px;
border-bottom: 1px solid lighten($ui-base-color, 4%);
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
a,
span {
font-weight: 400;
color: darken($ui-primary-color, 10%);
}
a {
text-decoration: none;
}
}
}
.container {
position: relative;
padding-right: 280px + 15px;
}
.information-board-sections {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.section {
flex: 1 0 auto;
font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
text-align: right;
padding: 10px 15px;
span,
strong {
display: block;
} }
span { h4 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 16px; font-size: 16px;
line-height: 24px;
&:last-child { font-weight: 500;
margin-bottom: 20px;
color: $ui-secondary-color; color: $ui-secondary-color;
} }
}
strong { h5 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500; font-weight: 500;
font-size: 32px; margin-bottom: 20px;
line-height: 48px; color: $ui-secondary-color;
color: $primary-text-color;
}
}
} }
.owner { h6 {
text-align: center; font-family: 'mastodon-font-display', sans-serif;
font-size: 12px;
.avatar { line-height: 24px;
width: 80px; font-weight: 500;
height: 80px; margin-bottom: 20px;
margin: 0 auto; color: $ui-secondary-color;
margin-bottom: 15px;
img {
display: block;
width: 80px;
height: 80px;
border-radius: 48px;
}
} }
.name { ul,
font-size: 14px; ol {
margin-left: 20px;
a {
display: block;
color: $primary-text-color;
text-decoration: none;
&:hover { &[type='a'] {
.display_name { list-style-type: lower-alpha;
text-decoration: underline;
}
}
} }
.username { &[type='i'] {
display: block; list-style-type: lower-roman;
color: $ui-primary-color;
}
} }
} }
.features-list__row { ul {
display: flex; list-style: disc;
padding: 10px 0;
justify-content: space-between;
&:first-child {
padding-top: 0;
} }
.visual { ol {
flex: 0 0 auto; list-style: decimal;
display: flex;
align-items: center;
margin-left: 15px;
.fa {
display: block;
color: $ui-primary-color;
font-size: 48px;
}
} }
.text { li > ol,
font-size: 16px; li > ul {
line-height: 30px; margin-top: 6px;
color: $ui-primary-color;
h6 {
font-weight: 500;
color: $ui-secondary-color;
} }
hr {
border-color: rgba($ui-base-lighter-color, .6);
} }
.container {
width: 100%;
box-sizing: border-box;
max-width: 800px;
margin: 0 auto;
} }
.landing-page {
.header-wrapper { .header-wrapper {
padding-top: 15px; padding-top: 15px;
background: $ui-base-color; background: $ui-base-color;
@ -284,6 +138,17 @@
.hero .heading { .hero .heading {
padding-bottom: 30px; padding-bottom: 30px;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
line-height: 30px;
color: $ui-primary-color;
a {
color: $ui-highlight-color;
text-decoration: underline;
}
} }
} }
@ -307,17 +172,6 @@
} }
} }
p,
li {
font: inherit;
font-weight: inherit;
margin-bottom: 0;
}
hr {
border-color: rgba($ui-base-lighter-color, .6);
}
.header { .header {
line-height: 30px; line-height: 30px;
overflow: hidden; overflow: hidden;
@ -327,6 +181,62 @@
justify-content: space-between; justify-content: space-between;
} }
.links {
position: relative;
z-index: 4;
a {
display: flex;
justify-content: center;
align-items: center;
color: $ui-primary-color;
text-decoration: none;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif;
font-weight: 500;
font-size: 14px;
&:hover {
color: $ui-secondary-color;
}
}
.brand {
a {
padding-left: 0;
padding-right: 0;
color: $white;
}
img {
height: 32px;
position: relative;
top: 4px;
left: -10px;
}
}
ul {
list-style: none;
margin: 0;
li {
display: inline-block;
vertical-align: bottom;
margin: 0;
&:first-child a {
padding-left: 0;
}
&:last-child a {
padding-right: 0;
}
}
}
}
.hero { .hero {
margin-top: 50px; margin-top: 50px;
align-items: center; align-items: center;
@ -379,6 +289,12 @@
} }
} }
.heading {
position: relative;
z-index: 4;
padding-bottom: 150px;
}
.simple_form, .simple_form,
.closed-registrations-message { .closed-registrations-message {
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
@ -400,12 +316,6 @@
} }
} }
.heading {
position: relative;
z-index: 4;
padding-bottom: 150px;
}
.closed-registrations-message { .closed-registrations-message {
min-height: 330px; min-height: 330px;
display: flex; display: flex;
@ -413,131 +323,140 @@
justify-content: space-between; justify-content: space-between;
} }
} }
}
ul { .about-short {
list-style: none; background: darken($ui-base-color, 4%);
margin: 0; padding: 50px 0;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
line-height: 30px;
color: $ui-primary-color;
li { a {
display: inline-block; color: $ui-highlight-color;
vertical-align: bottom; text-decoration: underline;
margin: 0; }
}
.information-board {
background: darken($ui-base-color, 4%);
padding: 20px 0;
.container {
position: relative;
padding-right: 280px + 15px;
}
.information-board-sections {
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.section {
flex: 1 0 0;
font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 16px;
line-height: 28px;
color: $primary-text-color;
text-align: right;
padding: 10px 15px;
&:first-child a { span,
padding-left: 0; strong {
display: block;
} }
&:last-child a { span {
padding-right: 0; &:last-child {
color: $ui-secondary-color;
}
} }
strong {
font-weight: 500;
font-size: 32px;
line-height: 48px;
} }
} }
.links { .panel {
position: relative; position: absolute;
z-index: 4; width: 280px;
box-sizing: border-box;
background: darken($ui-base-color, 8%);
padding: 20px;
padding-top: 10px;
border-radius: 4px 4px 0 0;
right: 0;
bottom: -40px;
a { .panel-header {
display: flex;
justify-content: center;
align-items: center;
color: $ui-primary-color;
text-decoration: none;
padding: 12px 16px;
line-height: 32px;
font-family: 'mastodon-font-display', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-weight: 500;
font-size: 14px; font-size: 14px;
line-height: 24px;
font-weight: 500;
color: $ui-primary-color;
padding-bottom: 5px;
margin-bottom: 15px;
border-bottom: 1px solid lighten($ui-base-color, 4%);
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
&:hover { a,
color: $ui-secondary-color; span {
} font-weight: 400;
color: darken($ui-primary-color, 10%);
} }
.brand {
a { a {
padding-left: 0; text-decoration: none;
padding-right: 0;
color: $white;
}
img {
height: 32px;
position: relative;
top: 4px;
left: -10px;
}
} }
} }
} }
.container { .owner {
width: 100%; text-align: center;
box-sizing: border-box;
max-width: 800px;
margin: 0 auto;
}
.wrapper { .avatar {
max-width: 800px; width: 80px;
height: 80px;
margin: 0 auto; margin: 0 auto;
padding: 0; margin-bottom: 15px;
}
.about-short { img {
background: darken($ui-base-color, 4%); display: block;
padding: 50px 0; width: 80px;
height: 80px;
border-radius: 48px;
}
} }
.extended-description { .name {
padding: 50px 0; font-size: 14px;
ul,
ol {
list-style: inherit;
margin-left: 20px;
&[type='a'] { a {
list-style-type: lower-alpha; display: block;
} color: $primary-text-color;
text-decoration: none;
&[type='i'] { &:hover {
list-style-type: lower-roman; .display_name {
text-decoration: underline;
} }
} }
li > ol,
li > ul {
margin-top: 20px;
} }
p, .username {
li { display: block;
font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
font-weight: 400;
margin-bottom: 12px;
color: $ui-primary-color; color: $ui-primary-color;
a {
color: $ui-highlight-color;
text-decoration: underline;
}
} }
} }
h3 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 500;
margin-bottom: 20px;
color: $ui-secondary-color;
} }
p {
font-size: 16px;
line-height: 30px;
color: $ui-primary-color;
} }
.features { .features {
@ -546,7 +465,6 @@
.container { .container {
display: flex; display: flex;
} }
}
#mastodon-timeline { #mastodon-timeline {
display: flex; display: flex;
@ -611,35 +529,57 @@
.features-list { .features-list {
margin-top: 20px; margin-top: 20px;
}
.features-list__row {
display: flex;
padding: 10px 0;
justify-content: space-between;
&:first-child {
padding-top: 0;
} }
em { .visual {
display: inline; flex: 0 0 auto;
margin: 0; display: flex;
padding: 0; align-items: center;
font-weight: 500; margin-left: 15px;
background: transparent;
font-family: inherit; .fa {
font-size: inherit; display: block;
line-height: inherit; color: $ui-primary-color;
color: lighten($ui-primary-color, 10%); font-size: 48px;
}
} }
h1 { .text {
font-family: 'mastodon-font-display', sans-serif; font-size: 16px;
font-size: 26px;
line-height: 30px; line-height: 30px;
color: $ui-primary-color;
h6 {
font-size: inherit;
line-height: inherit;
margin-bottom: 0; margin-bottom: 0;
font-weight: 500; }
color: $ui-secondary-color; }
}
}
}
}
small { .extended-description {
padding: 50px 0;
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: 'mastodon-font-sans-serif', sans-serif;
display: block; font-size: 16px;
font-size: 18px;
font-weight: 400; font-weight: 400;
color: $ui-base-lighter-color; font-size: 16px;
line-height: 30px;
color: $ui-primary-color;
a {
color: $ui-highlight-color;
text-decoration: underline;
} }
} }
@ -663,8 +603,15 @@
padding: 0 20px; padding: 0 20px;
} }
.information-board .container { .information-board {
.container {
padding-right: 20px; padding-right: 20px;
}
.section {
text-align: center;
}
.panel { .panel {
position: static; position: static;
@ -678,10 +625,6 @@
} }
} }
.information-board .section {
text-align: center;
}
.header-wrapper .mascot { .header-wrapper .mascot {
left: 20px; left: 20px;
} }
@ -699,6 +642,7 @@
&.compact .hero .heading { &.compact .hero .heading {
padding-bottom: 20px; padding-bottom: 20px;
text-align: initial;
} }
} }
@ -707,29 +651,14 @@
display: block; display: block;
} }
.header {
.links { .links {
padding-top: 15px; padding-top: 15px;
background: darken($ui-base-color, 4%); background: darken($ui-base-color, 4%);
}
.header {
.hero { a {
margin-top: 30px; padding: 12px 8px;
padding: 0;
.heading {
padding: 0 20px 20px;
}
}
.floats {
display: none;
}
.heading,
.nav {
text-align: center;
} }
.nav { .nav {
@ -738,20 +667,25 @@
justify-content: space-around; justify-content: space-around;
} }
.links a { .brand img {
padding: 12px 8px; left: 0;
top: 0;
}
} }
.heading h1 { .hero {
padding: 30px 0; margin-top: 30px;
padding: 0;
.floats {
display: none;
} }
.links .brand img { .heading {
left: 0; padding: 30px 20px;
top: 0; text-align: center;
} }
.hero {
.simple_form, .simple_form,
.closed-registrations-message { .closed-registrations-message {
background: darken($ui-base-color, 8%); background: darken($ui-base-color, 8%);
@ -762,7 +696,7 @@
} }
} }
#mastodon-timeline { .features #mastodon-timeline {
height: 70vh; height: 70vh;
width: 100%; width: 100%;
margin-bottom: 50px; margin-bottom: 50px;

Write Preview
Loading…
Cancel
Save