From 2ddb434cafa7fe94e79577378350ddc65c307dac Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 11 Jul 2024 01:22:35 +0000 Subject: [PATCH] feat: use consistent font sizes in buttons (#1281) * feat: use consistent font sizes in buttons Signed-off-by: Viraj Sanghvi * Update button groups to use small font size and changelog Signed-off-by: Viraj Sanghvi * Update button font-size for v7 Signed-off-by: Viraj Sanghvi --------- Signed-off-by: Viraj Sanghvi Signed-off-by: Viraj Sanghvi Signed-off-by: Ashwin P Chandran Co-authored-by: Ashwin P Chandran (cherry picked from commit ae87c7e9429502bdc9e133f6833ef2d4a59ab907) Signed-off-by: github-actions[bot] # Conflicts: # CHANGELOG.md --- src/components/button/button_group/_button_group_button.scss | 2 +- src/global_styling/mixins/_button.scss | 2 +- src/themes/oui-next/global_styling/mixins/_button.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/button/button_group/_button_group_button.scss b/src/components/button/button_group/_button_group_button.scss index 39a900894b..e6ad2ca675 100644 --- a/src/components/button/button_group/_button_group_button.scss +++ b/src/components/button/button_group/_button_group_button.scss @@ -12,7 +12,7 @@ .ouiButtonGroupButton { @include ouiButtonBase; @include ouiFont; - @include ouiFontSize; + @include ouiFontSizeS; // sass-lint:disable-block indentation transition: background-color $ouiAnimSpeedNormal ease-in-out, diff --git a/src/global_styling/mixins/_button.scss b/src/global_styling/mixins/_button.scss index 26578d8b63..a877641f64 100644 --- a/src/global_styling/mixins/_button.scss +++ b/src/global_styling/mixins/_button.scss @@ -47,7 +47,7 @@ @mixin ouiButton { @include ouiButtonBase; @include ouiFont; - @include ouiFontSize; + @include ouiFontSizeS; text-decoration: none; border: solid 1px transparent; diff --git a/src/themes/oui-next/global_styling/mixins/_button.scss b/src/themes/oui-next/global_styling/mixins/_button.scss index d89222cee4..9e598c09d8 100644 --- a/src/themes/oui-next/global_styling/mixins/_button.scss +++ b/src/themes/oui-next/global_styling/mixins/_button.scss @@ -47,7 +47,7 @@ @mixin ouiButton { @include ouiButtonBase; @include ouiFont; - @include ouiFontSize; + @include ouiFontSizeS; text-decoration: none; border: solid 1px transparent;