Skip to content

Commit

Permalink
Added new fun font :-)
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieu committed Sep 30, 2011
1 parent e6dd3cc commit 83eda8d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<!-- Combo-handled YUI JS files: -->
<script type="text/javascript" src="http://yui.yahooapis.com/combo?2.9.0/build/yahoo-dom-event/yahoo-dom-event.js&2.9.0/build/container/container_core-min.js&2.9.0/build/menu/menu-min.js"></script>
<link href='http://fonts.googleapis.com/css?family=Marvel:700' rel='stylesheet' type='text/css'>
<link href='http://fonts.googleapis.com/css?family=Fontdiner+Swanky' rel='stylesheet' type='text/css'>


<%= stylesheet_link_tag :all %>
<%= javascript_include_tag :defaults %>
Expand All @@ -34,7 +36,7 @@
<% end %>
</div>

<h1><%= link_to 'BROUZOUF', root_path %></h1>
<h1><%= link_to 'Brouzouf', root_path %></h1>

</div>

Expand Down
2 changes: 1 addition & 1 deletion public/stylesheets/fonts_and_colors.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ input[type="submit"] {

/*Header*/
#hd { background-color: #C7FF96; }
#hd h1 {color: #5F7A47; font-size: 3.4em; font-family: 'Marvel', sans-serif; padding: 5px; margin: 0}
#hd h1 {color: #5F7A47; font-size: 3.4em; font-family: /*'Marvel'*/ 'Fontdiner Swanky', sans-serif; padding: 5px; margin: 0}
#hd h1 a {color: inherit; text-decoration: none;}
#hd #sign { margin: 35px 5px 0 0;}

Expand Down

0 comments on commit 83eda8d

Please sign in to comment.