diff --git a/assets/icons/control-menu-button.svg b/assets/icons/control-menu-button.svg deleted file mode 100644 index 4e9420b4..00000000 --- a/assets/icons/control-menu-button.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-chromium-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-chromium-linux.png index 00c7611b..3fa2fc1c 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-chromium-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-chromium-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-webkit-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-webkit-linux.png index 9ce8fc4b..76987f53 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-webkit-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-dark-webkit-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-chromium-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-chromium-linux.png index a9199bb1..7e3afb92 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-chromium-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-chromium-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-webkit-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-webkit-linux.png index 11112ce4..97540231 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-webkit-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-Showcase-light-webkit-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-chromium-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-chromium-linux.png index 4d1c012f..08d3ea89 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-chromium-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-chromium-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-webkit-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-webkit-linux.png index 16e49b80..15216b42 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-webkit-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-dark-webkit-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-chromium-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-chromium-linux.png index 36563806..c3b37b0e 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-chromium-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-chromium-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-webkit-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-webkit-linux.png index fcd65076..a36578bb 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-webkit-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-SingleSection-light-webkit-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-chromium-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-chromium-linux.png index 8b50ddce..4e84e0e3 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-chromium-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-chromium-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-webkit-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-webkit-linux.png index 73133405..079fe505 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-webkit-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-dark-webkit-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-chromium-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-chromium-linux.png index dac6283b..6a0faf44 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-chromium-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-chromium-linux.png differ diff --git a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-webkit-linux.png b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-webkit-linux.png index 3e2181f4..6d9bda42 100644 Binary files a/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-webkit-linux.png and b/src/components/ActionBar/__snapshots__/ActionBar.visual.test.tsx-snapshots/ActionBar-render-story-StretchGroup-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/AsideHeader.scss b/src/components/AsideHeader/AsideHeader.scss index 32f2f9a5..a1bed3f4 100644 --- a/src/components/AsideHeader/AsideHeader.scss +++ b/src/components/AsideHeader/AsideHeader.scss @@ -193,6 +193,18 @@ $block: '.#{variables.$ns}aside-header'; margin: 0 10px 2px; } + &__logo-container { + display: flex; + align-items: center; + justify-content: space-between; + + &_without-logo { + padding-bottom: var(--g-spacing-2); + margin-bottom: var(--g-spacing-2); + border-bottom: solid 1px var(--g-color-line-generic); + } + } + &__logo-button &__logo-icon-place { height: var( --gn-aside-header-item-icon-background-size, @@ -258,4 +270,13 @@ $block: '.#{variables.$ns}aside-header'; padding-left: var(--gn-aside-header-min-width); } } + + &__pin-button { + margin-right: 10px; + margin-left: auto; + + &_compact { + margin-right: auto; + } + } } diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-chromium-linux.png index b878578c..cdf08fa5 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-webkit-linux.png index 203a8d05..a0304a13 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-chromium-linux.png index 7b0f96e2..7a9b2a2c 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-webkit-linux.png index 8e7d21f0..61228878 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-AdvancedUsage-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-chromium-linux.png index 444355ad..687736c0 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-webkit-linux.png index 010db70a..d7362cf7 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-chromium-linux.png index 1747f30e..b6a6c4c7 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-webkit-linux.png index b5cd36ba..9f131243 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomBackground-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-chromium-linux.png index 2b1a3a08..09e38328 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-webkit-linux.png index e799ac05..48ef3164 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-chromium-linux.png index 1555aac1..a900fede 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-webkit-linux.png index 6f1d3aee..89f27985 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-CustomTheme-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-chromium-linux.png index 6eed0797..11ec5d5b 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-webkit-linux.png index 96802482..d86640a3 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-chromium-linux.png index b9a47b39..1c0fa446 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-webkit-linux.png index 6a4c1651..c5cccdb0 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlert-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-chromium-linux.png index c3d403d2..3e66c2f1 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-webkit-linux.png index 1960c1cd..d9feebc6 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-chromium-linux.png index da0baab9..ff997b4a 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-webkit-linux.png index b32e4ee5..34aa9d69 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCentered-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-chromium-linux.png index 08d8d57f..834a1e06 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-webkit-linux.png index b39152d9..71cdcd62 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-chromium-linux.png index 69a389fb..72cd187b 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-webkit-linux.png index a27d6f9c..50dc716b 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-HeaderAlertCustom-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-chromium-linux.png index 2f810249..e6f716f5 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-webkit-linux.png index a538bf2d..5937c02d 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-chromium-linux.png index 7447ed4e..4b119c3a 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-webkit-linux.png index bac4f18d..74e12fc0 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-LineClamp-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-chromium-linux.png index f6ccb53d..7325103b 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-webkit-linux.png index e3d9024a..d6bcb415 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-chromium-linux.png index 6f5349fb..fed405d7 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-webkit-linux.png index 58b3afdf..d7e97fb1 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-MultipleTooltip-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-chromium-linux.png index 86ac8a62..94c4255e 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-webkit-linux.png index 5ec801c2..76bf520b 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-dark-webkit-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-chromium-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-chromium-linux.png index 3539a3ad..588918b4 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-chromium-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-chromium-linux.png differ diff --git a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-webkit-linux.png b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-webkit-linux.png index 9e24012c..6e40314d 100644 Binary files a/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-webkit-linux.png and b/src/components/AsideHeader/__snapshots__/AsideHeader.visual.test.tsx-snapshots/AsideHeader-render-story-Showcase-light-webkit-linux.png differ diff --git a/src/components/AsideHeader/components/CollapseButton/CollapseButton.scss b/src/components/AsideHeader/components/CollapseButton/CollapseButton.scss index 12bc6567..2236f8b8 100644 --- a/src/components/AsideHeader/components/CollapseButton/CollapseButton.scss +++ b/src/components/AsideHeader/components/CollapseButton/CollapseButton.scss @@ -1,49 +1,11 @@ @use '../../../variables'; -@use '~@gravity-ui/uikit/styles/mixins'; $block: '.#{variables.$ns}collapse-button'; -$buttonHeight: 20px; - #{$block} { - --_--focus-outline-color: var(--g-color-line-focus); - --_--focus-outline-offset: 0; - - @include mixins.button-reset(); - - min-height: $buttonHeight; - width: 100%; - display: flex; - align-items: center; - justify-content: center; - border-top: 1px solid - var(--gn-aside-header-divider-horizontal-color, var(--_--horizontal-divider-line-color)); - position: relative; - box-sizing: content-box; - - &::before { - content: ''; - position: absolute; - z-index: -1; - inset: 0 2px 2px; - } - - &:focus-visible::before { - outline: var(--_--focus-outline-color) solid 2px; - outline-offset: var(--_--focus-outline-offset); - } - - &:not(&_compact) { + &_compact { #{$block}__icon { transform: rotate(180deg); } } - - &:hover #{$block}__icon { - color: var(--g-color-text-primary); - } - - &__icon { - color: var(--g-color-text-secondary); - } } diff --git a/src/components/AsideHeader/components/CollapseButton/CollapseButton.tsx b/src/components/AsideHeader/components/CollapseButton/CollapseButton.tsx index cc9742db..41bd9d7c 100644 --- a/src/components/AsideHeader/components/CollapseButton/CollapseButton.tsx +++ b/src/components/AsideHeader/components/CollapseButton/CollapseButton.tsx @@ -1,12 +1,12 @@ import React, {useCallback} from 'react'; -import {Icon} from '@gravity-ui/uikit'; +import {Button, Icon} from '@gravity-ui/uikit'; import {block} from '../../../utils/cn'; import {useAsideHeaderContext, useAsideHeaderInnerContext} from '../../AsideHeaderContext'; import i18n from '../../i18n'; -import controlMenuButtonIcon from '../../../../../assets/icons/control-menu-button.svg'; +import ArrowLeftFromLineIcon from '@gravity-ui/icons/svgs/arrow-left-from-line.svg'; import './CollapseButton.scss'; @@ -31,13 +31,16 @@ export const CollapseButton = ({className}: CollapseButtonProps) => { : collapseTitle || i18n('button_collapse'); const defaultButton = ( - - - + + ); if (collapseButtonWrapper) { diff --git a/src/components/AsideHeader/components/FirstPanel.tsx b/src/components/AsideHeader/components/FirstPanel.tsx index 48be94e6..66894e22 100644 --- a/src/components/AsideHeader/components/FirstPanel.tsx +++ b/src/components/AsideHeader/components/FirstPanel.tsx @@ -6,7 +6,6 @@ import {useAsideHeaderInnerContext} from '../AsideHeaderContext'; import {b} from '../utils'; import {useGroupedMenuItems} from './AllPagesPanel/useGroupedMenuItems'; -import {CollapseButton} from './CollapseButton/CollapseButton'; import {CompositeBar} from './CompositeBar'; import {Header} from './Header'; import {Panels} from './Panels'; @@ -26,7 +25,6 @@ export const FirstPanel = React.forwardRef((_props, ref) => { customBackground, customBackgroundClassName, className, - hideCollapseButton, menuItems, menuGroups, qa, @@ -89,7 +87,6 @@ export const FirstPanel = React.forwardRef((_props, ref) => { asideRef, })} - {!hideCollapseButton && } diff --git a/src/components/AsideHeader/components/Header.tsx b/src/components/AsideHeader/components/Header.tsx index 6c0ca30a..8e593127 100644 --- a/src/components/AsideHeader/components/Header.tsx +++ b/src/components/AsideHeader/components/Header.tsx @@ -9,6 +9,7 @@ import {AsideHeaderItem} from '../types'; import {b} from '../utils'; import {useGroupedMenuItems} from './AllPagesPanel/useGroupedMenuItems'; +import {CollapseButton} from './CollapseButton/CollapseButton'; import {CompositeBar} from './CompositeBar'; import headerDividerCollapsedIcon from '../../../../assets/icons/divider-collapsed.svg'; @@ -17,9 +18,17 @@ const DEFAULT_SUBHEADER_ITEMS: AsideHeaderItem[] = []; const HEADER_COMPOSITE_ID = 'gravity-ui/navigation-header-composite-bar'; export const Header = () => { - const {logo, compact, onItemClick, onClosePanel, headerDecoration, subheaderItems} = - useAsideHeaderInnerContext(); - const {isExpanded} = useAsideHeaderInnerContext(); + const { + logo, + isExpanded, + onItemClick, + onClosePanel, + headerDecoration, + subheaderItems, + hideCollapseButton, + } = useAsideHeaderInnerContext(); + + const compact = !isExpanded; const items = useGroupedMenuItems(subheaderItems || DEFAULT_SUBHEADER_ITEMS); @@ -33,15 +42,19 @@ export const Header = () => { return ( - {logo && ( - - )} + + {logo && ( + + )} + + {!hideCollapseButton && } +