From eb33aae6614ce02b6a3748c9a6a79989c40317fc Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 10 Jul 2014 15:53:09 +0800 Subject: Bug 1026586: Using Fira as default font in Bugzilla --- skins/contrib/Mozilla/fira/FiraMono-Bold.woff | Bin 0 -> 70896 bytes skins/contrib/Mozilla/fira/FiraMono-Regular.woff | Bin 0 -> 66176 bytes skins/contrib/Mozilla/fira/FiraSans-Bold.woff | Bin 0 -> 88524 bytes .../contrib/Mozilla/fira/FiraSans-BoldItalic.woff | Bin 0 -> 93844 bytes skins/contrib/Mozilla/fira/FiraSans-Italic.woff | Bin 0 -> 88544 bytes skins/contrib/Mozilla/fira/FiraSans-Regular.woff | Bin 0 -> 83492 bytes skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff | Bin 0 -> 88208 bytes .../Mozilla/fira/FiraSans-SemiBoldItalic.woff | Bin 0 -> 93324 bytes skins/contrib/Mozilla/global.css | 84 ++++++++++++++++----- skins/contrib/Mozilla/opensans-bold.woff | Bin 22748 -> 0 bytes skins/contrib/Mozilla/opensans-semibold.woff | Bin 22604 -> 0 bytes skins/contrib/Mozilla/opensans.woff | Bin 21956 -> 0 bytes 12 files changed, 67 insertions(+), 17 deletions(-) create mode 100644 skins/contrib/Mozilla/fira/FiraMono-Bold.woff create mode 100644 skins/contrib/Mozilla/fira/FiraMono-Regular.woff create mode 100644 skins/contrib/Mozilla/fira/FiraSans-Bold.woff create mode 100644 skins/contrib/Mozilla/fira/FiraSans-BoldItalic.woff create mode 100644 skins/contrib/Mozilla/fira/FiraSans-Italic.woff create mode 100644 skins/contrib/Mozilla/fira/FiraSans-Regular.woff create mode 100644 skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff create mode 100644 skins/contrib/Mozilla/fira/FiraSans-SemiBoldItalic.woff delete mode 100644 skins/contrib/Mozilla/opensans-bold.woff delete mode 100644 skins/contrib/Mozilla/opensans-semibold.woff delete mode 100644 skins/contrib/Mozilla/opensans.woff diff --git a/skins/contrib/Mozilla/fira/FiraMono-Bold.woff b/skins/contrib/Mozilla/fira/FiraMono-Bold.woff new file mode 100644 index 000000000..0155c4800 Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraMono-Bold.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraMono-Regular.woff b/skins/contrib/Mozilla/fira/FiraMono-Regular.woff new file mode 100644 index 000000000..29db168f4 Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraMono-Regular.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraSans-Bold.woff b/skins/contrib/Mozilla/fira/FiraSans-Bold.woff new file mode 100644 index 000000000..404f7cfd2 Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraSans-Bold.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraSans-BoldItalic.woff b/skins/contrib/Mozilla/fira/FiraSans-BoldItalic.woff new file mode 100644 index 000000000..d919d014e Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraSans-BoldItalic.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraSans-Italic.woff b/skins/contrib/Mozilla/fira/FiraSans-Italic.woff new file mode 100644 index 000000000..1ef173c3d Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraSans-Italic.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraSans-Regular.woff b/skins/contrib/Mozilla/fira/FiraSans-Regular.woff new file mode 100644 index 000000000..7fc569b99 Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraSans-Regular.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff b/skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff new file mode 100644 index 000000000..a4253cb11 Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraSans-SemiBold.woff differ diff --git a/skins/contrib/Mozilla/fira/FiraSans-SemiBoldItalic.woff b/skins/contrib/Mozilla/fira/FiraSans-SemiBoldItalic.woff new file mode 100644 index 000000000..3a98281f2 Binary files /dev/null and b/skins/contrib/Mozilla/fira/FiraSans-SemiBoldItalic.woff differ diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css index 6a3968a28..ad1fec275 100644 --- a/skins/contrib/Mozilla/global.css +++ b/skins/contrib/Mozilla/global.css @@ -1,22 +1,72 @@ -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 400; - src: local('Open Sans'), local('OpenSans'), url(opensans.woff) format('woff'); +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This Source Code Form is "Incompatible With Secondary Licenses", as + * defined by the Mozilla Public License, v. 2.0. */ + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans'), local('FiraSans'), + url('fira/FiraSans-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Italic'), local('FiraSansItalic'), + url('fira/FiraSans-Italic.woff') format('woff'); + font-weight: 400; + font-style: italic; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans SemiBold'), local('FiraSansSemiBold'), + url('fira/FiraSans-SemiBold.woff') format('woff'); + font-weight: 600; + font-style: normal; +} + +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans SemiBold Italic'), local('FiraSansSemiBoldItalic'), + url('fira/FiraSans-SemiBoldItalic.woff') format('woff'); + font-weight: 600; + font-style: italic; } -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 600; - src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(opensans-semibold.woff) format('woff'); +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Bold'), local('FiraSansBold'), + url('fira/FiraSans-Bold.woff') format('woff'); + font-weight: 700; + font-style: normal; } -@font-face { - font-family: 'Open Sans'; - font-style: normal; - font-weight: 700; - src: local('Open Sans Bold'), local('OpenSans-Bold'), url(opensans-bold.woff) format('woff'); +@font-face{ + font-family: 'Fira Sans'; + src: local('Fira Sans Bold Italic'), local('FiraSansBoldItalic'), + url('fira/FiraSans-BoldItalic.woff') format('woff'); + font-weight: 700; + font-style: italic; +} + +@font-face{ + font-family: 'Fira Mono'; + src: local('Fira Mono'), local('FiraMono'), + url('fira/FiraMono-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; +} + +@font-face{ + font-family: 'Fira Mono'; + src: local('Fira Mono Bold'), local('FiraMonoBold'), + url('fira/FiraMono-Bold.woff') format('woff'); + font-weight: 600; + font-style: normal; } body { @@ -30,7 +80,7 @@ body { } body, td, th, input, select, option, optgroup, .text_input { - font-family: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; + font-family: "Fira Sans", "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif; } /* security group colouring */ @@ -458,7 +508,7 @@ table.edit_form hr { } .bz_comment pre, #comment { - font: 13px/1.2 "Droid Sans Mono", Menlo, Monaco, "Courier New", Courier, monospace; + font: 13px/1.2 "Fira Mono", "Droid Sans Mono", Menlo, Monaco, "Courier New", Courier, monospace; } .bz_first_comment_head, .bz_comment_head { diff --git a/skins/contrib/Mozilla/opensans-bold.woff b/skins/contrib/Mozilla/opensans-bold.woff deleted file mode 100644 index 27619e7ce..000000000 Binary files a/skins/contrib/Mozilla/opensans-bold.woff and /dev/null differ diff --git a/skins/contrib/Mozilla/opensans-semibold.woff b/skins/contrib/Mozilla/opensans-semibold.woff deleted file mode 100644 index e83bb333d..000000000 Binary files a/skins/contrib/Mozilla/opensans-semibold.woff and /dev/null differ diff --git a/skins/contrib/Mozilla/opensans.woff b/skins/contrib/Mozilla/opensans.woff deleted file mode 100644 index 55b25f867..000000000 Binary files a/skins/contrib/Mozilla/opensans.woff and /dev/null differ -- cgit v1.2.3-24-g4f1b