about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-05-20 19:42:44 +0200
committerGitHub <noreply@github.com>2017-05-20 19:42:44 +0200
commitd78f5552547b5175770dbfbefeff73e426da980d (patch)
tree51c05609abe475517fc2221b1adc21196e186fb8 /app
parentc2f70829d9dc1afcc4bbad4aadb21e5053e1fb71 (diff)
Improve language filter preferences look (#3184)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/styles/forms.scss19
-rw-r--r--app/views/settings/preferences/show.html.haml2
2 files changed, 18 insertions, 3 deletions
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index db60e1e10..6af846b0a 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -12,6 +12,7 @@ code {
 .simple_form {
   .input {
     margin-bottom: 15px;
+    overflow: hidden;
   }
 
   span.hint {
@@ -44,11 +45,12 @@ code {
 
   .input.file,
   .input.select,
-  .input.radio_buttons {
+  .input.radio_buttons,
+  .input.check_boxes {
     padding: 15px 0;
     margin-bottom: 0;
 
-    label {
+    .label_input > label {
       font-family: inherit;
       font-size: 16px;
       color: $primary-text-color;
@@ -353,6 +355,19 @@ code {
 }
 
 .user_filtered_languages {
+
+  & > label {
+    font-family: inherit;
+    font-size: 16px;
+    color: $primary-text-color;
+    display: block;
+    padding-top: 5px;
+  }
+
+  .hint {
+    margin-bottom: 15px;
+  }
+
   li {
     float: left;
     width: 50%;
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 0532d1dc8..3771698d1 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -14,7 +14,7 @@
 
     = f.input :filtered_languages,
       collection: I18n.available_locales,
-      wrapper: :with_label,
+      wrapper: :with_block_label,
       include_blank: false,
       label_method: lambda { |locale| human_locale(locale) },
       required: false,