[Git][noosfero/noosfero][stable-2.5] Merge branch 'issue-368' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-2.5 at Noosfero / noosfero


Commits:
be94ac94 by Rodrigo Souto at 2018-09-18T10:58:44Z
Merge branch 'issue-368' into 'master'

Fixing layout in Manage Captcha

See merge request noosfero/noosfero!1612

(cherry picked from commit ad4c0723e801e3b9d3ba20a7be8328c02d30134e)

5c3ff2bf Fixing layout in Manage Captcha
- - - - -


2 changed files:

- app/views/captcha/index.html.erb
- public/stylesheets/slider.scss


Changes:

=====================================
app/views/captcha/index.html.erb
=====================================
@@ -3,12 +3,16 @@
 <%= _('Define who is obliged to answer the captcha verification for each action.') %>
 
 <%= form_tag do %>
-  <% environment.captcha_requirements.each do |action, settings| %>
-    <div class='captcha-sliders'>
-      <%= content_tag('h4', settings[:label]) %>
-      <%= restriction_slider_field_tag(action, "captcha[#{action}]", nil, environment.get_captcha_level(action), settings[:options]) %>
-    </div>
-  <% end %>
+  
+  <div class='captcha-sliders-wrapper'>
+    <% environment.captcha_requirements.each do |action, settings| %>
+      <div class='captcha-sliders'>
+        <%= content_tag('h4', settings[:label]) %>
+        <%= restriction_slider_field_tag(action, "captcha[#{action}]", nil, environment.get_captcha_level(action), settings[:options]) %>
+      </div>
+    <% end %>
+  </div>
+
 
   <%= button_bar do %>
     <%= button :back, _('Back to admin panel'), :controller => 'admin_panel' %>


=====================================
public/stylesheets/slider.scss
=====================================
@@ -22,4 +22,9 @@
   float: left;
   width: 50%;
   margin-bottom: 20px;
+}
+
+.captcha-sliders-wrapper {
+  display: flex;
+  flex-wrap: wrap;
 }
\ No newline at end of file



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/be94ac944f269b8b3c1197d7f4bfce19c3de7e63

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/be94ac944f269b8b3c1197d7f4bfce19c3de7e63
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180918/c1089b8d/attachment-0001.html>