diff --git a/goofy-client/apps/goofy/src/styles/main.scss b/goofy-client/apps/goofy/src/styles/main.scss index 38781f9f8d782c3b8473ef3fac260c51125e6d09..4a6d88927261ec690aa55acb4f6e1115ff349d5e 100644 --- a/goofy-client/apps/goofy/src/styles/main.scss +++ b/goofy-client/apps/goofy/src/styles/main.scss @@ -47,6 +47,7 @@ @import 'libs/ui/src/lib/ui/button-toggle/button-toogle.theme'; @import 'libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-filter-menu-container/vorgang-filter-menu/_vorgang-filter-item.theme.scss'; @import 'libs/vorgang/src/lib/vorgang-list-page-container/vorgang-list-page/vorgang-views-menu/_vorgang-views-menu.theme.scss'; +@import 'libs/user-assistance/src/lib/help-menu/_help-menu.theme.scss'; // TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles. // The following line adds: diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.scss b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.scss index bbb334b45970207161384ff458090b6e88535cc1..d964b13e33bbd1e951cf9c2d08f3843789c326ea 100644 --- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.scss +++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.scss @@ -42,7 +42,7 @@ header { .middle { flex-grow: 1; - margin-right: 2rem; + margin-right: 1rem; } .left { diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/_help-menu.theme.scss b/goofy-client/libs/user-assistance/src/lib/help-menu/_help-menu.theme.scss new file mode 100644 index 0000000000000000000000000000000000000000..e2dd3e9a0986d661fda9d2a9a317ec7d93cc27db --- /dev/null +++ b/goofy-client/libs/user-assistance/src/lib/help-menu/_help-menu.theme.scss @@ -0,0 +1,12 @@ +goofy-client-help-menu { + .mat-fab { + box-shadow: none !important; + background-color: transparent !important; + border-radius: 10px; + height: 40px; + width: auto; + .mat-button-wrapper { + padding: 0.5rem; + } + } +} \ No newline at end of file diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html index e2946428eed5fd59f94e18bbbf8fbb71de0b50d2..5194de7ed99c3547d7cb670011b525a43f4e820b 100644 --- a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html +++ b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.html @@ -1,7 +1,7 @@ -<button *ngIf="getNumberOfMenuItems() > 0" mat-icon-button [matMenuTriggerFor]="helpMenu.matMenu" data-test-id="help-menu-button"> +<button *ngIf="getNumberOfMenuItems() > 0" mat-fab extended [matMenuTriggerFor]="helpMenu.matMenu" data-test-id="help-menu-button"> <div class="help-menu"> <goofy-client-ozgcloud-icon icon="help_outline"></goofy-client-ozgcloud-icon> - <div>Hilfe</div> + <div class="text">Hilfe</div> </div> </button> <goofy-client-ozgcloud-menu #helpMenu> diff --git a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss index 572847b05a72cdd02019427f51030b1f614b90af..659bfb479d6bb866431b89c8634ca8306ea0a666 100644 --- a/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss +++ b/goofy-client/libs/user-assistance/src/lib/help-menu/help-menu.component.scss @@ -1,8 +1,14 @@ +@import 'variables'; + .help-menu { display: flex; align-items: center; + color: $grey; + .text { + margin-top: 1px; + } } goofy-client-ozgcloud-icon { - margin-right: 2px; + margin-right: 4px; } diff --git a/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.scss b/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.scss index dcd1f8656229c234d72004204e468f31a4b0b1ed..13c676bcf8e51513c9ddfa1fdb75b3bf1d8f0336 100644 --- a/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.scss +++ b/goofy-client/libs/user-profile/src/lib/user-profile-in-header-container/user-profile-in-header/user-profile-in-header.component.scss @@ -22,7 +22,6 @@ * unter der Lizenz sind dem Lizenztext zu entnehmen. */ .big-button { - margin-left: 20px; display: flex; align-items: center; justify-content: center; diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.scss b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.scss index 9a08a5aabce6cc4cdbb268c4190a8d67f82f19e5..0efb6f1808218879a86711603e05b98c26951214 100644 --- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.scss +++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings-container.component.scss @@ -21,3 +21,6 @@ * Die sprachspezifischen Genehmigungen und Beschränkungen * unter der Lizenz sind dem Lizenztext zu entnehmen. */ +:host { + margin: 0 16px 0 10px; +} \ No newline at end of file diff --git a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss index 125c958eff2f69124298909eb3f141b787ddcc22..327145eed90e138207ee82ee6f8cc54291044342 100644 --- a/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss +++ b/goofy-client/libs/user-settings/src/lib/user-settings-container/user-settings/user-settings-menu-button/user-settings-menu-button.component.scss @@ -23,5 +23,4 @@ */ goofy-client-icon-button-with-spinner { display: block; - margin-left: 34px; } \ No newline at end of file