diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index a8dc35d..1691e6e 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -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); -} diff --git a/app/views/contacts/show.html.erb b/app/views/contacts/show.html.erb index b450069..687ab0b 100644 --- a/app/views/contacts/show.html.erb +++ b/app/views/contacts/show.html.erb @@ -1,14 +1,14 @@
-
+
<%= link_to 'edit', edit_contact_path %>
-
+
-
+
<%= @contact.firstname %> <%= @contact.lastname %>
<%= @contact.birth_date_string %> @@ -34,5 +34,5 @@
...
-
 
+
 
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index bf654c7..4ae218d 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,18 +1,33 @@
- diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 4e48362..7e127f7 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,3 +1,3 @@ © 2012 Tailorama · - imprint + Impressum diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b186f58..a5ac74f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -4,6 +4,9 @@ + <%= content_for?(:title) ? yield(:title) : "Contact-o-Rama" %>