Skip to content

Commit d20084b

Browse files
LuLeRoemereriksven
authored andcommitted
Apply OMP style
These changes integrate the OMP corporate design, containing fonts, logo, and colors.
1 parent 667470f commit d20084b

File tree

13 files changed

+157
-8
lines changed

13 files changed

+157
-8
lines changed

NOTICE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
see legal/NOTICE.md

legal/LICENSE-OFL-1.1.txt

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
-----------------------------------------------------------
2+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
3+
-----------------------------------------------------------
4+
5+
PREAMBLE
6+
The goals of the Open Font License (OFL) are to stimulate worldwide
7+
development of collaborative font projects, to support the font creation
8+
efforts of academic and linguistic communities, and to provide a free and
9+
open framework in which fonts may be shared and improved in partnership
10+
with others.
11+
12+
The OFL allows the licensed fonts to be used, studied, modified and
13+
redistributed freely as long as they are not sold by themselves. The
14+
fonts, including any derivative works, can be bundled, embedded,
15+
redistributed and/or sold with any software provided that any reserved
16+
names are not used by derivative works. The fonts and derivatives,
17+
however, cannot be released under any other type of license. The
18+
requirement for fonts to remain under this license does not apply
19+
to any document created using the fonts or their derivatives.
20+
21+
DEFINITIONS
22+
"Font Software" refers to the set of files released by the Copyright
23+
Holder(s) under this license and clearly marked as such. This may
24+
include source files, build scripts and documentation.
25+
26+
"Reserved Font Name" refers to any names specified as such after the
27+
copyright statement(s).
28+
29+
"Original Version" refers to the collection of Font Software components as
30+
distributed by the Copyright Holder(s).
31+
32+
"Modified Version" refers to any derivative made by adding to, deleting,
33+
or substituting -- in part or in whole -- any of the components of the
34+
Original Version, by changing formats or by porting the Font Software to a
35+
new environment.
36+
37+
"Author" refers to any designer, engineer, programmer, technical
38+
writer or other person who contributed to the Font Software.
39+
40+
PERMISSION AND CONDITIONS
41+
Permission is hereby granted, free of charge, to any person obtaining
42+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
43+
redistribute, and sell modified and unmodified copies of the Font
44+
Software, subject to the following conditions:
45+
46+
1) Neither the Font Software nor any of its individual components,
47+
in Original or Modified Versions, may be sold by itself.
48+
49+
2) Original or Modified Versions of the Font Software may be bundled,
50+
redistributed and/or sold with any software, provided that each copy
51+
contains the above copyright notice and this license. These can be
52+
included either as stand-alone text files, human-readable headers or
53+
in the appropriate machine-readable metadata fields within text or
54+
binary files as long as those fields can be easily viewed by the user.
55+
56+
3) No Modified Version of the Font Software may use the Reserved Font
57+
Name(s) unless explicit written permission is granted by the corresponding
58+
Copyright Holder. This restriction only applies to the primary font name as
59+
presented to the users.
60+
61+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
62+
Software shall not be used to promote, endorse or advertise any
63+
Modified Version, except to acknowledge the contribution(s) of the
64+
Copyright Holder(s) and the Author(s) or with their explicit written
65+
permission.
66+
67+
5) The Font Software, modified or unmodified, in part or in whole,
68+
must be distributed entirely under this license, and must not be
69+
distributed under any other license. The requirement for fonts to
70+
remain under this license does not apply to any document created
71+
using the Font Software.
72+
73+
TERMINATION
74+
This license becomes null and void if any of the above conditions are
75+
not met.
76+
77+
DISCLAIMER
78+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
79+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
80+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
81+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
82+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
83+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
84+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
85+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
86+
OTHER DEALINGS IN THE FONT SOFTWARE.

