Skip to content
Snippets Groups Projects
Commit 3d398531 authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-4215 OZG-4245 Fix layout' (#279) from...

Merge pull request 'OZG-4215 OZG-4245 Fix layout' (#279) from OZG-4215-Hilfe-Button-Design-Anpassungen into master

Reviewed-on: https://git.ozg-sh.de/mgm/goofy/pulls/279
parents 52869bcd cb3b25a8
No related branches found
No related tags found
No related merge requests found
Showing with 26 additions and 6 deletions
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
@import 'libs/ui/src/lib/ui/button-toggle/button-toogle.theme'; @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-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/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. // TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
// The following line adds: // The following line adds:
......
...@@ -42,7 +42,7 @@ header { ...@@ -42,7 +42,7 @@ header {
.middle { .middle {
flex-grow: 1; flex-grow: 1;
margin-right: 2rem; margin-right: 1rem;
} }
.left { .left {
......
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
<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"> <div class="help-menu">
<goofy-client-ozgcloud-icon icon="help_outline"></goofy-client-ozgcloud-icon> <goofy-client-ozgcloud-icon icon="help_outline"></goofy-client-ozgcloud-icon>
<div>Hilfe</div> <div class="text">Hilfe</div>
</div> </div>
</button> </button>
<goofy-client-ozgcloud-menu #helpMenu> <goofy-client-ozgcloud-menu #helpMenu>
......
@import 'variables';
.help-menu { .help-menu {
display: flex; display: flex;
align-items: center; align-items: center;
color: $grey;
.text {
margin-top: 1px;
}
} }
goofy-client-ozgcloud-icon { goofy-client-ozgcloud-icon {
margin-right: 2px; margin-right: 4px;
} }
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
.big-button { .big-button {
margin-left: 20px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
......
...@@ -21,3 +21,6 @@ ...@@ -21,3 +21,6 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen * Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
:host {
margin: 0 16px 0 10px;
}
\ No newline at end of file
...@@ -23,5 +23,4 @@ ...@@ -23,5 +23,4 @@
*/ */
goofy-client-icon-button-with-spinner { goofy-client-icon-button-with-spinner {
display: block; display: block;
margin-left: 34px;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment