Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TUI-60] add inter font #375

Merged
merged 9 commits into from
Jul 4, 2024
Merged

[TUI-60] add inter font #375

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6219a36
[TUI-60] Use just Inter font
lghiur Jul 2, 2024
2659033
alpha v
lghiur Jul 2, 2024
de19247
alpha 1
lghiur Jul 2, 2024
b56544b
new alpha with new fixes on fonts
lghiur Jul 3, 2024
5935d92
added readonly for toggles
lghiur Jul 3, 2024
2f5feee
alpha 3
lghiur Jul 3, 2024
39b4103
alpha 5
lghiur Jul 3, 2024
ef28a88
alpha 6
lghiur Jul 3, 2024
16a5e13
add missing prop types
lghiur Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/c8df601cd07dcd5d5f41.js
View file
Open in desktop

This file was deleted.

Binary file removed lib/fonts/OpenSans-Bold.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/OpenSans-Bold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/OpenSans-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/OpenSans-Regular.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/OpenSans-SemiBold.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/OpenSans-SemiBold.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-brands-400.eot
View file
Open in desktop
Binary file not shown.
1,184 changes: 0 additions & 1,184 deletions lib/fonts/fa-brands-400.svg
View file
Open in desktop

This file was deleted.

Binary file removed lib/fonts/fa-brands-400.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-brands-400.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-brands-400.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-regular-400.eot
View file
Open in desktop
Binary file not shown.
467 changes: 0 additions & 467 deletions lib/fonts/fa-regular-400.svg
View file
Open in desktop

This file was deleted.

Binary file removed lib/fonts/fa-regular-400.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-regular-400.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-regular-400.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-solid-900.eot
View file
Open in desktop
Binary file not shown.
2,618 changes: 0 additions & 2,618 deletions lib/fonts/fa-solid-900.svg
View file
Open in desktop

This file was deleted.

Binary file removed lib/fonts/fa-solid-900.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-solid-900.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/fa-solid-900.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/smoolthan_bold-webfont.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/smoolthan_bold-webfont.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/smoolthan_medium-webfont.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/smoolthan_medium-webfont.woff2
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/smoolthan_regular-webfont.woff
View file
Open in desktop
Binary file not shown.
Binary file removed lib/fonts/smoolthan_regular-webfont.woff2
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions lib/index.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/index.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions lib/sass/common/sass/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $text-color: #505071 !default;
$label-color: theme-color('default', 'base') !default;

$xs-line-height: 16px;
$sm-line-height: 19px;
$sm-line-height: 20px;
$md-line-height: 22px;
$lg-line-height: 23px;
$xl-line-height: 24px;
Expand All @@ -65,7 +65,7 @@ $sm-font-size: 14px;
$md-font-size: 16px;
$lg-font-size: 18px;
$xl-font-size: 20px;
$xxl-font-size: 25px;
$xxl-font-size: 32px;

$base-font-size: $sm-font-size !default;
$base-line-height: $sm-line-height !default;
Expand Down Expand Up @@ -106,26 +106,28 @@ $spacing: (
'sm': 10px,
'base': 15px,
'md': 20px,
'lg': 25px,
'lg': 24px,
'xl': 30px,
'xxl': 40px
'xxl': 36px
) !default;

$grid-gutter: map.get($spacing, 'md') !default;
$grid-max-width: 1200px + ($grid-gutter * 2) !default;
$grid-columns: 12 !default;

$font-family-regular: 'OpenSans-regular' !default;
$font-family-medium: 'OpenSans-SemiBold' !default;
$font-family-bold: 'OpenSans-Bold' !default;
$font-family-regular: 'Inter-Regular' !default;
$font-family-medium: 'Inter-Medium' !default;
$font-family-semi-bold: 'Inter-SemiBold' !default;
$font-family-bold: 'Inter-Bold' !default;

$headings-color: #36364C !default;
$headings-font-family-regular: 'smoolthan_regular' !default;
$headings-font-family-medium: 'smoolthan_medium' !default;
$headings-font-family-bold: 'smoolthan_bold' !default;
$headings-font-family-regular: 'Inter-Regular' !default;
$headings-font-family-medium: 'Inter-Medium' !default;
$headings-font-family-semi-bold: 'Inter-SemiBold' !default;
$headings-font-family-bold: 'Inter-Bold' !default;

$headings-margin-bottom: 15px !default;
$headings-font-family: $headings-font-family-medium !default;
$headings-font-family: $headings-font-family-bold !default;
$headings-font-weight: 500 !default;
$headings-line-height: $base-line-height !default;

Expand Down
4 changes: 2 additions & 2 deletions lib/tyk-ui.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/tyk-ui.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/tyk-ui.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/tyk-ui.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tyk-technologies/tyk-ui",
"version": "4.1.1",
"version": "4.2.0-alpha6",
"description": "Tyk UI - ui reusable components",
"main": "src/index.js",
"scripts": {
Expand Down
48 changes: 0 additions & 48 deletions src/common/css/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,54 +38,6 @@
font-style: normal;
}

