Do some more twitter bootstrapping.

This commit is contained in:
Roland Jesse 2012-05-30 23:39:10 +02:00
parent 497f8e391b
commit c64f91a545
5 changed files with 35 additions and 30 deletions

View file

@ -2,16 +2,3 @@
@import "layout";
//@import "big_form";
@import "bootstrap_and_overrides";
// Gray background for page content
.content {
background-color: #eee;
padding: 20px;
margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
-webkit-border-radius: 0 0 6px 6px;
-moz-border-radius: 0 0 6px 6px;
border-radius: 0 0 6px 6px;
-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
-moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
box-shadow: 0 1px 2px rgba(0,0,0,.15);
}

View file

@ -1,14 +1,14 @@
<div class="row">
<div class="twelvevol">
<div class="span12">
<div align="center">
<%= link_to 'edit', edit_contact_path %>
</div>
</div>
<div class="threecol show_picture">
<div class="span3 show_picture">
<img src="/images/dummy_buddy_l.png" />
</div>
<div class="sixcol">
<div class="span6">
<span id="show_name"><%= @contact.firstname %> <%= @contact.lastname %></span>
<br />
<span id="show_birthdate"><%= @contact.birth_date_string %></span>
@ -34,5 +34,5 @@
<br />
...
</div>
<div class="threecol">&nbsp;</div>
<div class="span3">&nbsp;</div>
</div>

View file

@ -1,18 +1,33 @@
<div class="row">
<div class="span4 offset4 login">
<div class="span4 offset4">
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
<p><%= f.label :email %><br />
<%= f.email_field :email %></p>
<fieldset>
<div class="control-group">
<%= label_tag(:email, "Email", :class => "control-label") %>
<div class="controls"><%= f.email_field :email, :class => "input-xlarge" %></div>
</div>
<p><%= f.label :password %><br />
<%= f.password_field :password %></p>
<div class="control-group">
<%= label_tag(:password, "Password", :class => "control-label") %>
<div class="controls"><%= f.password_field :password, :class => "input-small" %></div>
</div>
<% if devise_mapping.rememberable? -%>
<p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
<div class="control-group">
<div class="controls">
<label class="checkbox">
<%= check_box_tag(:remember_me) %>
Remember me
</label>
</div>
</div>
<% end -%>
<p><%= f.submit "Sign in" %></p>
<div class="form-actions">
<%= f.submit("Sign in", :class => "btn btn-primary") %>
<%= render :partial => "devise/shared/links" %>
</div>
</fieldset>
<% end %>
<p id="login_links"><%= render :partial => "devise/shared/links" %></p>
</div>
</div>

View file

@ -1,3 +1,3 @@
<span class="copyright">&copy; 2012 <a href="http://tailorama.com/">Tailorama</a></span>
&middot;
<span class="imprint"><a href="http://tailorama.de/impressum/">imprint</a></span>
<span class="imprint"><a href="http://tailorama.de/impressum/">Impressum</a></span>

View file

@ -4,6 +4,9 @@
<meta charset="utf-8" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<!--[if lt IE 9]>
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
<![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><%= content_for?(:title) ? yield(:title) : "Contact-o-Rama" %></title>
<meta name="description" content="The app for managing contacts. With Birthdays!">