Skip to content

Commit

Permalink
new custom variable / change old to fit component name
Browse files Browse the repository at this point in the history
  • Loading branch information
Dawid committed Aug 10, 2024
1 parent ce9b98d commit cff215d
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 18 deletions.
6 changes: 1 addition & 5 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<app-navigation-bar></app-navigation-bar>
<app-side-nav
*ngIf="viewManipulation.showSideBar"
@slideInOut
#sidebar
></app-side-nav>
<app-side-nav *ngIf="viewManipulation.showSideBar" @slideInOut></app-side-nav>
<router-outlet></router-outlet>
<app-footer></app-footer>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
routerLink="/"
(click)="scrollService.setTopPosition()"
title="Idź do strony głównej"
class="h-100 py-3/4 mr-auto-md ml-0-md mx-auto"
class="h-100 mr-auto-md ml-0-md mx-auto navbar__logo"
>
<img
[src]="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
.navbar {
position: fixed;
z-index: 1;
height: $top-bar-height;
height: $nav-bar-height;
button {
fa-icon {
pointer-events: none;
Expand All @@ -18,4 +18,7 @@
}
}
}
&__logo {
padding: $nav-bar-logo-pad;
}
}
4 changes: 2 additions & 2 deletions src/app/pages/blog/article/article.component.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@import "variabless";
:host {
display: block;
min-height: calc(100vh - $top-bar-height - 0.22rem);
padding-top: $top-bar-height;
min-height: calc(100vh - $nav-bar-height - 0.22rem);
padding-top: $nav-bar-height;
}

.article {
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/blog/blog.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

:host {
display: block;
min-height: calc(100vh - $top-bar-height - $fix-height);
padding-top: $top-bar-height;
min-height: calc(100vh - $nav-bar-height - $fix-height);
padding-top: $nav-bar-height;
}

.grid-layout {
Expand Down
4 changes: 2 additions & 2 deletions src/app/pages/custom-page/custom-page.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

:host {
display: block;
min-height: calc(100vh - $top-bar-height - $fix-height);
padding-top: $top-bar-height;
min-height: calc(100vh - $nav-bar-height - $fix-height);
padding-top: $nav-bar-height;
}
4 changes: 2 additions & 2 deletions src/app/pages/error-not-found/error-not-found.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

:host {
display: block;
min-height: calc(100vh - $top-bar-height - $fix-height);
padding-top: $top-bar-height;
min-height: calc(100vh - $nav-bar-height - $fix-height);
padding-top: $nav-bar-height;
}

.error-page {
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/_global-classess.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
}

.custom-page {
padding-top: $top-bar-height;
padding-top: $nav-bar-height;
}

.standard-shadow {
Expand Down
5 changes: 3 additions & 2 deletions src/assets/scss/_variabless.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@ $fix-height: 0.75rem !default;
//Footer
$footer-height: 5rem !default;

//Top Bar
$top-bar-height: 4.25rem !default;
//Navigation Bar
$nav-bar-height: 4.25rem !default;
$nav-bar-logo-pad: 0.75rem 0 !default;

0 comments on commit cff215d

Please sign in to comment.