diff --git a/Changelog.md b/Changelog.md index 3d1bf968f0167cf32bed33e95baf6c38b5fa0130..100fefea120562295313a592f6ac427ceffabb1e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -48,6 +48,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. * Replace mobile icons for post interactions with Entypo icons [#6291](https://github.com/diaspora/diaspora/pull/6291) * Replace jquery.autocomplete with typeahead.js [#6293](https://github.com/diaspora/diaspora/pull/6293) * Redesign sidebars on stream pages [#6309](https://github.com/diaspora/diaspora/pull/6309) +* Improve ignored users styling [#6349](https://github.com/diaspora/diaspora/pull/6349) ## Bug fixes * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) diff --git a/app/assets/stylesheets/mobile/settings.scss b/app/assets/stylesheets/mobile/settings.scss index d2e62ef32511438e8b01bfaf75cbc6c5fb7ee9c4..417686da4581247d8c8b21ac20bf9fe7efd247af 100644 --- a/app/assets/stylesheets/mobile/settings.scss +++ b/app/assets/stylesheets/mobile/settings.scss @@ -29,3 +29,12 @@ padding: 1rem; } } + +#blocked_people { + .blocked_person { + border-bottom: 1px solid $border-grey; + margin-top: 0; + .avatar { max-width: 35px; } + .info { color: $text; } + } +} diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss index 750e3a01cb48f3183649958ff4e11cbfc66fb6d3..62a1debd55ac1e0e9007c1ed991848884b003b53 100644 --- a/app/assets/stylesheets/people.scss +++ b/app/assets/stylesheets/people.scss @@ -28,3 +28,19 @@ .info { font-size: $font-size-small; } } } +#blocked_people { + .blocked_person { + border-bottom: 1px solid $border-grey; + padding: 10px; + margin: 0px; + font-size: 13px; + line-height: 16px; + min-height: 50px; + .avatar { + width: 50px; + height: 50px; + } + .info { font-size: $font-size-small; } + .btn-danger { margin-top: 9px; } + } +} diff --git a/app/views/users/_blocked_person.haml b/app/views/users/_blocked_person.haml new file mode 100644 index 0000000000000000000000000000000000000000..b70d04a8e03f81576c5102a01bc74b1670c3550b --- /dev/null +++ b/app/views/users/_blocked_person.haml @@ -0,0 +1,12 @@ +.media.blocked_person{id: person.id} + .pull-right + = link_to t("users.privacy_settings.stop_ignoring"), block_path(block), class: "btn btn-danger", method: :delete + .media-object.pull-left + = person_image_link(person, size: :thumb_small) + .media-body + = person_link(person) + .info.diaspora_handle + = block.person.diaspora_handle + .info.tags + = Diaspora::Taggable.format_tags(person.profile.tag_string) + .clearfix diff --git a/app/views/users/_privacy_settings.haml b/app/views/users/_privacy_settings.haml index 9784c75335a10897c3d2a52824bdced016364894..6398577464ab993271515a91e6551a78c8397fd7 100644 --- a/app/views/users/_privacy_settings.haml +++ b/app/views/users/_privacy_settings.haml @@ -18,7 +18,7 @@ = t('.strip_exif') = f.submit t('users.edit.change'), class: 'btn btn-primary pull-right' %hr - + .row .col-md-12 %h3 @@ -27,9 +27,7 @@ - if @blocks.length.zero? %p = t('.no_user_ignored_message') - - - @blocks.each do |block| - = block.person_name - \- - = link_to t('.stop_ignoring'), block_path(block), - method: :delete + - else + #blocked_people + - @blocks.each do |block| + = render partial: "blocked_person", locals: {block: block, person: block.person} diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 20f166c0c7241cbb702e4f59cb0cf1386388f7f3..f98a700204e1b88052ef50d789dcbdb9956816a2 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -1387,7 +1387,7 @@ en: title: "Privacy settings" strip_exif: "Strip metadata such as location, author, and camera model from uploaded images (recommended)" ignored_users: "Ignored users" - stop_ignoring: "stop ignoring" + stop_ignoring: "Stop ignoring" no_user_ignored_message: "You are not currently ignoring any other user" destroy: