diff --git a/src/app/app.component.html b/src/app/app.component.html index 08f406d00..de399792b 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -20,7 +20,7 @@ Angular Starter - Angular NGrx Material Starter + Angular ngRx Material Starter diff --git a/src/app/app.component.scss b/src/app/app.component.scss index c13fbaf4b..333aa6d2a 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -26,6 +26,7 @@ $footer-height: 140px; } .wrapper { + z-index: -2; min-height: 100%; margin-bottom: -$footer-height; } diff --git a/src/app/examples/stock-market/stock-market.component.sccs-theme.scss b/src/app/examples/stock-market/stock-market.component.sccs-theme.scss index e2979ffac..46407dea4 100644 --- a/src/app/examples/stock-market/stock-market.component.sccs-theme.scss +++ b/src/app/examples/stock-market/stock-market.component.sccs-theme.scss @@ -1,6 +1,6 @@ @import '~@angular/material/theming'; -@mixin todos-component-theme($theme) { +@mixin examples-component-theme($theme) { $warn: map-get($theme, warn); md-card { diff --git a/src/app/static/about/about.component.html b/src/app/static/about/about.component.html index 17e2a33d9..862596b81 100644 --- a/src/app/static/about/about.component.html +++ b/src/app/static/about/about.component.html @@ -1,3 +1,17 @@ - - about works! - + + + Angular ngRx Material Starter + + Check Features + Check Examples + Change Theme + + + Getting started + git clone https://github.com/tomastrajan/angular-ngrx-material-starter.git new-project + cd new-project + npm install + npm start + + + diff --git a/src/app/static/about/about.component.scss b/src/app/static/about/about.component.scss index e69de29bb..6e83c81a3 100644 --- a/src/app/static/about/about.component.scss +++ b/src/app/static/about/about.component.scss @@ -0,0 +1,66 @@ +@import 'styles-variables'; + +.background { + position: absolute; + top: 64px; + left: 0; + bottom: 140px; + right: 0; + overflow-y: auto; + + .container { + margin-top: 100px; + } + + .actions { + text-align: center; + margin: 50px; + + } + + .get-started { + width: 625px; + margin: 50px auto; + font-size: 0.8em; + letter-spacing: .01px; + overflow-wrap: break-word; + + code { + word-wrap: break-word; + white-space: normal; + } + } + + h1 { + text-align: center; + font-size: 3em; + text-transform: uppercase; + } +} + +@media (max-width: map-get($grid-breakpoints, toolbar)) { + .background { + top: 56px; + } +} + +@media (max-width: map-get($grid-breakpoints, md)) { + .background { + .get-started { + width: auto; + } + } +} + +.background::before { + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + background: url('../../../assets/intro.jpg') no-repeat center top; + background-size: cover; + opacity: .6; + content: ""; + z-index: 0; +} diff --git a/src/app/static/about/about.component.scss-theme.scss b/src/app/static/about/about.component.scss-theme.scss new file mode 100644 index 000000000..8833bbb7f --- /dev/null +++ b/src/app/static/about/about.component.scss-theme.scss @@ -0,0 +1,19 @@ +@import '~@angular/material/theming'; + +@mixin about-component-theme($theme) { + $primary: map-get($theme, primary); + $accent: map-get($theme, accent); + $foreground: map-get($theme, foreground); + $background: map-get($theme, background); + + + .background { + color: mat-color($background, background); + background-color: mat-color($foreground, text); + } + + .get-started { + //border: 1px solid mat-color($background, background); + } +} + diff --git a/src/app/static/about/about.component.ts b/src/app/static/about/about.component.ts index bf19898d5..4fc7f023b 100644 --- a/src/app/static/about/about.component.ts +++ b/src/app/static/about/about.component.ts @@ -7,6 +7,8 @@ import { Component, OnInit } from '@angular/core'; }) export class AboutComponent implements OnInit { + intro = require('../../../assets/intro.jpg'); + constructor() { } ngOnInit() { diff --git a/src/assets/intro.jpg b/src/assets/intro.jpg new file mode 100644 index 000000000..8c1a66615 Binary files /dev/null and b/src/assets/intro.jpg differ diff --git a/src/styles-reset.scss-theme.scss b/src/styles-reset.scss-theme.scss index 35bb6a5f7..0263c05ed 100644 --- a/src/styles-reset.scss-theme.scss +++ b/src/styles-reset.scss-theme.scss @@ -14,6 +14,7 @@ } code { + color: mat-color($foreground, text); background-color: mat-color($accent, lighter); } } diff --git a/src/styles-variables.scss b/src/styles-variables.scss index e6e1250ef..483994989 100644 --- a/src/styles-variables.scss +++ b/src/styles-variables.scss @@ -1,6 +1,7 @@ $grid-breakpoints: ( xs: 0, sm: 576px, + toolbar: 600px, md: 768px, lg: 992px, xl: 1200px diff --git a/src/styles.scss b/src/styles.scss index 7c1e6c6ba..b9ce640fe 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -17,14 +17,17 @@ @import 'styles-reset.scss-theme'; @import 'app/app.component.scss-theme'; @import 'app/shared/big-input/big-input.component.scss-theme'; +@import 'app/static/about/about.component.scss-theme'; @import 'app/examples/todos/todos.component.scss-theme'; @import 'app/examples/stock-market/stock-market.component.sccs-theme.scss'; @mixin custom-components-theme($theme) { @include styles-reset-theme($theme); @include app-component-theme($theme); + @include about-component-theme($theme); @include big-input-component-theme($theme); @include todos-component-theme($theme); + @include examples-component-theme($theme); } .default-theme {
- about works! -
git clone https://github.com/tomastrajan/angular-ngrx-material-starter.git new-project
cd new-project
npm install
npm start