[Git][noosfero/noosfero][stable-1.8] Merge branch 'custom_fields_signup' into 'master'

[Rodrigo Souto]

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


Commits:
04c9efef by Rodrigo Souto at 2017-06-16T19:12:53+00:00
Merge branch 'custom_fields_signup' into 'master'

Fixes layout of custom fields in signup page

Closes #151

See merge request !1243
- - - - -


2 changed files:

- app/views/shared/_custom_fields.html.erb
- public/designs/themes/base/stylesheets/signup.scss


Changes:

=====================================
app/views/shared/_custom_fields.html.erb
=====================================
--- a/app/views/shared/_custom_fields.html.erb
+++ b/app/views/shared/_custom_fields.html.erb
@@ -6,7 +6,7 @@
 <% editing_profile ||= false %>
 <% fields.each do |field| %>
   <% rendered = render(:partial => "custom_fields/#{field.format}", :locals => {:field => field, :profile => profile, :name => "profile_data[custom_values[#{field.name}[value]]]"})%>
-  <div class="<%= 'field-with-privacy-selector' if editing_profile %>">
+  <div class="custom-field <%= field.format %> <%= 'field-with-privacy-selector' if editing_profile %>">
 
   <% if field.required%>
     <%= required rendered%>


=====================================
public/designs/themes/base/stylesheets/signup.scss
=====================================
--- a/public/designs/themes/base/stylesheets/signup.scss
+++ b/public/designs/themes/base/stylesheets/signup.scss
@@ -75,11 +75,14 @@
   background: #fff;
 }
 
+#signup-form select {
+  width: 100%;
+}
+
 #signup-form textarea {
-  background: #fff;
   height: 100px;
   padding-right: 3px;
-  width: 365px;
+  width: 96%;
 }
 
 #signup-form input[type=file] {
@@ -98,6 +101,11 @@
   margin: 0px 5px 0px 3px;
 }
 
+#signup-form input[type=number] {
+  padding-right: 0;
+  width: 96%;
+}
+
 #signup-form .fieldgroup {
   margin: 5px 10px;
 }
@@ -249,3 +257,15 @@
   content: '';
 }
 
+#signup-form div.custom-field.checkbox {
+  text-align: left;
+  padding: 10px 0;
+
+  label {
+    font-size: 20px;
+  }
+}
+
+#signup-form-profile {
+  margin-bottom: 10px;
+}



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

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/04c9efef0cef75aa9349f86023ea05f073294b1b
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/20170616/30c3fad8/attachment-0001.html>