Skip to content

Commit

Permalink
Merge pull request #11 from zembrodt/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
zembrodt authored Dec 15, 2021
2 parents 57d4269 + 30d27c5 commit 856ee86
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "portfolio",
"version": "0.1.3",
"version": "0.1.4",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down
3 changes: 3 additions & 0 deletions src/app/components/contact/contact.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<div class="contact">
<div class="mat-h2">Thanks for reading! Feel free to get in touch!</div>
<p class="copyright">
<a href="https://raw.githubusercontent.com/zembrodt/portfolio/main/LICENSE" target="_blank">© {{year}} Ryan Zembrodt</a>
</p>
</div>
10 changes: 10 additions & 0 deletions src/app/components/contact/contact.component.theme.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@use '~@angular/material' as mat;
@import "~@angular/material/theming";

@mixin contact-theme($theme) {
$primary: map-get($theme, primary);

.copyright a {
color: mat.get-color-from-palette($primary, 500);
}
}
2 changes: 2 additions & 0 deletions src/app/components/contact/contact.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { Component, OnInit } from '@angular/core';
})
export class ContactComponent implements OnInit {

year = new Date().getFullYear();

constructor() { }

ngOnInit(): void {
Expand Down
Binary file modified src/assets/docs/ryan-zembrodt-resume.pdf
Binary file not shown.
4 changes: 3 additions & 1 deletion src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

@import "styles/themes";
@import "app/app.component.theme";
@import "app/components/dashboard/dashboard.component.scss-theme";
@import "app/components/contact/contact.component.theme";
@import "app/components/dashboard/dashboard.component.theme";
@import "app/components/navbar/navbar.component.theme";
@import "app/core/timeline/timeline/timeline.component.theme";
@import "app/core/timeline/timeline-entry/timeline-entry.component.theme";
Expand Down Expand Up @@ -103,6 +104,7 @@ body.scrollbar-dark::-webkit-scrollbar-track {
/* Application theming */
@mixin custom-components-theme($theme) {
@include app-component-theme($theme);
@include contact-theme($theme);
@include dashboard-theme($theme);
@include navbar-theme($theme);
@include timeline-theme($theme);
Expand Down

0 comments on commit 856ee86

Please sign in to comment.