Skip to content

Commit 7579777

Browse files
artembelikartembelik
authored
chore(docs): setup fonts (#DS-3131) (koobiq#435)
1 parent 1e74156 commit 7579777

File tree

14 files changed

+82
-61
lines changed

14 files changed

+82
-61
lines changed

‎angular.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
"input": "apps/docs/src",
5151
"output": "/"
5252
},
53-
{
54-
"glob": "**/*",
55-
"input": "apps/docs/src/styles",
56-
"output": "/tokens"
57-
},
5853
{
5954
"glob": "robots.txt",
6055
"input": "apps/docs/src",
@@ -70,13 +65,10 @@
7065
"includePaths": ["packages"]
7166
},
7267
"styles": [
73-
{
74-
"input": "apps/docs/src/main.scss"
75-
},
68+
"apps/docs/src/main.scss",
7669
"apps/docs/src/styles/koobiq/default-theme/css-tokens.css",
7770
"apps/docs/src/styles/koobiq/default-theme/css-tokens-dark.css",
7871
"apps/docs/src/styles/koobiq/default-theme/css-tokens-light.css"
79-
8072
],
8173
"scripts": [],
8274
"vendorChunk": true,

‎apps/docs/src/app/components/welcome/welcome.component.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
@use '../../../styles/koobiq/default-theme/theme' as *;
21
@use '../../../styles/koobiq/default-theme/variables' as *;
32

