diff --git a/angular.json b/angular.json index 52df64f..48a4209 100644 --- a/angular.json +++ b/angular.json @@ -24,7 +24,7 @@ "tsConfig": "tsconfig.app.json", "aot": true, "assets": [ - "src/favicon.ico", + "src/assets/images/favicon.png", "src/assets" ], "styles": [ diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss index 24c9086..a0eb681 100644 --- a/src/app/about/about.component.scss +++ b/src/app/about/about.component.scss @@ -64,7 +64,7 @@ border: none; padding: 0; font-size: $font-40; - color: $white-alpha; + color: $black-alpha; background: transparent; cursor: pointer; transition: transform .3s; diff --git a/src/app/app-layout/app-layout.component.ts b/src/app/app-layout/app-layout.component.ts index 83ed410..7174112 100644 --- a/src/app/app-layout/app-layout.component.ts +++ b/src/app/app-layout/app-layout.component.ts @@ -97,6 +97,6 @@ export class AppLayoutComponent implements OnInit { particlesLoaded(container: Container): void { - console.log('particlesLoaded', container) + //console.log('particlesLoaded', container) } } diff --git a/src/app/detail/detail.component.scss b/src/app/detail/detail.component.scss index 0df604d..6900e99 100644 --- a/src/app/detail/detail.component.scss +++ b/src/app/detail/detail.component.scss @@ -41,7 +41,7 @@ border: none; padding: 0; font-size: $font-40; - color: $white-alpha; + color: $black-alpha; background: transparent; cursor: pointer; transition: transform .3s; diff --git a/src/app/portfolio/portfolio.component.html b/src/app/portfolio/portfolio.component.html index 546cba5..3f9d61a 100644 --- a/src/app/portfolio/portfolio.component.html +++ b/src/app/portfolio/portfolio.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/app/portfolio/portfolio.component.scss b/src/app/portfolio/portfolio.component.scss index 554c6d3..a0965c4 100644 --- a/src/app/portfolio/portfolio.component.scss +++ b/src/app/portfolio/portfolio.component.scss @@ -6,13 +6,15 @@ .box { position: relative; display: flex; - background: $black; + //background: $black-alpha; border-radius: 10px; overflow: hidden; - margin: 20px 0; - padding: 20px; + margin: 10px 0; + padding: 40px 20px; + min-height: 250px; cursor: pointer; - transition: transform .4s; + transition: transform .4s, background .4s; + -webkit-backface-visibility: hidden; .image { position: absolute; @@ -21,9 +23,11 @@ height: 100%; width: 100%; object-fit: cover; - transform: translate(-50%, -50%); - transition: transform .4s; + transform: translate(-50%, -50%) scale(1.2); opacity: .5; + filter: grayscale(100%) invert(100%); + transition: transform .4s, opacity .4s, filter .4s; + -webkit-backface-visibility: hidden; z-index: 0; } @@ -32,47 +36,67 @@ margin: auto; text-align: center; transform: translate(0%, 0%); + color: $black; + transition: color .4s; + -webkit-backface-visibility: hidden; z-index: 1; .title { display: block; - color: $white; - font-size: $font-24; + font-size: $font-20; text-transform: uppercase; font-weight: bold; } .type { display: block; - color: $white; - font-size: $font-18; + font-size: $font-16; font-weight: bold; } .tags { display: block; - color: $white; - font-size: $font-14; + font-size: $font-12; text-transform: uppercase; font-weight: bold; - padding-top: 20px; + padding-top: 10px; } } @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} {transform: skew(#{$angle - 3}deg, #{$angle - 3}deg) ;} + &.skew-#{$angle} { + transform: skew(#{$angle - 3}deg, #{$angle - 3}deg); + /*animation: zoom#{$angle} #{$angle + 3}s ease-in infinite forwards; + @keyframes zoom#{$angle} { + 0% { transform: scale(1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + 50% { transform: scale(1.1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + 75% { transform: scale(.9) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + 100% { transform: scale(1) skew(#{$angle - 3}deg, #{$angle - 3}deg); } + }*/ + } } &:hover { + background: $black; z-index: 50; + //animation-play-state: paused; + @each $angle in 0,1,2,3,4,5,6 { - &.skew-#{$angle} {transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg) ;} + &.skew-#{$angle} { + transform: scale(1.4) rotate(2deg) skew(#{3 - $angle}deg, #{3 - $angle}deg); } + } .image { - transform: translate(-50%, -50%) scale(1.4); + filter: grayscale(100%) invert(0%) brightness(.5); + opacity: .9; + transform: translate(-50%, -50%) scale(1.6); + } + .text { + color: $yellow; } } } } + diff --git a/src/assets/images/favicon.png b/src/assets/images/favicon.png new file mode 100644 index 0000000..0d75435 Binary files /dev/null and b/src/assets/images/favicon.png differ diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index a6189e7..12602c7 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -4,14 +4,14 @@ $grid-breakpoints: ( sm: 576px, md: 768px, lg: 992px, - xl: 1200px + xl: 1440px ); $container-max-widths: ( sm: 540px, md: 720px, lg: 960px, - xl: 1140px + xl: 1418px ); $grid-columns: 12; diff --git a/src/favicon.ico b/src/favicon.ico deleted file mode 100644 index 997406a..0000000 Binary files a/src/favicon.ico and /dev/null differ diff --git a/src/favicon.png b/src/favicon.png new file mode 100644 index 0000000..0d75435 Binary files /dev/null and b/src/favicon.png differ diff --git a/src/index.html b/src/index.html index ccc6ae8..b5d7d53 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@ DslakWebsite - +