Skip to content

Commit 59828d7

Browse files
ADmadADmad
authored
Merge pull request #916 from cakephp/4.x-local-google-font
4.x - use local google font files instead of external URL
2 parents 50c6bb7 + 2fc08af commit 59828d7

14 files changed

Lines changed: 83 additions & 9 deletions

‎templates/Pages/home.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,7 @@
5959
</title>
6060
<?= $this->Html->meta('icon') ?>
6161

62-
<link href="https://fonts.googleapis.com/css?family=Raleway:400,700" rel="stylesheet">
63-
64-
<?= $this->Html->css(['normalize.min', 'milligram.min', 'cake', 'home']) ?>
62+
<?= $this->Html->css(['normalize.min', 'milligram.min', 'fonts', 'cake', 'home']) ?>
6563

6664
<?= $this->fetch('meta') ?>
6765
<?= $this->fetch('css') ?>

‎templates/layout/default.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727
</title>
2828
<?= $this->Html->meta('icon') ?>
2929

30-
<link href="https://fonts.googleapis.com/css?family=Raleway:400,700" rel="stylesheet">
31-
32-
<?= $this->Html->css(['normalize.min', 'milligram.min', 'cake']) ?>
30+
<?= $this->Html->css(['normalize.min', 'milligram.min', 'fonts', 'cake']) ?>
3331

3432
<?= $this->fetch('meta') ?>
3533
<?= $this->fetch('css') ?>

‎templates/layout/error.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
</title>
2424
<?= $this->Html->meta('icon') ?>
2525

26-
<link href="https://fonts.googleapis.com/css?family=Raleway:400,700" rel="stylesheet">
27-
28-
<?= $this->Html->css(['normalize.min', 'milligram.min', 'cake']) ?>
26+
<?= $this->Html->css(['normalize.min', 'milligram.min', 'fonts', 'cake']) ?>
2927

3028
<?= $this->fetch('meta') ?>
3129
<?= $this->fetch('css') ?>

‎webroot/css/fonts.css‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/* cyrillic-ext */
2+
@font-face {
3+
font-family: 'Raleway';
4+
font-style: normal;
5+
font-weight: 400;
6+
src: url('../font/raleway-400-cyrillic-ext.woff2') format('woff2');
7+
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
8+
}
9+
/* cyrillic */
10+
@font-face {
11+
font-family: 'Raleway';
12+
font-style: normal;
13+
font-weight: 400;
14+
src: url('../font/raleway-400-cyrillic.woff2') format('woff2');
15+
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
16+
}
17+
/* vietnamese */
18+
@font-face {
19+
font-family: 'Raleway';
20+
font-style: normal;
21+
font-weight: 400;
22+
src: url('../font/raleway-400-vietnamese.woff2') format('woff2');
23+
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
24+
}
25+
/* latin-ext */
26+
@font-face {
27+
font-family: 'Raleway';
28+
font-style: normal;
29+
font-weight: 400;
30+
src: url('../font/raleway-400-latin-ext.woff2') format('woff2');
31+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
32+
}
33+
/* latin */
34+
@font-face {
35+
font-family: 'Raleway';
36+
font-style: normal;
37+
font-weight: 400;
38+
src: url('../font/raleway-400-latin.woff2') format('woff2');
39+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
40+
}
41+
/* cyrillic-ext */
42+
@font-face {
43+
font-family: 'Raleway';
44+
font-style: normal;
45+
font-weight: 700;
46+
src: url('../font/raleway-700-cyrillic-ext.woff2') format('woff2');
47+
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
48+
}
49+
/* cyrillic */
50+
@font-face {
51+
font-family: 'Raleway';
52+
font-style: normal;
53+
font-weight: 700;
54+
src: url('../font/raleway-700-cyrillic.woff2') format('woff2');
55+
unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
56+
}
57+
/* vietnamese */
58+
@font-face {
59+
font-family: 'Raleway';
60+
font-style: normal;
61+
font-weight: 700;
62+
src: url('../font/raleway-700-vietnamese.woff2') format('woff2');
63+
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
64+
}
65+
/* latin-ext */
66+
@font-face {
67+
font-family: 'Raleway';
68+
font-style: normal;
69+
font-weight: 700;
70+
src: url('../font/raleway-700-latin-ext.woff2') format('woff2');
71+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
72+
}
73+
/* latin */
74+
@font-face {
75+
font-family: 'Raleway';
76+
font-style: normal;
77+
font-weight: 700;
78+
src: url('../font/raleway-700-latin.woff2') format('woff2');
79+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
80+
}

‎webroot/font/raleway-400-cyrillic-ext.woff2‎

22 KB
Binary file not shown.

‎webroot/font/raleway-400-cyrillic.woff2‎

21.3 KB
Binary file not shown.

‎webroot/font/raleway-400-latin-ext.woff2‎

25.1 KB
Binary file not shown.

‎webroot/font/raleway-400-latin.woff2‎

40.9 KB
Binary file not shown.

‎webroot/font/raleway-400-vietnamese.woff2‎

7.47 KB
Binary file not shown.

‎webroot/font/raleway-700-cyrillic-ext.woff2‎

22 KB
Binary file not shown.

0 commit comments

Comments
 (0)