docs: use overpass font for website

The original libvirt logo was built using what appears to be
either Overpass font, or one stylistically very similar (the
slanted top of letters like 'l', 't', etc). The newly recreated
libvirt logo will use Overpass. Use this font for the website
text too, to provide a consistent style.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/cfg.mk b/cfg.mk
index 76e46d20a0fd24fd9f8682c2fbb069af8126b071..9e0e4e1024e9675dd1b77c954ec66f59133cf762 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -1149,7 +1149,7 @@ exclude_file_name_regexp--sc_prohibit_close = \
   (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir.+mock\.c)$$)
 
 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
-  (^tests/(qemuhelp|virhostcpu|virpcitest)data/|\.diff|tests/virconfdata/no-newline\.conf$$)
+  (^tests/(qemuhelp|virhostcpu|virpcitest)data/|docs/fonts/.*\.woff|\.diff|tests/virconfdata/no-newline\.conf$$)
 
 _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon)
 exclude_file_name_regexp--sc_prohibit_fork_wrappers = \

diff --git a/docs/fonts/LICENSE.md b/docs/fonts/LICENSE.md
new file mode 100644 (file)
index 0000000..9520f30
--- /dev/null
+++ b/docs/fonts/LICENSE.md
@@ -0,0 +1,90 @@
+## License
+
+Copyright (C) 2015 Red Hat, Inc.,
+
+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/docs/fonts/hinted-Overpass-Bold.woff b/docs/fonts/hinted-Overpass-Bold.woff
new file mode 100644 (file)
index 0000000..c0bd2da
Binary files /dev/null and b/docs/fonts/hinted-Overpass-Bold.woff differ

diff --git a/docs/fonts/hinted-Overpass-BoldItalic.woff b/docs/fonts/hinted-Overpass-BoldItalic.woff
new file mode 100644 (file)
index 0000000..20c07de
Binary files /dev/null and b/docs/fonts/hinted-Overpass-BoldItalic.woff differ

diff --git a/docs/fonts/hinted-Overpass-Italic.woff b/docs/fonts/hinted-Overpass-Italic.woff
new file mode 100644 (file)
index 0000000..06acc96
Binary files /dev/null and b/docs/fonts/hinted-Overpass-Italic.woff differ

diff --git a/docs/fonts/hinted-Overpass-Light.woff b/docs/fonts/hinted-Overpass-Light.woff
new file mode 100644 (file)
index 0000000..af66f21
Binary files /dev/null and b/docs/fonts/hinted-Overpass-Light.woff differ

diff --git a/docs/fonts/hinted-Overpass-LightItalic.woff b/docs/fonts/hinted-Overpass-LightItalic.woff
new file mode 100644 (file)
index 0000000..65d7ac4
Binary files /dev/null and b/docs/fonts/hinted-Overpass-LightItalic.woff differ

diff --git a/docs/fonts/hinted-Overpass-Reg.woff b/docs/fonts/hinted-Overpass-Reg.woff
new file mode 100644 (file)
index 0000000..6f177d2
Binary files /dev/null and b/docs/fonts/hinted-Overpass-Reg.woff differ

diff --git a/docs/fonts/stylesheet.css b/docs/fonts/stylesheet.css
new file mode 100644 (file)
index 0000000..4e98851
--- /dev/null
+++ b/docs/fonts/stylesheet.css
@@ -0,0 +1,55 @@
+@font-face {
+       font-family: 'LibvirtOverpass';
+       src: url('hinted-Overpass-Italic.woff') format('woff');
+       font-weight: normal;
+       font-style: italic;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpass';
+       src: url('hinted-Overpass-Bold.woff') format('woff');
+       font-weight: bold;
+       font-style: normal;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpass';
+       src: url('hinted-Overpass-Reg.woff') format('woff');
+       font-weight: normal;
+       font-style: normal;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpass';
+       src: url('hinted-Overpass-Reg.woff') format('woff');
+       font-weight: normal;
+       font-style: normal;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpass';
+       src: url('hinted-Overpass-Bold.woff') format('woff');
+       font-weight: bold;
+       font-style: normal;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpass';
+       src: url('hinted-Overpass-BoldItalic.woff') format('woff');
+       font-weight: bold;
+       font-style: italic;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpassLight';
+       src: url('hinted-Overpass-Light.woff') format('woff');
+       font-weight: 300;
+       font-style: normal;
+}
+
+@font-face {
+       font-family: 'LibvirtOverpassLight';
+       src: url('hinted-Overpass-LightItalic.woff') format('woff');
+       font-weight: 300;
+       font-style: italic;
+}

diff --git a/docs/generic.css b/docs/generic.css
index ac39f32661cc1ab8e819a1c1c7ea4323dee28451..fa4c4de26826f22f65011fcc9b1b1af2003d10f1 100644 (file)
--- a/docs/generic.css
+++ b/docs/generic.css
@@ -2,9 +2,8 @@ body {
   margin: 0em;
   padding: 0px;
   color: rgb(0,0,0);
-  font-family: sans-serif;
-  font-size: 90%;
   background: #ffffff;
+  font-family: LibvirtOverpass;
 }
 
 p, ul, ol, dl {

diff --git a/docs/main.css b/docs/main.css
index ab78921d63fcf4d7592009ded3789bd0f825fa9f..95d5d325d7fe69c10fe48bb83b523ec108bc9c50 100644 (file)
--- a/docs/main.css
+++ b/docs/main.css
@@ -1,2 +1,3 @@
+@import url(fonts/stylesheet.css);
 @import url(generic.css);
 @import url(libvirt.css);