diff --git a/server-console/src/downloader.css b/server-console/src/downloader.css index 3ebcc9f5fa..6c30d9e3fe 100644 --- a/server-console/src/downloader.css +++ b/server-console/src/downloader.css @@ -1,18 +1,25 @@ @font-face { - font-family: 'Proxima Nova'; - src: url('vendor/ProximaNova/ProximaNova-Regular.otf'); + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-Regular.ttf'); font-weight: normal; font-style: normal; } @font-face { - font-family: 'Proxima Nova'; - src: url('vendor/ProximaNova/ProximaNova-Light.otf'); + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-ExtraLight.ttf'); font-weight: 200; font-style: normal; } +@font-face { + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-SemiBold.ttf'); + font-weight: bold; + font-style: normal; +} + * { - font-family: "Proxima Nova", "Open Sans", Arial, Helvetica, sans-serif; + font-family: "Raleway", "Open Sans", Arial, Helvetica, sans-serif; line-height: 130%; } @@ -22,11 +29,14 @@ body { color: #808785; margin: 0 auto; text-align: center; - font-size: 14pt; - -webkit-touch-callout: none; - -webkit-user-select: none; + font-size: 13.5pt; + -webkit-touch-callout: none; -webkit-user-select: none; cursor: default; overflow: hidden; + font-variant-numeric: lining-nums; + -moz-font-feature-settings: "lnum"; + -webkit-font-feature-settings: "lnum"; + font-feature-settings: "lnum"; } #error-message { diff --git a/server-console/src/log.css b/server-console/src/log.css index de3c8c3d49..02b873da2d 100644 --- a/server-console/src/log.css +++ b/server-console/src/log.css @@ -1,13 +1,32 @@ @font-face { - font-family: 'Proxima Nova'; - src: url('vendor/ProximaNova/ProximaNova-Regular.otf'); + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-Regular.ttf'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-ExtraLight.ttf'); + font-weight: 200; + font-style: normal; +} +@font-face { + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-SemiBold.ttf'); + font-weight: bold; + font-style: normal; } body { - font-family: "Proxima Nova", "Open Sans", Arial, Helvetica, sans-serif; + font-family: "Raleway", "Open Sans", Arial, Helvetica, sans-serif; + font-size: 13.5pt; line-height: 1.6; margin: 0; padding: 0; + font-variant-numeric: lining-nums; + -moz-font-feature-settings: "lnum"; + -webkit-font-feature-settings: "lnum"; + font-feature-settings: "lnum"; } ul.tabs { diff --git a/server-console/src/splash.css b/server-console/src/splash.css index 7716b8a54a..bd3a06cbe3 100644 --- a/server-console/src/splash.css +++ b/server-console/src/splash.css @@ -1,6 +1,20 @@ @font-face { - font-family: 'Proxima Nova'; - src: url('vendor/ProximaNova/ProximaNova-Regular.otf'); + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-Regular.ttf'); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-ExtraLight.ttf'); + font-weight: 200; + font-style: normal; +} +@font-face { + font-family: 'Raleway'; + src: url('vendor/Raleway/Raleway-SemiBold.ttf'); + font-weight: bold; + font-style: normal; } body { @@ -12,11 +26,15 @@ body { -webkit-touch-callout: none; -webkit-user-select: none; cursor: default; + font-variant-numeric: lining-nums; + -moz-font-feature-settings: "lnum"; + -webkit-font-feature-settings: "lnum"; + font-feature-settings: "lnum"; } * { - font-family: "Proxima Nova", "Open Sans", Arial, Helvetica, sans-serif; - font-size: 14.5pt; + font-family: "Raleway", "Open Sans", Arial, Helvetica, sans-serif; + font-size: 13.5pt; line-height: 130%; } @@ -68,7 +86,7 @@ h2 { } .column.center { - width: 540px; + width: 565px; } .column.right { diff --git a/server-console/src/vendor/Raleway/OFL.txt b/server-console/src/vendor/Raleway/OFL.txt new file mode 100644 index 0000000000..1c9779ddcd --- /dev/null +++ b/server-console/src/vendor/Raleway/OFL.txt @@ -0,0 +1,94 @@ +Copyright (c) 2010, Matt McInerney (matt@pixelspread.com), +Copyright (c) 2011, Pablo Impallari (www.impallari.com|impallari@gmail.com), +Copyright (c) 2011, Rodrigo Fuenzalida (www.rfuenzalida.com|hello@rfuenzalida.com), with Reserved Font Name Raleway +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/server-console/src/vendor/Raleway/Raleway-ExtraLight.ttf b/server-console/src/vendor/Raleway/Raleway-ExtraLight.ttf new file mode 100644 index 0000000000..281a001983 Binary files /dev/null and b/server-console/src/vendor/Raleway/Raleway-ExtraLight.ttf differ diff --git a/server-console/src/vendor/Raleway/Raleway-Regular.ttf b/server-console/src/vendor/Raleway/Raleway-Regular.ttf new file mode 100644 index 0000000000..252cad14a6 Binary files /dev/null and b/server-console/src/vendor/Raleway/Raleway-Regular.ttf differ diff --git a/server-console/src/vendor/Raleway/Raleway-SemiBold.ttf b/server-console/src/vendor/Raleway/Raleway-SemiBold.ttf new file mode 100644 index 0000000000..64b54a77a3 Binary files /dev/null and b/server-console/src/vendor/Raleway/Raleway-SemiBold.ttf differ