Skip to content
Extraits de code Groupes Projets
Valider 18f69fb9 rédigé par Lynx Kotoura's avatar Lynx Kotoura Validation de Eugen Rochko
Parcourir les fichiers

Adjust styles of landing pages. (#4682) 

* Adjust about.scss

* Delete trailing whitespace.
parent 04c3fb21
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
app/javascript/styles/about.scss
+ 395
− 461
Voir le fichier @ 18f69fb9
.about-body { .landing-page {
.wrapper { p,
max-width: 600px; li {
margin: 0 auto; font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
line-height: 30px;
margin-bottom: 12px;
color: $ui-primary-color; color: $ui-primary-color;
padding-top: 50px;
padding-bottom: 50px;
&.thicc { a {
max-width: 800px; color: $ui-highlight-color;
text-decoration: underline;
} }
} }
em {
display: inline;
margin: 0;
padding: 0;
font-weight: 500;
background: transparent;
font-family: inherit;
font-size: inherit;
line-height: inherit;
color: lighten($ui-primary-color, 10%);
}
h1 { h1 {
font: 46px/52px 'mastodon-font-sans-serif', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-weight: 600; font-size: 26px;
line-height: 30px;
font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-highlight-color; color: $ui-secondary-color;
padding: 20px 0;
img { small {
margin-bottom: -5px; font-family: 'mastodon-font-sans-serif', sans-serif;
margin-right: 5px; display: block;
width: 46px; font-size: 18px;
height: 46px; font-weight: 400;
color: $ui-base-lighter-color;
} }
} }
h2 { h2 {
font-family: 'mastodon-font-display', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-size: 24px; font-size: 22px;
line-height: 28px; line-height: 26px;
font-weight: 400; font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $primary-text-color; color: $ui-secondary-color;
} }
h3 { h3 {
font-family: 'mastodon-font-display', sans-serif; font-family: 'mastodon-font-display', sans-serif;
font-size: 20px; font-size: 18px;
line-height: 28px; line-height: 24px;
font-weight: 400; font-weight: 500;
margin-bottom: 20px;
color: $ui-secondary-color;
}
h4 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 16px;
line-height: 24px;
font-weight: 500;
margin-bottom: 20px;
color: $ui-secondary-color;
}
h5 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 14px;
line-height: 24px;
font-weight: 500;
margin-bottom: 20px;
color: $ui-secondary-color;
}
h6 {
font-family: 'mastodon-font-display', sans-serif;
font-size: 12px;
line-height: 24px;
font-weight: 500;
margin-bottom: 20px; margin-bottom: 20px;
color: $ui-secondary-color; color: $ui-secondary-color;
} }
ul, ul,
ol { ol {
list-style: inherit;
margin-left: 20px; margin-left: 20px;
&[type='a'] { &[type='a'] {
...@@ -58,220 +102,30 @@ ...@@ -58,220 +102,30 @@
} }
} }
li > ol, ul {
li > ul { list-style: disc;
margin-top: 20px;
} }
p, ol {
li { list-style: decimal;
font: 16px/28px 'mastodon-font-sans-serif', sans-serif;
font-weight: 400;
margin-bottom: 12px;
a {
color: $ui-highlight-color;
text-decoration: underline;
}
}
em {
display: inline-block;
padding: 7px 7px 5px;
margin: 0 2px;
background: $ui-primary-color;
color: $ui-base-color;
font: 16px/16px 'mastodon-font-sans-serif', sans-serif;
font-weight: 300;
}
.screenshot {
box-shadow: 0 0 15px rgba($base-shadow-color, 0.4);
margin-bottom: 26px;
img {
max-width: 100%;
height: auto;
display: block;
}
}
.actions {
overflow: hidden;
margin-bottom: 20px;
.info {
float: right;
text-align: right;
line-height: 36px;
a {
color: $ui-primary-color;
text-decoration: underline;
}
}
} }
@media screen and (max-width: 625px) { li > ol,
.wrapper { li > ul {
padding: 20px; margin-top: 6px;
}
} }
}
.information-board { hr {
background: darken($ui-base-color, 4%); border-color: rgba($ui-base-lighter-color, .6);
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-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;
a,
span {
font-weight: 400;
color: darken($ui-primary-color, 10%);
}
a {
text-decoration: none;
}
}
} }
.container { .container {
position: relative; width: 100%;
padding-right: 280px + 15px; box-sizing: border-box;
} max-width: 800px;
.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 {
font-size: 16px;
&:last-child {
color: $ui-secondary-color;
}
}
strong {
font-weight: 500;
font-size: 32px;
line-height: 48px;
color: $primary-text-color;
}
}
}
.owner {
text-align: center;
.avatar {
width: 80px;
height: 80px;
margin: 0 auto; margin: 0 auto;
margin-bottom: 15px;
img {
display: block;
width: 80px;
height: 80px;
border-radius: 48px;
}
}
.name {
font-size: 14px;
a {
display: block;
color: $primary-text-color;
text-decoration: none;
&:hover {
.display_name {
text-decoration: underline;
}
}
}
.username {
display: block;
color: $ui-primary-color;
}
}
}
.features-list__row {
display: flex;
padding: 10px 0;
justify-content: space-between;
&:first-child {
padding-top: 0;
}
.visual {
flex: 0 0 auto;
display: flex;
align-items: center;
margin-left: 15px;
.fa {
display: block;
color: $ui-primary-color;
font-size: 48px;
}
} }
.text {
font-size: 16px;
line-height: 30px;
color: $ui-primary-color;
h6 {
font-weight: 500;
color: $ui-secondary-color;
}
}
}
.landing-page {
.header-wrapper { .header-wrapper {
padding-top: 15px; padding-top: 15px;
background: $ui-base-color; background: $ui-base-color;
...@@ -284,6 +138,17 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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,233 +323,263 @@ ...@@ -413,233 +323,263 @@
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; }
}
&:first-child a { .information-board {
padding-left: 0; background: darken($ui-base-color, 4%);
} padding: 20px 0;
&:last-child a { .container {
padding-right: 0; position: relative;
} padding-right: 280px + 15px;
}
} }
.links { .information-board-sections {
position: relative; display: flex;
z-index: 4; justify-content: space-between;
flex-wrap: wrap;
}
a { .section {
display: flex; flex: 1 0 0;
justify-content: center; font-family: 'mastodon-font-sans-serif', sans-serif;
align-items: center; font-size: 16px;
color: $ui-primary-color; line-height: 28px;
text-decoration: none; color: $primary-text-color;
padding: 12px 16px; text-align: right;
line-height: 32px; padding: 10px 15px;
font-family: 'mastodon-font-display', sans-serif;
font-weight: 500;
font-size: 14px;
&:hover { span,
color: $ui-secondary-color; strong {
} display: block;
} }
.brand { span {
a { &:last-child {
padding-left: 0; color: $ui-secondary-color;
padding-right: 0;
color: $white;
} }
}
img { strong {
height: 32px; font-weight: 500;
position: relative; font-size: 32px;
top: 4px; line-height: 48px;
left: -10px;
}
} }
} }
}
.container { .panel {
width: 100%; position: absolute;
box-sizing: border-box; width: 280px;
max-width: 800px; box-sizing: border-box;
margin: 0 auto; background: darken($ui-base-color, 8%);
} padding: 20px;
padding-top: 10px;
.wrapper { border-radius: 4px 4px 0 0;
max-width: 800px; right: 0;
margin: 0 auto; bottom: -40px;
padding: 0;
}
.about-short { .panel-header {
background: darken($ui-base-color, 4%); font-family: 'mastodon-font-display', sans-serif;
padding: 50px 0; 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;
a,
span {
font-weight: 400;
color: darken($ui-primary-color, 10%);
}
.extended-description { a {
padding: 50px 0; text-decoration: none;
}
}
}
ul, .owner {
ol { text-align: center;
list-style: inherit;
margin-left: 20px;
&[type='a'] { .avatar {
list-style-type: lower-alpha; width: 80px;
} height: 80px;
margin: 0 auto;
margin-bottom: 15px;
&[type='i'] { img {
list-style-type: lower-roman; display: block;
width: 80px;
height: 80px;
border-radius: 48px;
}
} }
}
li > ol, .name {
li > ul { font-size: 14px;
margin-top: 20px;
}
p, a {
li { display: block;
font: 16px/28px 'mastodon-font-sans-serif', sans-serif; color: $primary-text-color;
font-weight: 400; text-decoration: none;
margin-bottom: 12px;
color: $ui-primary-color; &:hover {
.display_name {
text-decoration: underline;
}
}
}
a { .username {
color: $ui-highlight-color; display: block;
text-decoration: underline; color: $ui-primary-color;
}
} }
} }
} }
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 {
padding: 50px 0; padding: 50px 0;
.container { .container {
display: flex; display: flex;
} }
}
#mastodon-timeline { #mastodon-timeline {
display: flex; display: flex;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar; -ms-overflow-style: -ms-autohiding-scrollbar;
font-family: 'mastodon-font-sans-serif', sans-serif; font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
font-weight: 400; font-weight: 400;
color: $primary-text-color; color: $primary-text-color;
width: 330px; width: 330px;
margin-right: 30px; margin-right: 30px;
flex: 0 0 auto; flex: 0 0 auto;
background: $ui-base-color; background: $ui-base-color;
overflow: hidden; overflow: hidden;
box-shadow: 0 0 6px rgba($black, 0.1); box-shadow: 0 0 6px rgba($black, 0.1);
.column-header {
color: inherit;
font-family: inherit;
font-size: 16px;
line-height: inherit;
font-weight: inherit;
margin: 0;
padding: 15px;
}
.column-header { .column {
color: inherit; padding: 0;
font-family: inherit; border-radius: 4px;
font-size: 16px; overflow: hidden;
line-height: inherit; }
font-weight: inherit;
margin: 0;
padding: 15px;
}
.column { .scrollable {
padding: 0; height: 400px;
border-radius: 4px; }
overflow: hidden;
}
.scrollable { p {
height: 400px; font-size: inherit;
} line-height: inherit;
font-weight: inherit;
color: $primary-text-color;
margin-bottom: 20px;
p { &:last-child {
font-size: inherit; margin-bottom: 0;
line-height: inherit; }
font-weight: inherit;
color: $primary-text-color;
margin-bottom: 20px;
&:last-child { a {
margin-bottom: 0; color: $ui-secondary-color;
text-decoration: none;
}
} }
}
a { .about-mastodon {
color: $ui-secondary-color; max-width: 675px;
text-decoration: none;
p {
margin-bottom: 20px;
} }
}
}
.about-mastodon { .features-list {
max-width: 675px; margin-top: 20px;
p { .features-list__row {
margin-bottom: 20px; display: flex;
} padding: 10px 0;
justify-content: space-between;
.features-list { &:first-child {
margin-top: 20px; 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;
}
}
.text {
font-size: 16px;
line-height: 30px;
color: $ui-primary-color;
h6 {
font-size: inherit;
line-height: inherit;
margin-bottom: 0;
}
}
}
}
}
} }
h1 { .extended-description {
font-family: 'mastodon-font-display', sans-serif; padding: 50px 0;
font-size: 26px; font-family: 'mastodon-font-sans-serif', sans-serif;
font-size: 16px;
font-weight: 400;
font-size: 16px;
line-height: 30px; line-height: 30px;
margin-bottom: 0; color: $ui-primary-color;
font-weight: 500;
color: $ui-secondary-color;
small { a {
font-family: 'mastodon-font-sans-serif', sans-serif; color: $ui-highlight-color;
display: block; text-decoration: underline;
font-size: 18px;
font-weight: 400;
color: $ui-base-lighter-color;
} }
} }
...@@ -663,8 +603,15 @@ ...@@ -663,8 +603,15 @@
padding: 0 20px; padding: 0 20px;
} }
.information-board .container { .information-board {
padding-right: 20px;
.container {
padding-right: 20px;
}
.section {
text-align: center;
}
.panel { .panel {
position: static; position: static;
...@@ -678,10 +625,6 @@ ...@@ -678,10 +625,6 @@
} }
} }
.information-board .section {
text-align: center;
}
.header-wrapper .mascot { .header-wrapper .mascot {
left: 20px; left: 20px;
} }
...@@ -699,6 +642,7 @@ ...@@ -699,6 +642,7 @@
&.compact .hero .heading { &.compact .hero .heading {
padding-bottom: 20px; padding-bottom: 20px;
text-align: initial;
} }
} }
...@@ -707,51 +651,41 @@ ...@@ -707,51 +651,41 @@
display: block; display: block;
} }
.links {
padding-top: 15px;
background: darken($ui-base-color, 4%);
}
.header { .header {
.hero { .links {
margin-top: 30px; padding-top: 15px;
padding: 0; background: darken($ui-base-color, 4%);
.heading { a {
padding: 0 20px 20px; padding: 12px 8px;
} }
}
.floats { .nav {
display: none; display: flex;
} flex-flow: row wrap;
justify-content: space-around;
.heading, }
.nav {
text-align: center;
}
.nav { .brand img {
display: flex; left: 0;
flex-flow: row wrap; top: 0;
justify-content: space-around; }
} }
.links a { .hero {
padding: 12px 8px; margin-top: 30px;
} padding: 0;
.heading h1 { .floats {
padding: 30px 0; 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 @@ ...@@ -762,7 +696,7 @@
} }
} }
#mastodon-timeline { .features #mastodon-timeline {
height: 70vh; height: 70vh;
width: 100%; width: 100%;
margin-bottom: 50px; margin-bottom: 50px;
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter