Commit c55e0fdd
Changed files (4)
app
assets
images
views
devise
sessions
layouts
app/assets/images/bg-header.png
Binary file
app/assets/images/sunset.png
Binary file
app/views/devise/sessions/new.html.erb
@@ -1,8 +1,8 @@
<div class="row">
- <div class="span16" style="background: url(/assets/sunset.png) top center no-repeat #FBE47E;">
+ <div class="span16">
<div class="row">
<div class="span5">
- <div class="logo"><img src="/assets/cakeside-logo.png" width="100%"/></div>
+ <div class="logo"><a href="/"><img src="/assets/cakeside-logo.png" width="100%"/></a></div>
</div>
<div class="span5 offset6">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
@@ -16,16 +16,19 @@
<% end %>
</div>
</div>
+ <div class="row"> <div class="span16"> </div> </div>
+ <div class="row"> <div class="span16"> </div> </div>
+ <div class="row"> <div class="span16"> </div> </div>
<div class="row">
<div class="span10">
<%= devise_error_messages! %>
<h1>Follow your interests</h1>
- <p>Instant updates from your friends, industry experts, favorite celebrities, and what’s happening around the world.</p>
+ <p>Instant updates from your friends, industry experts, and what’s happening around the world.</p>
</div>
<div class="span5 offset1">
<h3>New to CakeSide? <em>Join Today!</em></h3>
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
- <p><%= f.text_field :name, :placeholder => 'Full Name', :class =>"xlarge"%></p>
+ <p><%= f.text_field :name, :placeholder => 'Full name', :class =>"xlarge"%></p>
<p><%= f.email_field :email, :placeholder => 'Email', :class=> "xlarge"%></p>
<p><%= f.password_field :password, :placeholder => 'Password', :class=> "xlarge"%></p>
<p><%= f.password_field :password_confirmation, :placeholder => 'Confirm Password', :class=> "xlarge"%></p>
@@ -34,7 +37,6 @@
</div>
</div>
</div>
- <div class="span16"> </div>
</div>
<!--
<h1>Sign in</h1>
app/views/layouts/blank.html.erb
@@ -8,15 +8,18 @@
<%= csrf_meta_tags %>
<%= javascript_include_tag "application" %>
</head>
- <body>
- <div class="container">
- <div class="content">
- <%= yield %>
- <footer>
- <p>© Cakeside 2011</p>
- </footer>
+ <%# <body style="background: url(/assets/sunset.png) no-repeat center 20px #FBE47E;">%>
+ <body style="background: url(/assets/bg-header.png) repeat-x center 0px #fff;">
+ <div style="background: url(/assets/sunset.png) no-repeat center 20px;">
+ <div class="container">
+ <div class="content">
+ <%= yield %>
+ <footer>
+ <p>© Cakeside 2011</p>
+ </footer>
+ </div>
+ </div> <!-- /container -->
</div>
- </div> <!-- /container -->
- <%= render "shared/google_analytics" %>
- </body>
-</html>
+ <%= render "shared/google_analytics" %>
+ </body>
+ </html>