From 80627dfd2c35f7a23bdc4d649b25fb61218307ca Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 3 Jun 2014 19:07:08 +0200 Subject: use Open Sans as typeface --- core/css/fonts.css | 11 +++++++++++ core/css/styles.css | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 core/css/fonts.css (limited to 'core/css') diff --git a/core/css/fonts.css b/core/css/fonts.css new file mode 100644 index 00000000000..01ecea73796 --- /dev/null +++ b/core/css/fonts.css @@ -0,0 +1,11 @@ +@font-face { + font-family: 'OpenSans'; + font-weight: normal; + src: url(../fonts/OpenSans-Regular.ttf); +} + +@font-face { + font-family: 'OpenSans'; + font-weight: bold; + src: url(../fonts/OpenSans-Bold.ttf); +} \ No newline at end of file diff --git a/core/css/styles.css b/core/css/styles.css index a9ffd83629b..9aaac440cbf 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -16,7 +16,10 @@ ul { list-style:none; } body { background: #fefefe; - font: normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; + font-weight: normal; + font-size: .8em; + line-height: 1.6em; + font-family: 'OpenSans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; color: #000; height: auto; } -- cgit v1.2.3 From 29c5ec4fa6be571754aad42272e14e6cff2d353c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 3 Jun 2014 19:12:31 +0200 Subject: do not use italic typeface style, instead lighter color --- core/css/apps.css | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'core/css') diff --git a/core/css/apps.css b/core/css/apps.css index 83569398cec..60a0e2809cf 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -278,3 +278,12 @@ button.loading { .appear.transparent { opacity: 0; } + + +/* do not use italic typeface style, instead lighter color */ +em { + font-style: normal; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} -- cgit v1.2.3 From 0ec3f1dd2d523c4ae337f5fb9d7a0517b1765810 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 3 Jun 2014 20:02:50 +0200 Subject: unbold the username --- core/css/styles.css | 1 - 1 file changed, 1 deletion(-) (limited to 'core/css') diff --git a/core/css/styles.css b/core/css/styles.css index 9aaac440cbf..7ae1da0062f 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -811,7 +811,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } display: block; padding: 7px 12px 6px 7px; cursor: pointer; - font-weight: bold; } #expand:hover, #expand:focus, #expand:active { color:#fff; } #expand img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; margin-bottom:-2px; } -- cgit v1.2.3 From d1176f546aa621bd49e83977d24c2c5fc53bf00a Mon Sep 17 00:00:00 2001 From: Morris Jobke 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 +- core/fonts/OpenSans-Bold.ttf | Bin 224592 -> 0 bytes core/fonts/OpenSans-Bold.woff | Bin 0 -> 21272 bytes core/fonts/OpenSans-Regular.ttf | Bin 217360 -> 0 bytes core/fonts/OpenSans-Regular.woff | Bin 0 -> 20544 bytes 7 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 core/fonts/OpenSans-Bold.ttf create mode 100644 core/fonts/OpenSans-Bold.woff delete mode 100644 core/fonts/OpenSans-Regular.ttf create mode 100644 core/fonts/OpenSans-Regular.woff (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; } diff --git a/core/fonts/OpenSans-Bold.ttf b/core/fonts/OpenSans-Bold.ttf deleted file mode 100644 index fd79d43bea0..00000000000 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 00000000000..ee2ea797d1c 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 db433349b70..00000000000 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 00000000000..2abc3ed69fd Binary files /dev/null and b/core/fonts/OpenSans-Regular.woff differ -- cgit v1.2.3 From d3128f0694b8617d90dd8ee90937fb76bafe6c87 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 4 Jun 2014 11:07:28 +0200 Subject: IE -> IE8 only --- core/css/fixes.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/css') diff --git a/core/css/fixes.css b/core/css/fixes.css index 8294f5cce7f..d3557494952 100644 --- a/core/css/fixes.css +++ b/core/css/fixes.css @@ -11,7 +11,7 @@ select { } /* reset typeface for IE8 because OpenSans renders too small */ -.ie body { +.ie8 body { font-family: Frutiger, Calibri, 'Myriad Pro', Myriad, Arial, sans-serif; } -- cgit v1.2.3