nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename css classes for scss-lint

Browse source 
closes #7148
This commit is contained in:
Benjamin Neff 2016-10-17 23:28:49 +02:00 committed by Steffen van Bergerem
parent 4112192d95
commit 0559932f5d
No known key found for this signature in database
GPG key ID: 315C9787D548DC6B
14 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -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 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) * 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) * 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 ## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045) * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

6
app/assets/stylesheets/mobile/mobile.scss
View file

@ -118,7 +118,7 @@ textarea { resize: vertical; }
color: rgb(10, 150, 10); color: rgb(10, 150, 10);
text-shadow: 1px 1px 20px rgb(126, 240, 77); } text-shadow: 1px 1px 20px rgb(126, 240, 77); }
#login_form { .login-form {
/* ensure url bar is banished from view on iOS */ /* ensure url bar is banished from view on iOS */
margin-bottom: 40px !important; margin-bottom: 40px !important;
@ -144,9 +144,9 @@ footer {
} }
} }
.settings_container, .settings-container,
.stream-element, .stream-element,
#login_form { .login-form {
border-radius: 5px; border-radius: 5px;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);

4
app/assets/stylesheets/mobile/settings.scss
View file

@ -46,8 +46,8 @@
} }
} }
.settings_container { .settings-container {
.blocked_person { .blocked-person {
margin: 0; margin: 0;
padding: 10px 0; padding: 10px 0;

2
app/assets/stylesheets/people.scss
View file

@ -29,7 +29,7 @@
} }
} }
#blocked_people { #blocked_people {
.blocked_person { .blocked-person {
border-bottom: 1px solid $border-grey; border-bottom: 1px solid $border-grey;
font-size: 13px; font-size: 13px;
line-height: 16px; line-height: 16px;

2
app/views/api/openid_connect/user_applications/index.mobile.haml
View file

@ -1,4 +1,4 @@
.container-fluid.settings_container.applications-page .container-fluid.settings-container.applications-page
.row .row
.col-md-12 .col-md-12
- content_for :page_title do - content_for :page_title do

2
app/views/devise/passwords/edit.mobile.haml
View file

@ -3,7 +3,7 @@
-# the COPYRIGHT file. -# the COPYRIGHT file.
#main_stream.stream #main_stream.stream
#login_form .login-form
.login-container .login-container
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
= devise_error_messages! = devise_error_messages!

2
app/views/devise/passwords/new.mobile.haml
View file

@ -3,7 +3,7 @@
-# the COPYRIGHT file. -# the COPYRIGHT file.
#main_stream.stream #main_stream.stream
#login_form .login-form
.login-container .login-container
= form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f| = form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
%fieldset %fieldset

2
app/views/profiles/edit.mobile.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
.settings_container.container-fluid .settings-container.container-fluid
.row .row
.col-md-12 .col-md-12
= render "shared/settings_nav" = render "shared/settings_nav"

2
app/views/registrations/new.mobile.haml
View file

@ -8,7 +8,7 @@
.flash-message{class: "message alert alert-#{flash_class name}", role: "alert"} .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
= msg = msg
#login_form .login-form
.login-container .login-container
= render partial: "form", locals: {mobile: true} = render partial: "form", locals: {mobile: true}

2
app/views/services/index.mobile.haml
View file

@ -5,7 +5,7 @@
- content_for :page_title do - content_for :page_title do
= t(".edit_services") = t(".edit_services")
.settings_container.services_page.container-fluid .settings-container.services_page.container-fluid
.row .row
.col-md-12 .col-md-12
= render "shared/settings_nav" = render "shared/settings_nav"

2
app/views/sessions/new.mobile.haml
View file

@ -8,7 +8,7 @@
.flash-message{class: "message alert alert-#{flash_class name}", role: "alert"} .flash-message{class: "message alert alert-#{flash_class name}", role: "alert"}
= msg = msg
#login_form .login-form
.login-container .login-container
= render partial: "form", locals: {mobile: true} = render partial: "form", locals: {mobile: true}

2
app/views/users/_blocked_person.haml
View file

@ -1,4 +1,4 @@
.media.blocked_person{id: person.id} .media.blocked-person{id: person.id}
.pull-right .pull-right
= link_to t("users.privacy_settings.stop_ignoring"), block_path(block), class: "btn btn-danger", method: :delete = link_to t("users.privacy_settings.stop_ignoring"), block_path(block), class: "btn btn-danger", method: :delete
.media-object.pull-left .media-object.pull-left

2
app/views/users/edit.mobile.haml
View file

@ -1,4 +1,4 @@
.settings_container.container-fluid .settings-container.container-fluid
.row .row
.col-md-12 .col-md-12
= render "shared/settings_nav" = render "shared/settings_nav"

2
app/views/users/privacy_settings.mobile.haml
View file

@ -5,7 +5,7 @@
- content_for :page_title do - content_for :page_title do
= t(".title") = t(".title")
.settings_container.container-fluid .settings-container.container-fluid
.row .row
.col-md-12 .col-md-12
= render "shared/settings_nav" = render "shared/settings_nav"