Browse Source

In wide layout, columnize Mastodon features on landing page (#6674)

pull/4/head
Eugen Rochko 3 years ago
committed by GitHub
parent
commit
8de048fcdb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 9 deletions
  1. +14
    -7
      app/javascript/styles/mastodon/about.scss
  2. +4
    -2
      app/views/about/show.html.haml

+ 14
- 7
app/javascript/styles/mastodon/about.scss View File

@ -832,8 +832,13 @@ $small-breakpoint: 960px;
}
&__features {
& > p {
padding-right: 60px;
}
.features-list {
margin: 40px 0 !important;
margin: 40px 0;
margin-top: 30px;
}
&__action {
@ -842,17 +847,11 @@ $small-breakpoint: 960px;
}
.features-list {
margin-top: 20px;
.features-list__row {
display: flex;
padding: 10px 0;
justify-content: space-between;
&:first-child {
padding-top: 0;
}
.visual {
flex: 0 0 auto;
display: flex;
@ -878,6 +877,14 @@ $small-breakpoint: 960px;
}
}
}
@media screen and (min-width: $small-breakpoint) {
display: grid;
grid-gap: 30px;
grid-template-columns: 1fr 1fr;
grid-auto-columns: 50%;
grid-auto-rows: max-content;
}
}
.extended-description {

+ 4
- 2
app/views/about/show.html.haml View File

@ -103,8 +103,10 @@
- if Setting.timeline_preview
.column-4.landing-page__information
.landing-page__features
%h3= t 'about.what_is_mastodon'
%p= t 'about.about_mastodon_html'
.features-list
%div
%h3= t 'about.what_is_mastodon'
%p= t 'about.about_mastodon_html'
= render 'features'

Loading…
Cancel
Save