diff --git a/Changelog.md b/Changelog.md index 6500c7c7391d5a7c518e93fb2208e13e1f895988..7f41e3b27e435d3e55ad22f58a0b565dc82ead42 100644 --- a/Changelog.md +++ b/Changelog.md @@ -32,6 +32,7 @@ Note: Although this is a minor release, the configuration file changed because t * Fix link to comment on report page [#7105](https://github.com/diaspora/diaspora/pull/7105) * Fix duplicate flash message on mobile profile edit [#7107](https://github.com/diaspora/diaspora/pull/7107) * Clicking photos on mobile should no longer cause 404s [#7071](https://github.com/diaspora/diaspora/pull/7071) +* Fix avatar size on mobile privacy page for ignored people [#7148](https://github.com/diaspora/diaspora/pull/7148) ## Features * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss index 193665b1344524b7d4ab17f3ec023349b96e90d5..7996bcee9f51c5a209ef13fce0bb276c91dc6fb9 100644 --- a/app/assets/stylesheets/mobile/mobile.scss +++ b/app/assets/stylesheets/mobile/mobile.scss @@ -118,7 +118,7 @@ textarea { resize: vertical; } color: rgb(10, 150, 10); text-shadow: 1px 1px 20px rgb(126, 240, 77); } -#login_form { +.login-form { /* ensure url bar is banished from view on iOS */ margin-bottom: 40px !important; @@ -144,9 +144,9 @@ footer { } } -.settings_container, +.settings-container, .stream-element, -#login_form { +.login-form { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); diff --git a/app/assets/stylesheets/mobile/settings.scss b/app/assets/stylesheets/mobile/settings.scss index b904ac7cbdfb08ed87c995220da87e2190174091..9c959beb42b5e85d8d5250a0369801789b91952d 100644 --- a/app/assets/stylesheets/mobile/settings.scss +++ b/app/assets/stylesheets/mobile/settings.scss @@ -46,8 +46,8 @@ } } -.settings_container { - .blocked_person { +.settings-container { + .blocked-person { margin: 0; padding: 10px 0; diff --git a/app/assets/stylesheets/people.scss b/app/assets/stylesheets/people.scss index fbe3900ba317c84ac8ee6eb340e6263aa1125f62..59e0b228537f5cab2a9d534aeec5106b24bf8209 100644 --- a/app/assets/stylesheets/people.scss +++ b/app/assets/stylesheets/people.scss @@ -29,7 +29,7 @@ } } #blocked_people { - .blocked_person { + .blocked-person { border-bottom: 1px solid $border-grey; font-size: 13px; line-height: 16px; diff --git a/app/views/api/openid_connect/user_applications/index.mobile.haml b/app/views/api/openid_connect/user_applications/index.mobile.haml index 39690d6616474e606fb4e5c17071a899a779bcc3..b0aa9c1a0455a7e26061f8d810a617b7f87061cb 100644 --- a/app/views/api/openid_connect/user_applications/index.mobile.haml +++ b/app/views/api/openid_connect/user_applications/index.mobile.haml @@ -1,4 +1,4 @@ -.container-fluid.settings_container.applications-page +.container-fluid.settings-container.applications-page .row .col-md-12 - content_for :page_title do diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml index 2ac3ff92ac2f30c3061ea34fbfee65c14ac23b54..883260bba8f9132a4fcbf672febd36bd0f1f167a 100644 --- a/app/views/devise/passwords/edit.mobile.haml +++ b/app/views/devise/passwords/edit.mobile.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. #main_stream.stream - #login_form + .login-form .login-container = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = devise_error_messages! diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml index 241a1d70c1d9daf6eeda263401b59f8fea71c607..1f4f99b1ca0cd01620f911a38f091b829ed0276e 100644 --- a/app/views/devise/passwords/new.mobile.haml +++ b/app/views/devise/passwords/new.mobile.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. #main_stream.stream - #login_form + .login-form .login-container = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f| %fieldset diff --git a/app/views/profiles/edit.mobile.haml b/app/views/profiles/edit.mobile.haml index 608b9a8c06e34cb8b63962220ddb4fbb2147ec8e..7bc3583a8ad0477960700acae5899f37714a305c 100644 --- a/app/views/profiles/edit.mobile.haml +++ b/app/views/profiles/edit.mobile.haml @@ -2,7 +2,7 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -.settings_container.container-fluid +.settings-container.container-fluid .row .col-md-12 = render "shared/settings_nav" diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml index efec569c9d8b7c17ed37f57b4b507a758e35670c..5f39962b0a0632fecd46a01f460a6ce7a34864cd 100644 --- a/app/views/registrations/new.mobile.haml +++ b/app/views/registrations/new.mobile.haml @@ -8,7 +8,7 @@ .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"} = msg - #login_form + .login-form .login-container = render partial: "form", locals: {mobile: true} diff --git a/app/views/services/index.mobile.haml b/app/views/services/index.mobile.haml index a74e7167c315b6080c8967f4fde77ed9dac9f997..88dce57e341ead3ba67d74a49bf7a910a35ae922 100644 --- a/app/views/services/index.mobile.haml +++ b/app/views/services/index.mobile.haml @@ -5,7 +5,7 @@ - content_for :page_title do = t(".edit_services") -.settings_container.services_page.container-fluid +.settings-container.services_page.container-fluid .row .col-md-12 = render "shared/settings_nav" diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml index a4b7d803c5ad7378cc339cfad69c0b21d5393af2..b4422102d4ebc11de02cda2d99020477db136b30 100644 --- a/app/views/sessions/new.mobile.haml +++ b/app/views/sessions/new.mobile.haml @@ -8,7 +8,7 @@ .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"} = msg - #login_form + .login-form .login-container = render partial: "form", locals: {mobile: true} diff --git a/app/views/users/_blocked_person.haml b/app/views/users/_blocked_person.haml index b70d04a8e03f81576c5102a01bc74b1670c3550b..39e0dfef3e174f4a5feecc88040ab3dcee677beb 100644 --- a/app/views/users/_blocked_person.haml +++ b/app/views/users/_blocked_person.haml @@ -1,4 +1,4 @@ -.media.blocked_person{id: person.id} +.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 diff --git a/app/views/users/edit.mobile.haml b/app/views/users/edit.mobile.haml index 77f9bb52d27c592a9e6293725304023d273e5a56..7a7b4a3ce556a0751c3e3e61a7054f8d549a8d10 100644 --- a/app/views/users/edit.mobile.haml +++ b/app/views/users/edit.mobile.haml @@ -1,4 +1,4 @@ -.settings_container.container-fluid +.settings-container.container-fluid .row .col-md-12 = render "shared/settings_nav" diff --git a/app/views/users/privacy_settings.mobile.haml b/app/views/users/privacy_settings.mobile.haml index 231f164dc5d9fa4d254dd410b8d397f1097880d6..e37698db9602e41720030e6c60cd209c26709f16 100644 --- a/app/views/users/privacy_settings.mobile.haml +++ b/app/views/users/privacy_settings.mobile.haml @@ -5,7 +5,7 @@ - content_for :page_title do = t(".title") -.settings_container.container-fluid +.settings-container.container-fluid .row .col-md-12 = render "shared/settings_nav"