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