Minor UI fixes for login page

Dmitriy Zaporozhets
1 parent 083990c7
Showing 5 changed files with 14 additions and 21 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/sections/login.scss
app/views/devise/passwords/new.html.haml
app/views/devise/sessions/_new_base.html.haml
app/views/devise/sessions/new.html.haml
@@ -193,19 +193,6 @@ li.note {
   }
 }
  
-.remember_me {
-  text-align: left;
-
-  input {
-    margin: 0;
-  }
-
-  span {
-    padding-left: 5px;
-  }
-}
-
-
 .rss-icon {
   img {
     width: 24px;
@@ -217,7 +204,6 @@ li.note {
   }
 }
  
-
 .supp_diff_link,
 .show-all-commits {
   cursor: pointer;
 /* Login Page */
 body.login-page{
   background: #474D57;
-  .container .content { padding-top: 5%; }
+  .container .content { padding-top: 4%; }
 }
  
 .login-box{
@@ -37,3 +37,11 @@ body.login-page{
 }
  
 .login-box a.forgot{float: right; padding-top: 6px}
+
+.remember_me {
+  text-align: left;
+
+  input {
+    margin: 2px;
+  }
+}
 = form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do |f|
   %h3.page-title Reset password
-  %br
   = devise_error_messages!
   = f.email_field :email, placeholder: "Email",  class: "text"
   %br/
@@ -2,12 +2,13 @@
   = f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
   = f.password_field :password, class: "text bottom", placeholder: "Password"
   - if devise_mapping.rememberable?
-    .clearfix.inputs-list
+    .clearfix.append-bottom-10
       %label.checkbox.remember_me{for: "user_remember_me"}
         = f.check_box :remember_me
         %span Remember me
-  = f.submit "Sign in", class: "btn-create btn"
-  .pull-right
-    = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
+  %div
+    = f.submit "Sign in", class: "btn-create btn"
+    .pull-right
+      = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
  
  
 .login-box
   %h3.page-title Sign in
-  %br
   - if ldap_enabled?
     %ul.nav.nav-tabs
       %li.active
...	...	@@ -193,19 +193,6 @@ li.note {
193	193	}
194	194	}
195	195
196		-.remember_me {
197		- text-align: left;
198		-
199		- input {
200		- margin: 0;
201		- }
202		-
203		- span {
204		- padding-left: 5px;
205		- }
206		-}
207		-
208		-
209	196	.rss-icon {
210	197	img {
211	198	width: 24px;
...	...	@@ -217,7 +204,6 @@ li.note {
217	204	}
218	205	}
219	206
220		-
221	207	.supp_diff_link,
222	208	.show-all-commits {
223	209	cursor: pointer;
...	...
1	1	/* Login Page */
2	2	body.login-page{
3	3	background: #474D57;
4		- .container .content { padding-top: 5%; }
	4	+ .container .content { padding-top: 4%; }
5	5	}
6	6
7	7	.login-box{
...	...	@@ -37,3 +37,11 @@ body.login-page{
37	37	}
38	38
39	39	.login-box a.forgot{float: right; padding-top: 6px}
	40	+
	41	+.remember_me {
	42	+ text-align: left;
	43	+
	44	+ input {
	45	+ margin: 2px;
	46	+ }
	47	+}
...	...
1	1	= form_for(resource, as: resource_name, url: password_path(resource_name), html: { class: "login-box", method: :post }) do \|f\|
2	2	%h3.page-title Reset password
3		- %br
4	3	= devise_error_messages!
5	4	= f.email_field :email, placeholder: "Email", class: "text"
6	5	%br/
...	...
...	...	@@ -2,12 +2,13 @@
2	2	= f.text_field :login, class: "text top", placeholder: "Username or Email", autofocus: "autofocus"
3	3	= f.password_field :password, class: "text bottom", placeholder: "Password"
4	4	- if devise_mapping.rememberable?
5		- .clearfix.inputs-list
	5	+ .clearfix.append-bottom-10
6	6	%label.checkbox.remember_me{for: "user_remember_me"}
7	7	= f.check_box :remember_me
8	8	%span Remember me
9		- = f.submit "Sign in", class: "btn-create btn"
10		- .pull-right
11		- = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
	9	+ %div
	10	+ = f.submit "Sign in", class: "btn-create btn"
	11	+ .pull-right
	12	+ = link_to "Forgot your password?", new_password_path(resource_name), class: "btn"
12	13
13	14
...	...
1	1	.login-box
2	2	%h3.page-title Sign in
3		- %br
4	3	- if ldap_enabled?
5	4	%ul.nav.nav-tabs
6	5	%li.active
...	...