@font-face {
font-family: OpenSans-Bold;
src: url('../fonts/OpenSans-Bold.woff2') format('woff2'),
url('../fonts/OpenSans-Bold.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: OpenSans-SemiBold;
src: url('../fonts/OpenSans-SemiBold.woff2') format('woff2'),
url('../fonts/OpenSans-SemiBold.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: OpenSans-Regular;
src: url('../fonts/OpenSans-Regular.woff2') format('woff2'),
url('../fonts/OpenSans-Regular.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'smoolthan_bold';
src: url('../fonts/smoolthan_bold-webfont.woff2') format('woff2'),
url('../fonts/smoolthan_bold-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'smoolthan_medium';
src: url('../fonts/smoolthan_medium-webfont.woff2') format('woff2'),
url('../fonts/smoolthan_medium-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'smoolthan_regular';
src: url('../fonts/smoolthan_regular-webfont.woff2') format('woff2'),
url('../fonts/smoolthan_regular-webfont.woff') format('woff');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: tykon;
src: url('../fonts/tykon.woff2') format('woff2'),
Expand Down
2 changes: 1 addition & 1 deletion src/common/css/form.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

label {
font-family: var(--font-family-medium);
font-family: var(--font-family-bold);
}
}

Expand Down
21 changes: 7 additions & 14 deletions src/common/css/typography.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
h1, h2, h3, h4, h5, h6 {
margin-block-end: var(--headings-margin-bottom);
font-family: var(--headings-font-family);
font-weight: var(--headings-font-weight);
color: var(--headings-color);
}

Expand All @@ -19,12 +18,12 @@ h1 {

h2 {
font-size: var(--xl-font-size);
line-height: var(--xl-line-height);
line-height: var(--lg-line-height);
}

h3 {
font-size: var(--lg-font-size);
line-height: var(--lg-line-height);
line-height: var(--xl-line-height);
}

h4 {
Expand All @@ -34,7 +33,7 @@ h4 {

h5 {
font-size: var(--sm-font-size);
line-height: var(--sm-line-height);
line-height: var(--md-line-height);
}

h6 {
Expand Down Expand Up @@ -62,6 +61,7 @@ a:not(.tyk-button) {
cursor: pointer;
color: var(--text-color);
font-family: var(--font-family-regular);
text-decoration: underline;

&.link--bold {
font-family: var(--font-family-bold);
Expand All @@ -77,15 +77,15 @@ a:not(.tyk-button) {
}

.font-family-regular {
font-family: var(--font-family-regular);
font-family: var(--font-family-regular) !important;
}

.font-family-medium {
font-family: var(--font-family-medium);
font-family: var(--font-family-medium) !important;
}

.font-family-bold {
font-family: var(--font-family-bold);
font-family: var(--font-family-bold) !important;
}

.heading-font-family-regular {
Expand Down Expand Up @@ -155,7 +155,6 @@ td.text-ellipsis {
}

.section-title {
font-family: var(--headings-font-family-bold);
margin-block-end: 5px;

.tyk-icon {
Expand All @@ -165,9 +164,6 @@ td.text-ellipsis {

.sub-section-title {
margin-block-end: 5px;
font-family: var(--font-family-medium);
font-size: var(--md-font-size);
line-height: var(--md-line-height);

.tyk-icon {
margin-inline-start: 5px;
Expand All @@ -176,9 +172,6 @@ td.text-ellipsis {

.section-group-title {
margin-block-end: 5px;
font-family: var(--font-family-bold);
font-size: var(--sm-font-size);
line-height: var(--sm-line-height);
text-transform: uppercase;

.tyk-icon {
Expand Down
24 changes: 13 additions & 11 deletions src/common/css/variables.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
--label-color: var(--color-default-base);

--xs-line-height: 16px;
--sm-line-height: 19px;
--sm-line-height: 20px;
--md-line-height: 22px;
--lg-line-height: 23px;
--xl-line-height: 24px;
Expand All @@ -46,7 +46,7 @@
--md-font-size: 16px;
--lg-font-size: 18px;
--xl-font-size: 20px;
--xxl-font-size: 25px;
--xxl-font-size: 32px;

--base-font-size: var(--sm-font-size);
--base-line-height: var(--sm-line-height);
Expand All @@ -55,9 +55,9 @@
--spacing-sm: 10px;
--spacing-base: 15px;
--spacing-md: 20px;
--spacing-lg: 25px;
--spacing-lg: 24px;
--spacing-xl: 30px;
--spacing-xxl: 40px;
--spacing-xxl: 36px;

--grid-gutter: var(--spacing-md);
--grid-max-width: calc(1200px + var(--grid-gutter) * 2);
Expand All @@ -71,18 +71,20 @@
--font-inter-medium: 'Inter-Medium';
--font-inter-regular: 'Inter-Regular';
--font-inter-bold: 'Inter-Bold';
--font-inter-semi-bold: 'Inter-SemiBold';

--font-family-regular: 'OpenSans-regular';
--font-family-medium: 'OpenSans-SemiBold';
--font-family-bold: 'OpenSans-Bold';
--font-family-regular: var(--font-inter-regular);
--font-family-medium: var(--font-inter-medium);
--font-family-semi-bold: var(--font-inter-semi-bold);
--font-family-bold: var(--font-inter-bold);

--headings-color: var(--color-default-base);
--headings-font-family-regular: 'smoolthan_regular';
--headings-font-family-medium: 'smoolthan_medium';
--headings-font-family-bold: 'smoolthan_bold';
--headings-font-family-regular: var(--font-inter-regular);
--headings-font-family-medium: var(--font-inter-medium);
--headings-font-family-bold: var(--font-inter-bold);

--headings-margin-bottom: 15px;
--headings-font-family: var(--headings-font-family-medium);
--headings-font-family: var(--headings-font-family-bold);
--headings-font-weight: 500;
--headings-line-height: var(--base-line-height);

Expand Down
Binary file removed src/common/fonts/OpenSans-Bold.eot
View file
Open in desktop
Binary file not shown.
Loading
Loading