Commit b9ebc3cec1d61652fb4d1c8624184e33d712f081

Authored by Rodrigo Souto
2 parents 2325237c d40ffa50

Merge branch 'signup-screen' of https://gitlab.com/juniorsilva1001/noosfero into…

… juniorsilva1001/noosfero-signup-screen
app/views/account/_signup_form.rhtml
@@ -128,8 +128,6 @@ @@ -128,8 +128,6 @@
128 <script type="text/javascript"> 128 <script type="text/javascript">
129 jQuery(function($) { 129 jQuery(function($) {
130 130
131 - $('#signup-form #user_login').css('width', 335 - $('#signup-domain').outerWidth());  
132 -  
133 $('#signup-form input[type=text], #signup-form textarea').each(function() { 131 $('#signup-form input[type=text], #signup-form textarea').each(function() {
134 $(this).bind('blur', function() { 132 $(this).bind('blur', function() {
135 if ($(this).val() == '') { 133 if ($(this).val() == '') {
public/stylesheets/application.css
@@ -6049,8 +6049,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6049,8 +6049,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6049 clear: both; 6049 clear: both;
6050 } 6050 }
6051 6051
  6052 +.action-account-signup #content {
  6053 + text-align: center;
  6054 +}
  6055 +
6052 #signup-form { 6056 #signup-form {
6053 color: #4A4A4A; 6057 color: #4A4A4A;
  6058 + display: inline-block;
6054 } 6059 }
6055 6060
6056 #signup-form small { 6061 #signup-form small {
@@ -6066,26 +6071,24 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6066,26 +6071,24 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6066 } 6071 }
6067 6072
6068 #signup-form input.invalid_input { 6073 #signup-form input.invalid_input {
6069 - border: 2px solid #7f0000; 6074 + border: 1px solid #7f0000;
6070 background: #FFF; 6075 background: #FFF;
6071 - padding: 5px 30px 8px 5px; 6076 + box-shadow: 0 0 7px red;
6072 } 6077 }
6073 6078
6074 #signup-form input.valid_input { 6079 #signup-form input.valid_input {
6075 - border: 2px solid #005000; 6080 + border: 1px solid #005000;
6076 background: #FFF; 6081 background: #FFF;
6077 - padding: 5px 30px 8px 5px;  
6078 } 6082 }
6079 6083
6080 #signup-form select, 6084 #signup-form select,
6081 #signup-form textarea, 6085 #signup-form textarea,
6082 #signup-form input { 6086 #signup-form input {
6083 - padding: 7px 30px 10px 7px; 6087 + padding: 7px 7% 10px 3%;
6084 height: 20px; 6088 height: 20px;
6085 - width: 335px; 6089 + width: 90%;
6086 color: #6d786e; 6090 color: #6d786e;
6087 font-size: 18px; 6091 font-size: 18px;
6088 - margin: 1px 14px 5px;  
6089 } 6092 }
6090 6093
6091 #signup-form #profile_data_login { 6094 #signup-form #profile_data_login {
@@ -6096,13 +6099,18 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6096,13 +6099,18 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6096 #signup-form .invalid, 6099 #signup-form .invalid,
6097 #signup-form input.validated, 6100 #signup-form input.validated,
6098 #signup-form .checking { 6101 #signup-form .checking {
6099 - border-width: 2px; 6102 + border-width: 1px;
6100 border-style: solid; 6103 border-style: solid;
6101 background-color: #fff; 6104 background-color: #fff;
6102 background-position: right center; 6105 background-position: right center;
6103 background-repeat: no-repeat; 6106 background-repeat: no-repeat;
6104 - padding: 5px 30px 8px 5px; 6107 + padding: 7px 7% 8px 3%;
6105 color: #4A4A4A; 6108 color: #4A4A4A;
  6109 + box-shadow: 0 0 7px green;
  6110 +}
  6111 +
  6112 +#signup-form input.checking {
  6113 + box-shadow: none;
6106 } 6114 }
6107 6115
6108 #signup-form select { 6116 #signup-form select {
@@ -6172,6 +6180,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6172,6 +6180,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6172 #signup-form .invalid { 6180 #signup-form .invalid {
6173 border-color: #7f0000; 6181 border-color: #7f0000;
6174 background-image: url(/images/passwords_nomatch.png); 6182 background-image: url(/images/passwords_nomatch.png);
  6183 + box-shadow: 0 0 7px red;
6175 } 6184 }
6176 6185
6177 #signup-form span.invalid { 6186 #signup-form span.invalid {
@@ -6179,6 +6188,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6179,6 +6188,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6179 padding: 0px; 6188 padding: 0px;
6180 background: transparent; 6189 background: transparent;
6181 color: #7f0000; 6190 color: #7f0000;
  6191 + box-shadow: none;
6182 } 6192 }
6183 6193
6184 #signup-form .checking { 6194 #signup-form .checking {
@@ -6191,6 +6201,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6191,6 +6201,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6191 padding: 0px; 6201 padding: 0px;
6192 background: transparent; 6202 background: transparent;
6193 color: #4A4A4A; 6203 color: #4A4A4A;
  6204 + box-shadow: none;
6194 } 6205 }
6195 6206
6196 #signup-form .validated { 6207 #signup-form .validated {
@@ -6214,18 +6225,23 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6214,18 +6225,23 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6214 color: #4A4A4A; 6225 color: #4A4A4A;
6215 font-size: 20px; 6226 font-size: 20px;
6216 text-transform: lowercase; 6227 text-transform: lowercase;
6217 - margin-left: 14px; 6228 + min-width: 190px;
6218 } 6229 }
6219 6230
6220 #signup-form #signup-form-header #user_login { 6231 #signup-form #signup-form-header #user_login {
6221 margin: 0; 6232 margin: 0;
6222 padding-right: 30px; 6233 padding-right: 30px;
  6234 + width: 150px;
6223 } 6235 }
6224 6236
6225 #signup-login-field { 6237 #signup-login-field {
6226 float: left; 6238 float: left;
6227 } 6239 }
6228 6240
  6241 +#signup-form #signup-login {
  6242 + display: inline-block;
  6243 +}
  6244 +
6229 #signup-form #signup-password, 6245 #signup-form #signup-password,
6230 #signup-form #signup-password-confirmation, 6246 #signup-form #signup-password-confirmation,
6231 #signup-form #signup-email, 6247 #signup-form #signup-email,
@@ -6270,7 +6286,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6270,7 +6286,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6270 color: #4A4A4A; 6286 color: #4A4A4A;
6271 font-size: 20px; 6287 font-size: 20px;
6272 font-weight: normal; 6288 font-weight: normal;
6273 - margin-left: 15px; 6289 + text-align: left;
6274 } 6290 }
6275 6291
6276 #signup-form .required-field label::after { 6292 #signup-form .required-field label::after {
@@ -6327,11 +6343,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { @@ -6327,11 +6343,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6327 margin-right: 0px; 6343 margin-right: 0px;
6328 } 6344 }
6329 6345
6330 -.action-account-signup .no-boxes form {  
6331 - margin-left: 247px;  
6332 - margin-right: 247px;  
6333 -}  
6334 -  
6335 .select-birth-date { 6346 .select-birth-date {
6336 margin-left: 14px; 6347 margin-left: 14px;
6337 } 6348 }