43
.docs-welcome {

‎apps/docs/src/assets/stackblitz/src/index.html

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,24 @@
55
<title>${title}</title>
66
<base href="/" />
77
<link
8+
href="https://fonts.googleapis.com"
9+
rel="preconnect"
10+
/>
11+
<link
12+
crossorigin
813
href="https://fonts.gstatic.com"
914
rel="preconnect"
1015
/>
1116
<link
12-
href="https://rsms.me/inter/inter.css"
17+
href="https://fonts.googleapis.com/css2?family=Inter:ital,opsz,wght@0,14..32,100..900;1,14..32,100..900&display=swap"
1318
rel="stylesheet"
1419
/>
1520
<link
16-
href="https://rsms.me"
17-
rel="dns-prefetch"
21+
href="https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap"
22+
rel="stylesheet"
1823
/>
1924
</head>
20-
<body class="kbq-app-background basic-container kbq-light docs">
25+
<body class="basic-container kbq-light docs">
2126
<koobiq-docs-example></koobiq-docs-example>
2227
<span class="version-info">Current build: ${version}</span>
2328
</body>

‎apps/docs/src/index.html

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<meta charset="utf-8" />
55
<title>Koobiq</title>
66
<base href="/" />
7-
87
<meta
98
content="width=device-width, initial-scale=1"
109
name="viewport"
@@ -17,7 +16,6 @@
1716
content="yes"
1817
name="mobile-web-app-capable"
1918
/>
20-
2119
<link
2220
href="assets/images/favicons/favicon.ico"
2321
rel="icon"
@@ -33,33 +31,6 @@
3331
href="assets/images/favicons/apple-touch-icon.png"
3432
rel="apple-touch-icon"
3533
/>
36-
<link
37-
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Mono:300,400,500,700&display=swap"
38-
rel="stylesheet"
39-
/>
40-
<link
41-
href="https://fonts.googleapis.com/css?family=JetBrains Mono"
42-
rel="stylesheet"
43-
/>
44-
<link
45-
href="https://fonts.googleapis.com"
46-
rel="dns-prefetch"
47-
/>
48-
49-
<link
50-
href="https://rsms.me/inter/inter.css"
51-
rel="stylesheet"
52-
/>
53-
<link
54-
href="https://rsms.me"
55-
rel="dns-prefetch"
56-
/>
57-
58-
<link
59-
crossorigin
60-
href="https://7n2w9akem6-dsn.algolia.net"
61-
rel="preconnect"
62-
/>
6334
</head>
6435

6536
<body class="docs-app-background docs koobiq">

‎apps/docs/src/main.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@use '@koobiq/icons/fonts/kbq-icons';
2-
3-
@use './styles/theme.kbq' as theme-kbq;
4-
2+
@use './styles/fonts';
3+
@use './styles/theme-kbq';
54
@use './styles/markdown';
65
@use './styles/docsearch';
76

‎apps/docs/src/styles/_fonts.scss

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Inter
2+
@import '@fontsource/inter/100.css';
3+
@import '@fontsource/inter/200.css';
4+
@import '@fontsource/inter/300.css';
5+
@import '@fontsource/inter/400.css';
6+
@import '@fontsource/inter/500.css';
7+
@import '@fontsource/inter/600.css';
8+
@import '@fontsource/inter/700.css';
9+
@import '@fontsource/inter/800.css';
10+
@import '@fontsource/inter/900.css';
11+
@import '@fontsource/inter/100-italic.css';
12+
@import '@fontsource/inter/200-italic.css';
13+
@import '@fontsource/inter/300-italic.css';
14+
@import '@fontsource/inter/400-italic.css';
15+
@import '@fontsource/inter/500-italic.css';
16+
@import '@fontsource/inter/600-italic.css';
17+
@import '@fontsource/inter/700-italic.css';
18+
@import '@fontsource/inter/800-italic.css';
19+
@import '@fontsource/inter/900-italic.css';
20+
21+
// JetBrains Mono
22+
@import '@fontsource/jetbrains-mono/100.css';
23+
@import '@fontsource/jetbrains-mono/200.css';
24+
@import '@fontsource/jetbrains-mono/300.css';
25+
@import '@fontsource/jetbrains-mono/400.css';
26+
@import '@fontsource/jetbrains-mono/500.css';
27+
@import '@fontsource/jetbrains-mono/600.css';
28+
@import '@fontsource/jetbrains-mono/700.css';
29+
@import '@fontsource/jetbrains-mono/800.css';
30+
@import '@fontsource/jetbrains-mono/100-italic.css';
31+
@import '@fontsource/jetbrains-mono/200-italic.css';
32+
@import '@fontsource/jetbrains-mono/300-italic.css';
33+
@import '@fontsource/jetbrains-mono/400-italic.css';
34+
@import '@fontsource/jetbrains-mono/500-italic.css';
35+
@import '@fontsource/jetbrains-mono/600-italic.css';
36+
@import '@fontsource/jetbrains-mono/700-italic.css';
37+
@import '@fontsource/jetbrains-mono/800-italic.css';

‎apps/docs/src/styles/_theme.kbq.scss renamed to ‎apps/docs/src/styles/_theme-kbq.scss

File renamed without changes.

‎docs/guides/customization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ yarn add --dev style-dictionary
3737
├─ customized-theme ············ Директория для кастомных токенов
3838
├ └─ properties ·············· Директория для файлов с переопределяемыми свойствами
3939
├─ _index.scss
40-
└─ _theme.kbq.scss
40+
└─ _theme-kbq.scss
4141
```
4242

4343
2 Добавьте файлы переопределяемых свойств: В properties добавьте файлы с расширением .json5, чтобы задать значения, которые вы хотите настроить.
@@ -72,7 +72,7 @@ yarn add --dev style-dictionary
7272
├─ customized-theme ·········· Сгенерированный набор кастомных токенов с импортированными токенами
7373
├─ out-of-the-box-theme ······ Набор с токенами по умолчанию из пакета Koobiq
7474
├─ _index.scss ··············· Файл, содержащий ссылки на sass-файлы из стандартной темы, нужен для удобного экспорта
75-
└─ _theme.kbq.scss ··········· Файл стилей Koobiq
75+
└─ _theme-kbq.scss ··········· Файл стилей Koobiq
7676
```
7777

7878
Если для светлой/темной темы необходимо применение стандартного и пользовательского отображения, то можно настроить это путём уточнения CSS-класса.

‎firebase.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
},
3636
{
3737
"key": "Content-Security-Policy",
38-
"value": "upgrade-insecure-requests; default-src 'self'; font-src 'self' https://fonts.gstatic.com https://rsms.me; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://rsms.me; img-src 'self' *; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://mc.yandex.ru https://mc.yandex.com https://yastatic.net; frame-src 'self' https://mc.yandex.ru https://mc.yandex.com; child-src 'self' blob: https://mc.yandex.ru https://mc.yandex.com; connect-src 'self' https://koobiq.io https://*.koobiq.io https://mc.yandex.ru https://mc.yandex.com https://*.algolia.net https://*.algolianet.com https://*.algolia.io;"
38+
"value": "upgrade-insecure-requests; default-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' *; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://mc.yandex.ru https://mc.yandex.com https://yastatic.net; frame-src 'self' https://mc.yandex.ru https://mc.yandex.com; child-src 'self' blob: https://mc.yandex.ru https://mc.yandex.com; connect-src 'self' https://koobiq.io https://*.koobiq.io https://mc.yandex.ru https://mc.yandex.com https://*.algolia.net https://*.algolianet.com https://*.algolia.io;"
3939
}
4040
]
4141
},
@@ -124,7 +124,7 @@
124124
},
125125
{
126126
"key": "Content-Security-Policy",
127-
"value": "upgrade-insecure-requests; default-src 'self'; font-src 'self' https://fonts.gstatic.com https://rsms.me; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://rsms.me; img-src 'self' *; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://mc.yandex.ru https://mc.yandex.com https://yastatic.net; frame-src 'self' https://mc.yandex.ru https://mc.yandex.com; child-src 'self' blob: https://mc.yandex.ru https://mc.yandex.com; connect-src 'self' https://koobiq.io https://*.koobiq.io https://mc.yandex.ru https://mc.yandex.com https://*.algolia.net https://*.algolianet.com https://*.algolia.io;"
127+
"value": "upgrade-insecure-requests; default-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' *; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://mc.yandex.ru https://mc.yandex.com https://yastatic.net; frame-src 'self' https://mc.yandex.ru https://mc.yandex.com; child-src 'self' blob: https://mc.yandex.ru https://mc.yandex.com; connect-src 'self' https://koobiq.io https://*.koobiq.io https://mc.yandex.ru https://mc.yandex.com https://*.algolia.net https://*.algolianet.com https://*.algolia.io;"
128128
}
129129
]
130130
},
@@ -213,7 +213,7 @@
213213
},
214214
{
215215
"key": "Content-Security-Policy",
216-
"value": "upgrade-insecure-requests; default-src 'self'; font-src 'self' https://fonts.gstatic.com https://rsms.me; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://rsms.me; img-src 'self' *; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://mc.yandex.ru; child-src 'self' blob:; connect-src 'self' https://koobiq.io https://*.koobiq.io https://mc.yandex.ru https://*.algolia.net https://*.algolianet.com https://*.algolia.io;"
216+
"value": "upgrade-insecure-requests; default-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' *; media-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval' https://mc.yandex.ru; child-src 'self' blob:; connect-src 'self' https://koobiq.io https://*.koobiq.io https://mc.yandex.ru https://*.algolia.net https://*.algolianet.com https://*.algolia.io;"
217217
}
218218
]
219219
},

‎package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
"@angular/platform-browser": "18.2.6",
2828
"@docsearch/css": "^3.6.2",
2929
"@docsearch/js": "^3.6.2",
30+
"@fontsource/inter": "^5.1.0",
31+
"@fontsource/jetbrains-mono": "^5.1.1",
3032
"@koobiq/date-adapter": "^3.1.3",
3133
"@koobiq/date-formatter": "^3.1.3",
3234
"@koobiq/icons": "9.1.0",

0 commit comments

Comments
 (0)