diff --git a/core/css/fixes.css b/core/css/fixes.css index 0f18f0a56cd0ad5c8337afd48c374c941d5cc3d4..8294f5cce7f7a014fb8a6311538ab867a97caf70 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 01ecea737969b1182caf3f2ee5c15aed47781a51..aa6e71bef21fa77a3ede9daa76c75cf56fa91073 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 7ae1da0062f9951d0b32a5f18b65444b449ae0ab..3eb9a27ed9e32c6c64d41e81d0c528760c63206d 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 fd79d43bea0293ac1b20e8aca1142627983d2c07..0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..ee2ea797d1c4910f0eef8c06a37dfb4df72a2904 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 db433349b7047f72f40072630c1bc110620bf09e..0000000000000000000000000000000000000000 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 0000000000000000000000000000000000000000..2abc3ed69fd619c57169a7515ea0b4481dfbf2a0 Binary files /dev/null and b/core/fonts/OpenSans-Regular.woff differ