parent
4112192d95
commit
0559932f5d
14 changed files with 17 additions and 16 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@
|
|||
}
|
||||
}
|
||||
|
||||
.settings_container {
|
||||
.blocked_person {
|
||||
.settings-container {
|
||||
.blocked-person {
|
||||
margin: 0;
|
||||
padding: 10px 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
}
|
||||
}
|
||||
#blocked_people {
|
||||
.blocked_person {
|
||||
.blocked-person {
|
||||
border-bottom: 1px solid $border-grey;
|
||||
font-size: 13px;
|
||||
line-height: 16px;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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!
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.settings_container.container-fluid
|
||||
.settings-container.container-fluid
|
||||
.row
|
||||
.col-md-12
|
||||
= render "shared/settings_nav"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue