tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Improve language filter preferences look (#3184)

Browse Source
This commit is contained in:
Eugen Rochko 2017-05-20 19:42:44 +02:00 committed by GitHub
parent c2f70829d9
commit d78f555254
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/styles/forms.scss
View File

@ -12,6 +12,7 @@ code {
.simple_form { .simple_form {
.input { .input {
margin-bottom: 15px; margin-bottom: 15px;
overflow: hidden;
} }
span.hint { span.hint {
@ -44,11 +45,12 @@ code {
.input.file, .input.file,
.input.select, .input.select,
.input.radio_buttons { .input.radio_buttons,
.input.check_boxes {
padding: 15px 0; padding: 15px 0;
margin-bottom: 0; margin-bottom: 0;
label { .label_input > label {
font-family: inherit; font-family: inherit;
font-size: 16px; font-size: 16px;
color: $primary-text-color; color: $primary-text-color;
@ -353,6 +355,19 @@ code {
} }
.user_filtered_languages { .user_filtered_languages {
& > label {
font-family: inherit;
font-size: 16px;
color: $primary-text-color;
display: block;
padding-top: 5px;
}
.hint {
margin-bottom: 15px;
}
li { li {
float: left; float: left;
width: 50%; width: 50%;

2
app/views/settings/preferences/show.html.haml
View File

@ -14,7 +14,7 @@
= f.input :filtered_languages, = f.input :filtered_languages,
collection: I18n.available_locales, collection: I18n.available_locales,
wrapper: :with_label, wrapper: :with_block_label,
include_blank: false, include_blank: false,
label_method: lambda { |locale| human_locale(locale) }, label_method: lambda { |locale| human_locale(locale) },
required: false, required: false,

8
config/initializers/simple_form.rb
View File

@ -57,6 +57,14 @@ SimpleForm.setup do |config|
b.use :error, wrap_with: { tag: :span, class: :error } b.use :error, wrap_with: { tag: :span, class: :error }
end end
config.wrappers :with_block_label, class: :input, hint_class: :field_with_hint, error_class: :field_with_errors do |b|
b.use :html5
b.use :label
b.use :hint, wrap_with: { tag: :span, class: :hint }
b.use :input
b.use :error, wrap_with: { tag: :span, class: :error }
end
# The default wrapper to be used by the FormBuilder. # The default wrapper to be used by the FormBuilder.
config.default_wrapper = :default config.default_wrapper = :default