Pull request 2729: AGDNS-4282 add rubik font
Some checks are pending
build / test (macOS-latest) (push) Waiting to run
build / test (ubuntu-latest) (push) Waiting to run
build / test (windows-latest) (push) Waiting to run
build / build-release (push) Blocked by required conditions
build / notify (push) Blocked by required conditions
lint / go-lint (push) Waiting to run
lint / eslint (push) Waiting to run
lint / notify (push) Blocked by required conditions

Squashed commit of the following:

commit 6320d299fbe732f88af0f57b2e12956f7ecb64dc
Merge: 0c42ecbe6 599cfa9eb
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jul 23 17:23:14 2026 +0300

    Merge branch 'master' into AGDNS-4282

commit 0c42ecbe641958e5a7e23e243281281a6f928e4d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jul 23 17:14:29 2026 +0300

    fix txt-lint sort

commit 433330d4f9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 22 17:21:50 2026 +0300

    fix

commit e611cd21be
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 22 17:19:37 2026 +0300

    fix

commit b07ad6e630
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 22 17:17:56 2026 +0300

    fix

commit f5819feb09
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 22 17:15:56 2026 +0300

    fix

commit 227e95912a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jul 22 17:13:55 2026 +0300

    AGDNS-4282 add rubik font
This commit is contained in:
Ildar Kamalov 2026-07-23 14:29:11 +00:00
parent 599cfa9eb5
commit e8e3287091
9 changed files with 43 additions and 6 deletions

View file

@ -0,0 +1,31 @@
@font-face {
font-family: Rubik;
src: url('./common/styles/fonts/rubik-regular.woff2') format('woff2');
font-weight: 400;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: Rubik;
src: url('./common/styles/fonts/rubik-medium.woff2') format('woff2');
font-weight: 500;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: Rubik;
src: url('./common/styles/fonts/rubik-semibold.woff2') format('woff2');
font-weight: 600;
font-style: normal;
font-display: swap;
}
@font-face {
font-family: Rubik;
src: url('./common/styles/fonts/rubik-bold.woff2') format('woff2');
font-weight: 700;
font-style: normal;
font-display: swap;
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -17,7 +17,10 @@
display: flex;
align-items: center;
gap: 8px;
transition: all 0.2s ease;
transition:
background-color var(--t2),
border-color var(--t2),
color var(--t2);
&:hover {
background-color: var(--card-hover-color);

View file

@ -2,11 +2,12 @@
@import './common/styles/colors/light.css';
@import './common/styles/colors/dark.css';
@import './common/styles/colors/adg.css';
@import './common/styles/fonts.css';
:root {
--font-family-monospace: Monaco, Menlo, 'Ubuntu Mono', Consolas, source-code-pro, monospace;
--font-family-system:
-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif;
--font-family-base:
Rubik, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Helvetica Neue', Arial, sans-serif;
}
*,
@ -18,7 +19,7 @@
body {
margin: 0;
padding: 0;
font-family: var(--font-family-system);
font-family: var(--font-family-base);
font-weight: var(--weight-regular);
color: var(--default-main-text);
line-height: 1.4;
@ -39,7 +40,7 @@ button,
input,
textarea,
select {
font-family: var(--font-family-system);
font-family: var(--font-family-base);
}
h1,

View file

@ -75,7 +75,7 @@ const config = {
use: 'yaml-loader',
},
{
test: /\.(svg|png|jpe?g|gif|webp|ico)$/i,
test: /\.(svg|png|jpe?g|gif|webp|ico|woff2?)$/i,
type: 'asset/resource',
generator: {
filename: 'assets/[name].[contenthash][ext]',

View file

@ -44,6 +44,7 @@ trailing_newlines() (
-o -name '*.svg' \
-o -name '*.tar.gz' \
-o -name '*.test' \
-o -name '*.woff2' \
-o -name '*.zip' \
-o -name 'AdGuardHome' \
-o -name 'adguard-home' \
@ -71,6 +72,7 @@ trailing_whitespace() {
-o -name '*.svg' \
-o -name '*.tar.gz' \
-o -name '*.test' \
-o -name '*.woff2' \
-o -name '*.zip' \
-o -name 'AdGuardHome' \
-o -name 'adguard-home' \