legal/NOTICE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Third-party Content
2+
## Cairo Font
3+
This repository contains software developed by the [Cairo Project](https://github.com/Gue3bara/Cairo).
4+
5+
Your use of Cairo is subject to the terms and conditions of the SIL Open Font License 1.1. A copy of the license is contained in the file [/legal/LICENSE-OFL-1.1.txt](/legal/LICENSE-OFL-1.1.txt) and is also available at https://scripts.sil.org/cms/scripts/page.php?item_id=OFL_web.
6+
7+
The source code is available from [GitHub](https://github.com/Gue3bara/Cairo).

src/css/doc.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,17 @@
2424
.doc h4,
2525
.doc h5,
2626
.doc h6 {
27-
color: var(--heading-font-color);
27+
color: var(--omp-dark-gray);
2828
font-weight: var(--heading-font-weight);
2929
hyphens: none;
3030
line-height: 1.3;
3131
margin: 1rem 0 0;
3232
}
3333

34+
.doc h1 {
35+
color: var(--omp-primary);
36+
}
37+
3438
.doc > h1.page:first-child {
3539
font-size: calc(36 / var(--rem-base) * 1rem);
3640
margin: 1.5rem 0;

src/css/header.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,22 @@ body {
9292
padding: 0.5rem 1rem;
9393
}
9494

95+
.logo-headline-wrapper {
96+
display: flex;
97+
align-items: center;
98+
width: 100%;
99+
}
100+
101+
.logo {
102+
height: var(--navbar-height);
103+
padding: 10px 0 10px 0;
104+
}
105+
106+
.docu-title {
107+
margin-left: 15px;
108+
white-space: nowrap;
109+
}
110+
95111
.navbar-item.has-dropdown {
96112
padding: 0;
97113
}

src/css/omp-variables.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
:root {
2+
--omp-primary: #50b3d8ff;
3+
--omp-secondary: #d3ecf5ff;
4+
--omp-accent: #6d5aceff;
5+
--omp-main-text: #7d8287ff;
6+
--omp-gold: #d0cd58ff;
7+
--omp-light-gray: #c0c0c0ff;
8+
--omp-dark-gray: #323d43ff;
9+
--omp-black: #000;
10+
--omp-footer-font-color: #fff;
11+
--omp-font-family: "Cairo", sans-serif;
12+
--omp-heading-font-weight: 500;
13+
}

src/css/site.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@
1717
@import "highlight.css";
1818
@import "print.css";
1919
@import "search.css";
20+
@import "omp-variables.css";
21+
@import "typeface-cairo.css";

src/css/typeface-cairo.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@font-face {
2+
font-family: "Cairo";
3+
font-style: normal;
4+
font-weight: 400;
5+
src: local("Cairo"), local("Cairo-Regular"), url(../font/Cairo-Regular.ttf) format("woff");
6+
}
7+
8+
@font-face {
9+
font-family: "Cairo";
10+
font-style: normal;
11+
font-weight: 500;
12+
src: local("Cairo"), local("Cairo-Bold"), url(../font/Cairo-Bold.ttf) format("woff");
13+
}

src/css/vars.css

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
--body-font-size--print: 0.9375em; /* 15px */
2828
--body-line-height: 1.15;
2929
--body-font-color: var(--color-jet-70);
30-
--body-font-family: "Roboto", sans-serif;
30+
--body-font-family: var(--omp-font-family);
3131
--body-font-weight-bold: 500;
3232
--monospace-font-family: "Roboto Mono", monospace;
3333
--monospace-font-weight-bold: 500;
@@ -37,7 +37,7 @@
3737
--panel-border-color: var(--color-smoke-90);
3838
--scrollbar-thumb-color: var(--color-gray-10);
3939
/* navbar */
40-
--navbar-background: var(--color-jet-80);
40+
--navbar-background: var(--omp-primary);
4141
--navbar-font-color: var(--color-white);
4242
--navbar_hover-background: var(--color-black);
4343
--navbar-button-background: var(--color-white);
@@ -81,7 +81,7 @@
8181
--doc-margin: 0 auto;
8282
--doc-margin--desktop: 0 2rem;
8383
--heading-font-color: var(--color-jet-80);
84-
--heading-font-weight: normal;
84+
--heading-font-weight: var(--omp-heading-font-weight);
8585
--alt-heading-font-weight: var(--body-font-weight-bold);
8686
--section-divider-color: var(--panel-border-color);
8787
--link-font-color: #1565c0;
@@ -118,8 +118,8 @@
118118
--toc-line-height: 1.2;
119119
/* footer */
120120
--footer-line-height: var(--doc-line-height);
121-
--footer-background: var(--color-smoke-90);
122-
--footer-font-color: var(--color-gray-70);
121+
--footer-background: var(--omp-black);
122+
--footer-font-color: var(--omp-footer-font-color);
123123
--footer-link-font-color: var(--color-jet-80);
124124
/* dimensions and positioning */
125125
--navbar-height: calc(63 / var(--rem-base) * 1rem);

src/font/Cairo-Bold.ttf

151 KB
Binary file not shown.

0 commit comments

Comments
 (0)