mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-21 14:23:04 +00:00
Grid layout for tag pages (#6545)
* Use grid layout for the landing page * Use grid layout for tag pages * Set 2 columns width as explicit percentage for tag pages
This commit is contained in:
Lynx Kotoura
Eugen Rochko
parent
3a6ace4874
commit
7150f2e9d3
|
|
@ -1015,93 +1015,54 @@ $small-breakpoint: 960px;
|
|||
}
|
||||
|
||||
&.tag-page {
|
||||
.features {
|
||||
padding: 30px 0;
|
||||
.grid {
|
||||
@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 {
|
||||
.about-hashtag {
|
||||
background: darken($ui-base-color, 4%);
|
||||
padding: 0 20px 20px 30px;
|
||||
border-radius: 0 5px 5px 0;
|
||||
|
||||
.brand {
|
||||
padding-top: 20px;
|
||||
margin-bottom: 20px;
|
||||
|
||||
img {
|
||||
height: 48px;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
||||
p {
|
||||
strong {
|
||||
color: $ui-secondary-color;
|
||||
font-weight: 700;
|
||||
}
|
||||
}
|
||||
|
||||
.cta {
|
||||
margin: 0;
|
||||
|
||||
.button {
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.features-list {
|
||||
margin-left: 30px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
.column-2 {
|
||||
grid-column: 2;
|
||||
grid-row: 1;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 675px) {
|
||||
.features {
|
||||
padding: 10px 0;
|
||||
.brand {
|
||||
text-align: unset;
|
||||
padding: 0;
|
||||
|
||||
.container-alt {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
img {
|
||||
height: 48px;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
||||
#mastodon-timeline {
|
||||
order: 2;
|
||||
flex: 0 0 auto;
|
||||
height: 60vh;
|
||||
margin-bottom: 20px;
|
||||
border-top-right-radius: 4px;
|
||||
}
|
||||
.cta {
|
||||
margin: 0;
|
||||
|
||||
.about-mastodon {
|
||||
order: 1;
|
||||
flex: 0 0 auto;
|
||||
max-width: 100%;
|
||||
.button {
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
|
||||
.about-hashtag {
|
||||
background: unset;
|
||||
padding: 0;
|
||||
border-radius: 0;
|
||||
|
||||
.cta {
|
||||
margin: 20px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.features-list {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
@media screen and (max-width: $column-breakpoint) {
|
||||
.grid {
|
||||
.column-1 {
|
||||
grid-column: 1;
|
||||
grid-row: 2;
|
||||
}
|
||||
|
||||
.column-2 {
|
||||
grid-column: 1;
|
||||
grid-row: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.brand {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.landing-page__features {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
25
app/views/tags/_features.html.haml
Normal file
25
app/views/tags/_features.html.haml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
.features-list
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.real_conversation_title'
|
||||
= t 'about.features.real_conversation_body'
|
||||
.visual
|
||||
= fa_icon 'fw comments'
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.not_a_product_title'
|
||||
= t 'about.features.not_a_product_body'
|
||||
.visual
|
||||
= fa_icon 'fw users'
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.within_reach_title'
|
||||
= t 'about.features.within_reach_body'
|
||||
.visual
|
||||
= fa_icon 'fw mobile'
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.humane_approach_title'
|
||||
= t 'about.features.humane_approach_body'
|
||||
.visual
|
||||
= fa_icon 'fw leaf'
|
||||
|
|
@ -6,48 +6,31 @@
|
|||
= javascript_pack_tag 'about', integrity: true, crossorigin: 'anonymous'
|
||||
= render 'og'
|
||||
|
||||
.landing-page.tag-page
|
||||
.landing-page.tag-page.alternative
|
||||
.features
|
||||
.container
|
||||
#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) } }
|
||||
.grid
|
||||
.column-1
|
||||
#mastodon-timeline{ data: { props: Oj.dump(default_props.merge(hashtag: @tag.name)) } }
|
||||
|
||||
.about-mastodon
|
||||
.about-hashtag
|
||||
.brand
|
||||
= link_to root_url do
|
||||
= image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
|
||||
.column-2
|
||||
.about-mastodon
|
||||
.about-hashtag.landing-page__information
|
||||
.brand
|
||||
= link_to root_url do
|
||||
= image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
|
||||
|
||||
%p= t 'about.about_hashtag_html', hashtag: @tag.name
|
||||
%p= t 'about.about_hashtag_html', hashtag: @tag.name
|
||||
|
||||
.cta
|
||||
- if user_signed_in?
|
||||
= link_to t('settings.back'), root_path, class: 'button button-secondary'
|
||||
- else
|
||||
= link_to t('auth.login'), new_user_session_path, class: 'button button-secondary'
|
||||
= link_to t('about.learn_more'), about_path, class: 'button button-alternative'
|
||||
.cta
|
||||
- if user_signed_in?
|
||||
= link_to t('settings.back'), root_path, class: 'button button-secondary'
|
||||
- else
|
||||
= link_to t('auth.login'), new_user_session_path, class: 'button button-secondary'
|
||||
= link_to t('about.learn_more'), about_path, class: 'button button-alternative'
|
||||
|
||||
.features-list
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.real_conversation_title'
|
||||
= t 'about.features.real_conversation_body'
|
||||
.visual
|
||||
= fa_icon 'fw comments'
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.not_a_product_title'
|
||||
= t 'about.features.not_a_product_body'
|
||||
.visual
|
||||
= fa_icon 'fw users'
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.within_reach_title'
|
||||
= t 'about.features.within_reach_body'
|
||||
.visual
|
||||
= fa_icon 'fw mobile'
|
||||
.features-list__row
|
||||
.text
|
||||
%h6= t 'about.features.humane_approach_title'
|
||||
= t 'about.features.humane_approach_body'
|
||||
.visual
|
||||
= fa_icon 'fw leaf'
|
||||
.landing-page__features.landing-page__information
|
||||
%h3= t 'about.what_is_mastodon'
|
||||
%p= t 'about.about_mastodon_html'
|
||||
|
||||
= render 'features'
|
||||
|
|
|
|||
Loading…
Reference in a new issue