Merge pull request #244 from warpc/230-registration_page

[Refs #230] fix forgot password SignUp style
This commit is contained in:
Vladimir Sharshov 2012-02-29 11:56:56 -08:00
commit a7155ac522
4 changed files with 18 additions and 3 deletions

View File

@ -0,0 +1,15 @@
@import "registration";
nav {
width: 96px;
height: 47px;
background: image-url("registration.png") no-repeat;
float: right;
cursor: pointer;
a {
font-size: 14px;
color: #FFF;
margin: 0;
padding: 0;
padding-top: 10px;
text-decoration: none;} }

View File

@ -224,4 +224,4 @@ div.error {
div.error.forgot {
margin-top: 8px;
margin-left: 308px; }
margin-left: 308px; }

View File

@ -7,7 +7,7 @@
= stylesheet_link_tag "login"
= javascript_include_tag "login"
- elsif ['registrations', 'passwords'].include?(controller_name) && ['new', 'create'].include?(action_name)
= stylesheet_link_tag "registration"
= stylesheet_link_tag "reg_session"
= csrf_meta_tag
%body

View File

@ -62,7 +62,7 @@ Rosa::Application.configure do
config.assets.digest = true
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
config.assets.precompile += %w(login.css login.js registration.css)
config.assets.precompile += %w(login.css login.js reg_session.css)
end
# require 'stub_xml_rpc'