diff --git a/core/css/fixes.css b/core/css/fixes.css index 0f18f0a56c..8294f5cce7 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 01ecea7379..aa6e71bef2 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 7ae1da0062..3eb9a27ed9 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; } diff --git a/core/fonts/OpenSans-Bold.ttf b/core/fonts/OpenSans-Bold.ttf deleted file mode 100644 index fd79d43bea..0000000000 Binary files a/core/fonts/OpenSans-Bold.ttf and /dev/null differ diff --git a/core/fonts/OpenSans-Bold.woff b/core/fonts/OpenSans-Bold.woff new file mode 100644 index 0000000000..ee2ea797d1 Binary files /dev/null and b/core/fonts/OpenSans-Bold.woff differ diff --git a/core/fonts/OpenSans-Regular.ttf b/core/fonts/OpenSans-Regular.ttf deleted file mode 100644 index db433349b7..0000000000 Binary files a/core/fonts/OpenSans-Regular.ttf and /dev/null differ diff --git a/core/fonts/OpenSans-Regular.woff b/core/fonts/OpenSans-Regular.woff new file mode 100644 index 0000000000..2abc3ed69f Binary files /dev/null and b/core/fonts/OpenSans-Regular.woff differ