From e0727fd2fb4a8a5463a59f0c99c65a3525f6420b Mon Sep 17 00:00:00 2001 From: adhiyan-tangoe Date: Wed, 12 Oct 2022 02:05:49 +0530 Subject: [PATCH 1/3] Changes [CHORE] 767 action sheet design changes #767 1. Handled appearance of scrollbar on accordion's expansion by adjusting the height. 2. Font style changes for the shell area. 3. Fixed the colour issue for the danger action sheet. --- .../go-action-sheet/go-action-sheet.component.scss | 6 +++--- .../go-action-sheet/go-panel/go-panel.component.scss | 6 +----- .../go-side-nav/go-side-nav/go-side-nav.component.html | 1 + .../go-side-nav/go-side-nav/go-side-nav.component.scss | 6 ++++++ projects/go-style-guide/src/app/app.component.html | 2 ++ projects/go-style-guide/src/app/app.component.scss | 6 ++++++ 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/projects/go-lib/src/lib/components/go-action-sheet/go-action-sheet.component.scss b/projects/go-lib/src/lib/components/go-action-sheet/go-action-sheet.component.scss index 830d1914e..d4182ab0f 100644 --- a/projects/go-lib/src/lib/components/go-action-sheet/go-action-sheet.component.scss +++ b/projects/go-lib/src/lib/components/go-action-sheet/go-action-sheet.component.scss @@ -10,13 +10,13 @@ $as-before-box-diag-width: 21.21px; position: relative; &__scroll-container { - max-height: 375px; - overflow: auto; + overflow: hidden; } &__content { border-radius: $global-radius; - overflow: hidden; + max-height: 375px; + overflow: auto; } &__content-container { diff --git a/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss b/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss index 6c3c5f678..36c9fbeeb 100644 --- a/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss +++ b/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss @@ -61,13 +61,9 @@ $theme-light-transparentized: rgba($theme-light-color, .5); color: $ui-color-negative; } - .go-panel { - &__title { - & &-text { + .go-panel__title-text { color: $ui-color-negative; } - } - } } &--header { diff --git a/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.html b/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.html index 42549bf3b..5ac52cad1 100644 --- a/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.html +++ b/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.html @@ -40,6 +40,7 @@

{{ appDrawerHeader }}

diff --git a/projects/go-style-guide/src/app/app.component.scss b/projects/go-style-guide/src/app/app.component.scss index 69803c173..a002889eb 100644 --- a/projects/go-style-guide/src/app/app.component.scss +++ b/projects/go-style-guide/src/app/app.component.scss @@ -104,3 +104,9 @@ code { border-radius: $global-radius; padding: $column-gutter; } + +.go-action-sheet-items { + span.go-panel__title-text { + font-family: $secondary-font-stack !important; + } +} \ No newline at end of file From 686514e881994a69e084cacf2b9125741d5c41aa Mon Sep 17 00:00:00 2001 From: adhiyan-tangoe Date: Wed, 12 Oct 2022 14:56:07 +0530 Subject: [PATCH 2/3] Changes [CHORE] 767 action sheet design changes #891 Code review suggestion changes --- .../go-action-sheet/go-panel/go-panel.component.scss | 4 ++-- projects/go-style-guide/src/app/app.component.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss b/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss index 36c9fbeeb..45fdb42fe 100644 --- a/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss +++ b/projects/go-lib/src/lib/components/go-action-sheet/go-panel/go-panel.component.scss @@ -62,8 +62,8 @@ $theme-light-transparentized: rgba($theme-light-color, .5); } .go-panel__title-text { - color: $ui-color-negative; - } + color: $ui-color-negative; + } } &--header { diff --git a/projects/go-style-guide/src/app/app.component.scss b/projects/go-style-guide/src/app/app.component.scss index a002889eb..5ae2863a7 100644 --- a/projects/go-style-guide/src/app/app.component.scss +++ b/projects/go-style-guide/src/app/app.component.scss @@ -109,4 +109,4 @@ code { span.go-panel__title-text { font-family: $secondary-font-stack !important; } -} \ No newline at end of file +} From 4af91fe63814f1b799da3afacb3416401c0db1fc Mon Sep 17 00:00:00 2001 From: adhiyan-tangoe Date: Thu, 13 Oct 2022 22:34:51 +0530 Subject: [PATCH 3/3] Changes [CHORE] 767 action sheet design changes #891 Code review suggestion changes --- .../go-side-nav/go-side-nav/go-side-nav.component.scss | 4 ++-- projects/go-style-guide/src/app/app.component.scss | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss b/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss index e97d68003..0e7ec9df0 100644 --- a/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss +++ b/projects/go-lib/src/lib/components/go-side-nav/go-side-nav/go-side-nav.component.scss @@ -106,8 +106,8 @@ &--items { span.go-panel__title-text { - font-family: $secondary-font-stack !important; - } + font-family: $secondary-font-stack !important; + } } } } diff --git a/projects/go-style-guide/src/app/app.component.scss b/projects/go-style-guide/src/app/app.component.scss index 5ae2863a7..f1e3fce26 100644 --- a/projects/go-style-guide/src/app/app.component.scss +++ b/projects/go-style-guide/src/app/app.component.scss @@ -107,6 +107,6 @@ code { .go-action-sheet-items { span.go-panel__title-text { - font-family: $secondary-font-stack !important; - } + font-family: $secondary-font-stack !important; + } }