Permalink
Browse files

Merge branch 'master' of heroku.com:simple-ice-37

  • Loading branch information...
fd committed Apr 29, 2010
2 parents 29f97ba + 807ba8e commit 4a693bbc1e4778e2536e879827269ca92c69521d
Showing with 20 additions and 7 deletions.
  1. +1 −1 app/models/notifier.rb
  2. +9 −2 app/styles/lib/base.sass
  3. +2 −2 app/views/shared/_header.html.haml
  4. +8 −2 public/stylesheets/application.css
View
@@ -30,7 +30,7 @@ def occurence_report(user, occurence, sent_at = Time.now)
def password_reset_instructions(user, sent_at = Time.now)
subject "Failtale password reset instructions"
recipients user.email
- from 'yves@mrhenry.be'
+ from 'robot@failtale.be'
sent_on sent_at
body :edit_password_reset_url => edit_password_reset_url(user.perishable_token)
View
@@ -77,8 +77,15 @@ body
:height 116px
h2
- :height 0
- :width 0
+ :position absolute
+ :top 0
+ :left 0
+ a
+ :display block
+ :height 160px
+ :width 160px
+ :text-indent -8888px
+
#content
:float left
@@ -1,2 +1,2 @@
-%h1= link_to 'Failtale', root_path
-%h2 Telling you more about failing applications
+%h1= link_to 'Failtale', root_path, :title => 'Go back to the homepage'
+%h2= link_to 'Telling you more about failing applications', root_path, :title => 'Let me take you back to my roots'
@@ -128,8 +128,14 @@ body {
width: 257px;
height: 116px; }
#container #header h2 {
- height: 0;
- width: 0; }
+ position: absolute;
+ top: 0;
+ left: 0; }
+ #container #header h2 a {
+ display: block;
+ height: 160px;
+ width: 160px;
+ text-indent: -8888px; }
#container #content {
float: left;
width: 745px; }

0 comments on commit 4a693bb

Please sign in to comment.