Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into TUI-46/css
Browse files Browse the repository at this point in the history
  • Loading branch information
ifrim committed Jun 17, 2024
2 parents 7dadb47 + fe2e9c6 commit 4ea38e4
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 18 deletions.
1 change: 1 addition & 0 deletions lib/c8df601cd07dcd5d5f41.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/index.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/index.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lib/sass/common/sass/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ $lg-line-height: 23px;
$xl-line-height: 24px;
$xxl-line-height: 30px;

$xs-font-size: 12px;
$xs-font-size: 13px;
$sm-font-size: 14px;
$md-font-size: 16px;
$lg-font-size: 17px;
$lg-font-size: 18px;
$xl-font-size: 20px;
$xxl-font-size: 25px;

Expand Down
2 changes: 1 addition & 1 deletion lib/tyk-ui.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/tyk-ui.css.map

Large diffs are not rendered by default.

32 changes: 23 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tyk-technologies/tyk-ui",
"version": "4.0.0-rc1",
"version": "4.0.0",
"description": "Tyk UI - ui reusable components",
"main": "src/index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/common/sass/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ $lg-line-height: 23px;
$xl-line-height: 24px;
$xxl-line-height: 30px;

$xs-font-size: 12px;
$xs-font-size: 13px;
$sm-font-size: 14px;
$md-font-size: 16px;
$lg-font-size: 17px;
$lg-font-size: 18px;
$xl-font-size: 20px;
$xxl-font-size: 25px;

Expand Down

0 comments on commit 4ea38e4

Please sign in to comment.