Download as
Browse Code »

Commit b9ebc3cec1d61652fb4d1c8624184e33d712f081

Authored by Rodrigo Souto
2 parents 2325237c d40ffa50
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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

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