diff --git a/makefile.js b/makefile.js index 194107b5..2d87ecd2 100644 --- a/makefile.js +++ b/makefile.js @@ -110,6 +110,10 @@ module.exports = function (make) { .handlebars(make.env) .WRITE(mapSrc); + $(src + ': _h5ai/client/css/fonts/**') + .newerThan(mapSrc) + .WRITE(mapSrc); + $(root + ': *.md') .newerThan(mapRoot) .WRITE(mapRoot); @@ -141,6 +145,10 @@ module.exports = function (make) { .handlebars(make.env) .WRITE(mapSrc); + $(src + ': _h5ai/client/css/fonts/**') + .newerThan(mapSrc) + .WRITE(mapSrc); + $(root + ': *.md') .newerThan(mapRoot) .WRITE(mapRoot); diff --git a/src/_h5ai/client/css/fonts/LICENCE.txt b/src/_h5ai/client/css/fonts/LICENCE.txt new file mode 100644 index 00000000..ae78a8f9 --- /dev/null +++ b/src/_h5ai/client/css/fonts/LICENCE.txt @@ -0,0 +1,96 @@ +------------------------------- +UBUNTU FONT LICENCE Version 1.0 +------------------------------- + +PREAMBLE +This licence allows the licensed fonts to be used, studied, modified and +redistributed freely. The fonts, including any derivative works, can be +bundled, embedded, and redistributed provided the terms of this licence +are met. The fonts and derivatives, however, cannot be released under +any other licence. The requirement for fonts to remain under this +licence does not require any document created using the fonts or their +derivatives to be published under this licence, as long as the primary +purpose of the document is not to be a vehicle for the distribution of +the fonts. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this licence and clearly marked as such. This may +include source files, build scripts and documentation. + +"Original Version" refers to the collection of Font Software components +as received under this licence. + +"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. + +"Copyright Holder(s)" refers to all individuals and companies who have a +copyright ownership of the Font Software. + +"Substantially Changed" refers to Modified Versions which can be easily +identified as dissimilar to the Font Software by users of the Font +Software comparing the Original Version with the Modified Version. + +To "Propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification and with or without charging +a redistribution fee), making available to the public, and in some +countries other activities as well. + +PERMISSION & CONDITIONS +This licence does not grant any rights under trademark law and all such +rights are reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of the Font Software, to propagate the Font Software, subject to +the below conditions: + +1) Each copy of the Font Software must contain the above copyright +notice and this licence. 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. + +2) The font name complies with the following: +(a) The Original Version must retain its name, unmodified. +(b) Modified Versions which are Substantially Changed must be renamed to +avoid use of the name of the Original Version or similar names entirely. +(c) Modified Versions which are not Substantially Changed must be +renamed to both (i) retain the name of the Original Version and (ii) add +additional naming elements to distinguish the Modified Version from the +Original Version. The name of such Modified Versions must be the name of +the Original Version, with "derivative X" where X represents the name of +the new work, appended to that name. + +3) The name(s) of the Copyright Holder(s) and any contributor to the +Font Software shall not be used to promote, endorse or advertise any +Modified Version, except (i) as required by this licence, (ii) to +acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with +their explicit written permission. + +4) The Font Software, modified or unmodified, in part or in whole, must +be distributed entirely under this licence, and must not be distributed +under any other licence. The requirement for fonts to remain under this +licence does not affect any document created using the Font Software, +except any version of the Font Software extracted from a document +created using the Font Software may only be distributed under this +licence. + +TERMINATION +This licence 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/src/_h5ai/client/css/fonts/README.txt b/src/_h5ai/client/css/fonts/README.txt new file mode 100644 index 00000000..292d4ade --- /dev/null +++ b/src/_h5ai/client/css/fonts/README.txt @@ -0,0 +1,15 @@ + ---------------------- + Ubuntu Font Family + ====================== + +The Ubuntu Font Family are a set of matching new libre/open fonts in +development during 2010--2011. The development is being funded by +Canonical Ltd on behalf the wider Free Software community and the +Ubuntu project. The technical font design work and implementation is +being undertaken by Dalton Maag. + +Both the final font Truetype/OpenType files and the design files used +to produce the font family are distributed under an open licence and +you are expressly encouraged to experiment, modify, share and improve. + + http://font.ubuntu.com/ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-B.ttf b/src/_h5ai/client/css/fonts/Ubuntu-B.ttf new file mode 100644 index 00000000..c0142fea Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-B.ttf differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-B.woff b/src/_h5ai/client/css/fonts/Ubuntu-B.woff new file mode 100644 index 00000000..77abf734 Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-B.woff differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-BI.ttf b/src/_h5ai/client/css/fonts/Ubuntu-BI.ttf new file mode 100644 index 00000000..12e4c7df Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-BI.ttf differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-BI.woff b/src/_h5ai/client/css/fonts/Ubuntu-BI.woff new file mode 100644 index 00000000..275d7091 Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-BI.woff differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-L.ttf b/src/_h5ai/client/css/fonts/Ubuntu-L.ttf new file mode 100644 index 00000000..7b7ac7dd Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-L.ttf differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-L.woff b/src/_h5ai/client/css/fonts/Ubuntu-L.woff new file mode 100644 index 00000000..c27e714d Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-L.woff differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-LI.ttf b/src/_h5ai/client/css/fonts/Ubuntu-LI.ttf new file mode 100644 index 00000000..e36de452 Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-LI.ttf differ diff --git a/src/_h5ai/client/css/fonts/Ubuntu-LI.woff b/src/_h5ai/client/css/fonts/Ubuntu-LI.woff new file mode 100644 index 00000000..099c1430 Binary files /dev/null and b/src/_h5ai/client/css/fonts/Ubuntu-LI.woff differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-B.ttf b/src/_h5ai/client/css/fonts/UbuntuMono-B.ttf new file mode 100644 index 00000000..7bd66657 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-B.ttf differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-B.woff b/src/_h5ai/client/css/fonts/UbuntuMono-B.woff new file mode 100644 index 00000000..8ce9c0bb Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-B.woff differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-BI.ttf b/src/_h5ai/client/css/fonts/UbuntuMono-BI.ttf new file mode 100644 index 00000000..6c5b8ba0 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-BI.ttf differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-BI.woff b/src/_h5ai/client/css/fonts/UbuntuMono-BI.woff new file mode 100644 index 00000000..40f83c34 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-BI.woff differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-R.ttf b/src/_h5ai/client/css/fonts/UbuntuMono-R.ttf new file mode 100644 index 00000000..fdd309d7 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-R.ttf differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-R.woff b/src/_h5ai/client/css/fonts/UbuntuMono-R.woff new file mode 100644 index 00000000..16899314 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-R.woff differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-RI.ttf b/src/_h5ai/client/css/fonts/UbuntuMono-RI.ttf new file mode 100644 index 00000000..18f81a29 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-RI.ttf differ diff --git a/src/_h5ai/client/css/fonts/UbuntuMono-RI.woff b/src/_h5ai/client/css/fonts/UbuntuMono-RI.woff new file mode 100644 index 00000000..b073b037 Binary files /dev/null and b/src/_h5ai/client/css/fonts/UbuntuMono-RI.woff differ diff --git a/src/_h5ai/client/css/inc/fonts.less b/src/_h5ai/client/css/inc/fonts.less new file mode 100644 index 00000000..3c978207 --- /dev/null +++ b/src/_h5ai/client/css/inc/fonts.less @@ -0,0 +1,56 @@ + +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 300; + src: local('Ubuntu Light'), local('Ubuntu-Light'), url(fonts/Ubuntu-L.woff) format('woff'), url(fonts/Ubuntu-L.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu'; + font-style: normal; + font-weight: 700; + src: local('Ubuntu Bold'), local('Ubuntu-Bold'), url(fonts/Ubuntu-B.woff) format('woff'), url(fonts/Ubuntu-B.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu'; + font-style: italic; + font-weight: 300; + src: local('Ubuntu Light Italic'), local('Ubuntu-LightItalic'), url(fonts/Ubuntu-LI.woff) format('woff'), url(fonts/Ubuntu-LI.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu'; + font-style: italic; + font-weight: 700; + src: local('Ubuntu Bold Italic'), local('Ubuntu-BoldItalic'), url(fonts/Ubuntu-BI.woff) format('woff'), url(fonts/Ubuntu-BI.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu Mono'; + font-style: normal; + font-weight: 400; + src: local('Ubuntu Mono'), local('UbuntuMono-Regular'), url(fonts/UbuntuMono-R.woff) format('woff'), url(fonts/UbuntuMono-R.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu Mono'; + font-style: normal; + font-weight: 700; + src: local('Ubuntu Mono Bold'), local('UbuntuMono-Bold'), url(fonts/UbuntuMono-B.woff) format('woff'), url(fonts/UbuntuMono-B.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu Mono'; + font-style: italic; + font-weight: 400; + src: local('Ubuntu Mono Italic'), local('UbuntuMono-Italic'), url(fonts/UbuntuMono-RI.woff) format('woff'), url(fonts/UbuntuMono-RI.ttf) format('ttf'); +} + +@font-face { + font-family: 'Ubuntu Mono'; + font-style: italic; + font-weight: 700; + src: local('Ubuntu Mono Bold Italic'), local('UbuntuMono-BoldItalic'), url(fonts/Ubuntu-BI.woff) format('woff'), url(fonts/Ubuntu-BI.ttf) format('ttf'); +} diff --git a/src/_h5ai/client/css/inc/general.less b/src/_h5ai/client/css/inc/general.less index 1420fc31..b03cd9bd 100644 --- a/src/_h5ai/client/css/inc/general.less +++ b/src/_h5ai/client/css/inc/general.less @@ -24,7 +24,7 @@ @border-widget: 1px solid @col-border; @border-widget-sep: 1px solid @col-widget-sep; -@font-family: Ubuntu, sans-serif; +@font-family: Ubuntu, Helvetica, Arial, sans-serif; @font-weight: 300; @font-family-mono: "Ubuntu Mono", monospace; diff --git a/src/_h5ai/client/css/styles.less b/src/_h5ai/client/css/styles.less index 82587368..16ddb183 100644 --- a/src/_h5ai/client/css/styles.less +++ b/src/_h5ai/client/css/styles.less @@ -2,6 +2,7 @@ @import "lib/h5bp-normalize"; @import "lib/h5bp-main-header"; +@import "inc/fonts"; @import "inc/general"; @import "inc/topbar"; @import "inc/bottombar"; diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade index 54861f33..1dbce11e 100644 --- a/src/_h5ai/index.html.jade +++ b/src/_h5ai/index.html.jade @@ -13,7 +13,7 @@ html.no-js.browser( lang="en" ) meta( name="viewport", content="width=device-width, initial-scale=1" ) link( rel="shortcut icon", href="client/images/favicon/favicon-16-32.ico" ) link( rel="apple-touch-icon-precomposed", type="image/png", href="client/images/favicon/favicon-152.png" ) - link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" ) + //- link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" ) link( rel="stylesheet", href="client/css/styles.css" ) script( src="client/js/scripts.js", data-mode="info" ) diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade index b623a080..bd1fc48e 100644 --- a/src/_h5ai/server/php/inc/page.php.jade +++ b/src/_h5ai/server/php/inc/page.php.jade @@ -17,7 +17,7 @@ html.no-js.browser( lang="en" ) meta( name="viewport", content="width=device-width, initial-scale=1" ) link( rel="shortcut icon", href!="#{app_href}client/images/favicon/favicon-16-32.ico" ) link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/favicon-152.png" ) - link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" ) + //- link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" ) link( rel="stylesheet", href!="#{app_href}client/css/styles.css" ) script( src!="#{app_href}client/js/scripts.js" )