Skip to content

Commit

Permalink
Merge branch 'feature/#101_angular15_update' of github.com:fabioformo…
Browse files Browse the repository at this point in the history
…sa/quartz-manager into feature/#101_angular15_update

# Conflicts:
#	.gitignore
#	quartz-manager-frontend/src/styles.css
  • Loading branch information
fabioformosa committed Mar 25, 2024
2 parents 7cef355 + c646624 commit f96e356
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<mat-toolbar id="footer" style="color: rgba(255, 255, 255, 0.541176);" fxLayout="row" fxLayoutAlign="center center">
<a mat-icon-button href="https://github.com/fabioformosa/quartz-manager">
<img src="assets/image/github.png"/>
&nbsp; Quartz Manager
</a>
<!-- Hand crafted with love by &nbsp;-->
<!-- <a href="https://github.com/fabioformosa" style="color: rgba(255, 255, 255, 0.870588);">Fabio Formosa</a>-->
<a href="https://github.com/fabioformosa/quartz-manager" class="flex flex-row align-items-center" style="gap: 6px">
<div class="flex"><img src="assets/image/github.png"/></div>
<div class="font-size-14 font-weight-500 display-block line-height-100">Quartz Manager</div>
</a>
<!-- Hand crafted with love by &nbsp;-->
<!-- <a href="https://github.com/fabioformosa" style="color: rgba(255, 255, 255, 0.870588);">Fabio Formosa</a>-->
</mat-toolbar>
19 changes: 18 additions & 1 deletion quartz-manager-frontend/src/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ body {

.flex {
display: flex;
}
}

.flex-row {
flex-direction: row;
Expand Down Expand Up @@ -79,3 +79,20 @@ body {
.mdc-list-item__primary-text {
font-size: 0.8em !important;
}

.font-size-14 {
font-size: 14px;
}
.font-weight-500 {
font-weight: 500;
}
.display-block {
display: block;
}
.line-height-100 {
line-height: 100%;
}
.align-items-center {
align-items: center;
}

0 comments on commit f96e356

Please sign in to comment.