Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
More font and display fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Damien Le Berrigaud committed Aug 5, 2012
1 parent b0f68cc commit 8e2a3de
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $(function() {
$dialog.dialog({
title: $(this).attr('title'),
width: 800,
height: 531,
height: 523,
beforeClose: function(event, ui) {
$(this).dialog('destroy');
}
Expand Down
23 changes: 15 additions & 8 deletions app/assets/stylesheets/base.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,14 @@ $hover-color: #ddd;
}

body {
font-family: 'Helvetica Neue' sans-serif;
font-size: .9em;
background-color: $black;
color: $white;
padding-bottom: 3em;
font-size: .8em;

* {
color: $white;
font-family: 'Helvetica Neue';
}
}

a, a:hover, a:visited, a:link, a:active {
Expand Down Expand Up @@ -299,15 +302,19 @@ form {
position: absolute;
bottom: 0;
width: 98%;
padding: 0 1%;
padding: 0;
margin: 0;

a, a:link {
color: #fff;
font-weight: normal;
font-family: 'Helvetica Neue' sans-serif;
}
font-family: 'Helvetica Neue';
padding: 1em;
display: block;
width: 10%;

.previous { float: left; }
.next { float: right; }
&.previous { float: left; }
&.next { float: right; }
}
}
}
2 changes: 1 addition & 1 deletion app/views/home/index.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%header
%h1 BERT
%h2 the emotion picture
= link_to 'Watch the Trailer', '#trailer', class: 'modal'
= link_to 'Watch the Trailer', '#trailer', class: 'modal', title: 'Trailer'
%p#notice= flash[:notice]

%nav#menu
Expand Down

0 comments on commit 8e2a3de

Please sign in to comment.