From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 13 May 2011 20:34:35 +0000 (-0500)
Subject: Added @font-face to css
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cb1e4a3d1f04ef9e7df47ec9ee6b075f264f57d6;p=mediagoblin.git

Added @font-face to css
---

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 3b6abd3e..169394d0 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -7,6 +7,17 @@ body {
     margin:0px;
 }
 
+/* Carter One font */
+
+@font-face {
+  font-family: 'Carter One';
+  font-style: normal;
+  font-weight: normal;
+  src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff');
+}
+
+/* text styles */
+
 h1 {
     font-family: 'Carter One', arial, serif;
     margin-bottom: 20px;
diff --git a/mediagoblin/static/css/base.css~ b/mediagoblin/static/css/base.css~
index 3b6abd3e..169394d0 100644
--- a/mediagoblin/static/css/base.css~
+++ b/mediagoblin/static/css/base.css~
@@ -7,6 +7,17 @@ body {
     margin:0px;
 }
 
+/* Carter One font */
+
+@font-face {
+  font-family: 'Carter One';
+  font-style: normal;
+  font-weight: normal;
+  src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff');
+}
+
+/* text styles */
+
 h1 {
     font-family: 'Carter One', arial, serif;
     margin-bottom: 20px;