logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 32e8a87830f2b054f2a32ded4c41d91003503d14
parent: 636acb57121e8f77eafea5b5607343729574d7ec
Author: Lynx Kotoura <admin@sanin.link>
Date:   Thu,  5 Oct 2017 05:49:36 +0900

adjust public profile pages 2 (#5223)


Diffstat:

Mapp/javascript/styles/accounts.scss17++++++++---------
Mapp/javascript/styles/forms.scss1+
Mconfig/initializers/kaminari_config.rb3+--
3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss @@ -69,12 +69,16 @@ position: relative; z-index: 2; margin-bottom: 30px; + overflow: hidden; + text-overflow: ellipsis; small { display: block; font-size: 14px; color: $ui-highlight-color; font-weight: 400; + overflow: hidden; + text-overflow: ellipsis; } } @@ -284,21 +288,15 @@ color: lighten($ui-base-color, 10%); } - @media screen and (max-width: 360px) { + @media screen and (max-width: 700px) { padding: 30px 20px; - a, - .current, - .next, - .prev, - .gap { + .page { display: none; } .next, - .prev, - .next a, - .prev a { + .prev { display: inline-block; } } @@ -375,6 +373,7 @@ height: 80px; border-radius: 80px; border: 2px solid $simple-background-color; + background: $simple-background-color; } } diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss @@ -515,6 +515,7 @@ code { .action-pagination { display: flex; + flex-wrap: wrap; align-items: center; .actions, diff --git a/config/initializers/kaminari_config.rb b/config/initializers/kaminari_config.rb @@ -3,6 +3,5 @@ Kaminari.configure do |config| config.default_per_page = 40 config.window = 1 - config.left = 3 - config.right = 1 + config.outer_window = 1 end