Commit 966f2e5cf97c60215fcbbcdd2262044d4352ad85
1 parent
ac370ca2
Exists in
master
and in
28 other branches
signup-screen: fixed line break in username field
AI2515
Showing
2 changed files
with
22 additions
and
15 deletions
Show diff stats
app/views/account/_signup_form.rhtml
| @@ -128,7 +128,7 @@ | @@ -128,7 +128,7 @@ | ||
| 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()); | 131 | + //$('#signup-form #user_login').css('width', 350 - $('#signup-domain').outerWidth()); |
| 132 | 132 | ||
| 133 | $('#signup-form input[type=text], #signup-form textarea').each(function() { | 133 | $('#signup-form input[type=text], #signup-form textarea').each(function() { |
| 134 | $(this).bind('blur', function() { | 134 | $(this).bind('blur', function() { |
public/stylesheets/application.css
| @@ -6024,8 +6024,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6024,8 +6024,13 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6024 | clear: both; | 6024 | clear: both; |
| 6025 | } | 6025 | } |
| 6026 | 6026 | ||
| 6027 | +.action-account-signup #content { | ||
| 6028 | + text-align: center; | ||
| 6029 | +} | ||
| 6030 | + | ||
| 6027 | #signup-form { | 6031 | #signup-form { |
| 6028 | color: #4A4A4A; | 6032 | color: #4A4A4A; |
| 6033 | + display: inline-block; | ||
| 6029 | } | 6034 | } |
| 6030 | 6035 | ||
| 6031 | #signup-form small { | 6036 | #signup-form small { |
| @@ -6041,26 +6046,26 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6041,26 +6046,26 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6041 | } | 6046 | } |
| 6042 | 6047 | ||
| 6043 | #signup-form input.invalid_input { | 6048 | #signup-form input.invalid_input { |
| 6044 | - border: 2px solid #7f0000; | 6049 | + border: 1px solid #7f0000; |
| 6045 | background: #FFF; | 6050 | background: #FFF; |
| 6046 | - padding: 5px 30px 8px 5px; | 6051 | + box-shadow: 0 0 7px red; |
| 6052 | + /* padding: 5px 30px 8px 5px; */ | ||
| 6047 | } | 6053 | } |
| 6048 | 6054 | ||
| 6049 | #signup-form input.valid_input { | 6055 | #signup-form input.valid_input { |
| 6050 | border: 2px solid #005000; | 6056 | border: 2px solid #005000; |
| 6051 | background: #FFF; | 6057 | background: #FFF; |
| 6052 | - padding: 5px 30px 8px 5px; | 6058 | +/* padding: 5px 30px 8px 5px; */ |
| 6053 | } | 6059 | } |
| 6054 | 6060 | ||
| 6055 | #signup-form select, | 6061 | #signup-form select, |
| 6056 | #signup-form textarea, | 6062 | #signup-form textarea, |
| 6057 | #signup-form input { | 6063 | #signup-form input { |
| 6058 | - padding: 7px 30px 10px 7px; | 6064 | + padding: 7px 7% 10px 3%; |
| 6059 | height: 20px; | 6065 | height: 20px; |
| 6060 | - width: 335px; | 6066 | + width: 90%; |
| 6061 | color: #6d786e; | 6067 | color: #6d786e; |
| 6062 | font-size: 18px; | 6068 | font-size: 18px; |
| 6063 | - margin: 1px 14px 5px; | ||
| 6064 | } | 6069 | } |
| 6065 | 6070 | ||
| 6066 | #signup-form #profile_data_login { | 6071 | #signup-form #profile_data_login { |
| @@ -6076,8 +6081,9 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6076,8 +6081,9 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6076 | background-color: #fff; | 6081 | background-color: #fff; |
| 6077 | background-position: right center; | 6082 | background-position: right center; |
| 6078 | background-repeat: no-repeat; | 6083 | background-repeat: no-repeat; |
| 6079 | - padding: 5px 30px 8px 5px; | 6084 | + padding: 5px 7% 8px 3%; |
| 6080 | color: #4A4A4A; | 6085 | color: #4A4A4A; |
| 6086 | + box-shadow: 0 0 7px green; | ||
| 6081 | } | 6087 | } |
| 6082 | 6088 | ||
| 6083 | #signup-form select { | 6089 | #signup-form select { |
| @@ -6147,6 +6153,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6147,6 +6153,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6147 | #signup-form .invalid { | 6153 | #signup-form .invalid { |
| 6148 | border-color: #7f0000; | 6154 | border-color: #7f0000; |
| 6149 | background-image: url(/images/passwords_nomatch.png); | 6155 | background-image: url(/images/passwords_nomatch.png); |
| 6156 | + box-shadow: 0 0 7px red; | ||
| 6150 | } | 6157 | } |
| 6151 | 6158 | ||
| 6152 | #signup-form span.invalid { | 6159 | #signup-form span.invalid { |
| @@ -6189,18 +6196,23 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6189,18 +6196,23 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6189 | color: #4A4A4A; | 6196 | color: #4A4A4A; |
| 6190 | font-size: 20px; | 6197 | font-size: 20px; |
| 6191 | text-transform: lowercase; | 6198 | text-transform: lowercase; |
| 6192 | - margin-left: 14px; | 6199 | + min-width: 190px; |
| 6193 | } | 6200 | } |
| 6194 | 6201 | ||
| 6195 | #signup-form #signup-form-header #user_login { | 6202 | #signup-form #signup-form-header #user_login { |
| 6196 | margin: 0; | 6203 | margin: 0; |
| 6197 | padding-right: 30px; | 6204 | padding-right: 30px; |
| 6205 | + width: 150px; | ||
| 6198 | } | 6206 | } |
| 6199 | 6207 | ||
| 6200 | #signup-login-field { | 6208 | #signup-login-field { |
| 6201 | float: left; | 6209 | float: left; |
| 6202 | } | 6210 | } |
| 6203 | 6211 | ||
| 6212 | +#signup-form #signup-login { | ||
| 6213 | + display: inline-block; | ||
| 6214 | +} | ||
| 6215 | + | ||
| 6204 | #signup-form #signup-password, | 6216 | #signup-form #signup-password, |
| 6205 | #signup-form #signup-password-confirmation, | 6217 | #signup-form #signup-password-confirmation, |
| 6206 | #signup-form #signup-email, | 6218 | #signup-form #signup-email, |
| @@ -6245,7 +6257,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6245,7 +6257,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6245 | color: #4A4A4A; | 6257 | color: #4A4A4A; |
| 6246 | font-size: 20px; | 6258 | font-size: 20px; |
| 6247 | font-weight: normal; | 6259 | font-weight: normal; |
| 6248 | - margin-left: 15px; | 6260 | + text-align: left; |
| 6249 | } | 6261 | } |
| 6250 | 6262 | ||
| 6251 | #signup-form .required-field label::after { | 6263 | #signup-form .required-field label::after { |
| @@ -6302,11 +6314,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | @@ -6302,11 +6314,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img { | ||
| 6302 | margin-right: 0px; | 6314 | margin-right: 0px; |
| 6303 | } | 6315 | } |
| 6304 | 6316 | ||
| 6305 | -.action-account-signup .no-boxes form { | ||
| 6306 | - margin-left: 247px; | ||
| 6307 | - margin-right: 247px; | ||
| 6308 | -} | ||
| 6309 | - | ||
| 6310 | .select-birth-date { | 6317 | .select-birth-date { |
| 6311 | margin-left: 14px; | 6318 | margin-left: 14px; |
| 6312 | } | 6319 | } |