sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

FogBugz #128: Login-Form nach Bootstrap-Umstellung wieder passabel machen.

Browse source
This commit is contained in:
Roland Jesse 2012-06-07 23:38:32 +02:00
parent 5f073c02f2
commit 785336af0f
5 changed files with 60 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/application.css.scss
View file

@ -1,4 +1,4 @@
//@import "bourbon";
@import "layout";
//@import "big_form";
@import "bootstrap_and_overrides";
@import "layout";

2
app/assets/stylesheets/bootstrap_and_overrides.css.scss vendored
View file

@ -3,7 +3,9 @@ $iconSpritePath: image-path('glyphicons-halflings.png');
$iconWhiteSpritePath: image-path('glyphicons-halflings-white.png');
// Colours.
$blue: #048abf;
$grayLight: #999;
$grayBackground: #f9f9f9;
$orange: #ed8200;
$orangeLight: lighten($orange, 10%);
$orangeText: #fddfbf;

105
app/assets/stylesheets/layout.css.scss
View file

@ -216,68 +216,53 @@ font-weight: 400;
.login {
margin-top: 50px;
}
#user_new {
background-attachment: scroll;
background-clip: border-box;
background-color: #ffffff;
background-image: none;
background-origin: padding-box;
background-position: 0% 0%;
background-repeat: repeat;
background-size: auto;
border-bottom-color: #e5e5e5;
border-bottom-left-radius: 11px;
border-bottom-right-radius: 11px;
border-bottom-style: solid;
border-bottom-width: 1px;
border-left-color: #e5e5e5;
border-left-style: solid;
border-left-width: 1px;
border-right-color: #e5e5e5;
border-right-style: solid;
border-right-width: 1px;
border-top-color: #e5e5e5;
border-top-left-radius: 11px;
border-top-right-radius: 11px;
border-top-style: solid;
border-top-width: 1px;
box-shadow: 0px 4px 18px;
font-weight: 400;
margin-left: 8px;
padding-bottom: 40px;
padding-left: 16px;
padding-right: 16px;
padding-top: 16px;
form fieldset.login {
background-color: $grayBackground;
border: 1px solid;
border-color: $blue;
-webkit-border-radius: 15;
-moz-border-radius: 15;
border-radius: 15;
margin-left: auto;
margin-right: auto;
padding-left: 10px;
padding-top: 10px;
padding-right: 10px;
width: 430px;
}
.form-actions {
background-color: inherit;
padding-left: inherit;
}
#user_email, #user_password {
background-attachment: scroll;
background-clip: border-box;
background-color: #fbfbfb;
background-image: none;
background-origin: padding-box;
background-position: 0% 0%;
background-repeat: repeat;
background-size: auto;
border-bottom-color: #e5e5e5;
border-bottom-style: solid;
border-bottom-width: 1px;
border-left-color: #e5e5e5;
border-left-style: solid;
border-left-width: 1px;
border-right-color: #e5e5e5;
border-right-style: solid;
border-right-width: 1px;
border-top-color: #e5e5e5;
border-top-style: solid;
border-top-width: 1px;
font-size: 24px;
margin-bottom: 16px;
margin-right: 6px;
margin-top: 2px;
padding-bottom: 3px;
padding-left: 3px;
padding-right: 3px;
padding-top: 3px;
/* background-attachment: scroll; */
/* background-clip: border-box; */
/* background-color: #fbfbfb; */
/* background-image: none; */
/* background-origin: padding-box; */
/* background-position: 0% 0%; */
/* background-repeat: repeat; */
/* background-size: auto; */
/* border-bottom-color: #e5e5e5; */
/* border-bottom-style: solid; */
/* border-bottom-width: 1px; */
/* border-left-color: #e5e5e5; */
/* border-left-style: solid; */
/* border-left-width: 1px; */
/* border-right-color: #e5e5e5; */
/* border-right-style: solid; */
/* border-right-width: 1px; */
/* border-top-color: #e5e5e5; */
/* border-top-style: solid; */
/* border-top-width: 1px; */
/* font-size: 24px; */
/* margin-bottom: 16px; */
/* margin-right: 6px; */
/* margin-top: 2px; */
/* padding-bottom: 3px; */
/* padding-left: 3px; */
/* padding-right: 3px; */
/* padding-top: 3px; */
width: 97%;
}
#login_links {

18
app/views/devise/sessions/new.html.erb
View file

@ -1,14 +1,15 @@
<% title "Sign in" %>
<div class="row">
<div class="span4 offset4">
<div class="span12">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<fieldset>
<fieldset class="login">
<div class="control-group">
<%= label_tag(:email, "Email", :class => "control-label") %>
<%= label_tag(:email, "Sign in with your email address", :class => "control-label") %>
<div class="controls"><%= f.email_field :email, :class => "input-xlarge" %></div>
</div>
<div class="control-group">
<%= label_tag(:password, "Password", :class => "control-label") %>
<%= label_tag(:password, "And password", :class => "control-label") %>
<div class="controls"><%= f.password_field :password, :class => "input-small" %></div>
</div>
@ -16,16 +17,17 @@
<div class="control-group">
<div class="controls">
<label class="checkbox">
<%= check_box_tag(:remember_me) %>
Remember me
<%= check_box_tag(:remember_me, 1, true) %>
Stay signed in on this computer
</label>
</div>
</div>
<% end -%>
<div class="form-actions">
<%= f.submit("Sign in", :class => "btn btn-primary") %>
<%= render :partial => "devise/shared/links" %>
<%= f.submit("Sign in", :class => "btn") %>
<br />
Don't remember your password? <%= render :partial => "devise/shared/links" %>
</div>
</fieldset>
<% end %>

4
app/views/devise/shared/_links.erb
View file

@ -7,7 +7,7 @@
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
<%= link_to "Email reset password instructions.", new_password_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
@ -22,4 +22,4 @@
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
<% end -%>
<% end -%>