From d1176f546aa621bd49e83977d24c2c5fc53bf00a Mon Sep 17 00:00:00 2001
From: Morris Jobke <morris.jobke@gmail.com>
Date: Wed, 4 Jun 2014 10:57:49 +0200
Subject: move from tff to woff and fix IE8

---
 core/css/fixes.css  |  8 +++++++-
 core/css/fonts.css  | 10 ++++++----
 core/css/styles.css |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'core/css')

diff --git a/core/css/fixes.css b/core/css/fixes.css
index 0f18f0a56cd..8294f5cce7f 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -10,6 +10,11 @@ select {
 	height: 32px;
 }
 
+/* reset typeface for IE8 because OpenSans renders too small */
+.ie body {
+    font-family: Frutiger, Calibri, 'Myriad Pro', Myriad, Arial, sans-serif;
+}
+
 .lte8 .delete-icon { background-image: url('../img/actions/delete.png'); }
 .lte8 .delete-icon:hover, .delete-icon:focus {
 	background-image: url('../img/actions/delete-hover.png');
@@ -76,7 +81,7 @@ select {
 
 /* IE8 isn't able to display transparent background. So it is specified using a gradient */
 .ie8 #nojavascript {
-	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000'); /* IE */
+	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#4c320000', endColorstr='#4c320000');
 }
 
 /* IE8 doesn't have rounded corners, so the strengthify bar should be wider */
@@ -84,3 +89,4 @@ select {
 	width: 271px;
 	left: 6px;
 }
+
diff --git a/core/css/fonts.css b/core/css/fonts.css
index 01ecea73796..aa6e71bef21 100644
--- a/core/css/fonts.css
+++ b/core/css/fonts.css
@@ -1,11 +1,13 @@
 @font-face {
-	font-family: 'OpenSans';
+	font-family: 'Open Sans';
+	font-style: normal;
 	font-weight: normal;
-	src: url(../fonts/OpenSans-Regular.ttf);
+	src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.woff) format('woff');
 }
 
 @font-face {
-	font-family: 'OpenSans';
+	font-family: 'Open Sans';
+	font-style: normal;
 	font-weight: bold;
-	src: url(../fonts/OpenSans-Bold.ttf);
+	src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/OpenSans-Bold.woff) format('woff');
 }
\ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index 7ae1da0062f..3eb9a27ed9e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -19,7 +19,7 @@ body {
 	font-weight: normal;
 	font-size: .8em;
 	line-height: 1.6em;
-	font-family: 'OpenSans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
 	color: #000;
 	height: auto;
 }
-- 
cgit v1.2.3