Merge remote-tracking branch 'remotes/origin/master'

This commit is contained in:
Dorian 2013-08-12 14:15:44 -04:00
commit 31b4072218
2 changed files with 4 additions and 3 deletions

View File

@ -9,7 +9,7 @@
*/
/*** Fonts ***/
@header-title-font-family: "Raleway", sans-serif;
@header-title-font-family: "BonvenoCF", sans-serif;
@console-font-family: "Consola Mono", monospace;
@amber-penguin-yellow: #FFC200;

View File

@ -11,8 +11,9 @@
<!-- Switch between themes seamlessly. -->
<link rel="stylesheet" type="text/css" media="screen" ng-href="static/css/penguin-{{ theme.name }}-theme.css" />
<link rel="stylesheet" type="text/css" media="screen" href="http://openfontlibrary.org/face/Lavoir" />
<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Raleway" />
<link rel="stylesheet" type="text/css" media="screen" href="http://openfontlibrary.org/face/lavoir" />
<link rel="stylesheet" type="text/css" media="screen" href="http://openfontlibrary.org/face/benveno" />
<link rel="stylesheet" type="text/css" media="screen" href="http://openfontlibrary.org/face/consolamono" />
</head>
<body>