From b3f77eb72107f253bb35f10ead9d39671fd60eb4 Mon Sep 17 00:00:00 2001 From: _Bastler <_Bastler@bstly.de> Date: Fri, 26 Mar 2021 14:13:17 +0100 Subject: [PATCH] scss improvments --- src/app/pages/general/general.component.scss | 3 - src/app/pages/general/general.component.ts | 9 +-- .../pages/notfound/notfound.component.html | 2 +- .../pages/notfound/notfound.component.scss | 15 ---- src/app/pages/notfound/notfound.component.ts | 3 +- .../unavailable/unavailable.component.html | 2 +- .../unavailable/unavailable.component.scss | 15 ---- .../unavailable/unavailable.component.ts | 3 +- src/app/pages/user/user.component.html | 2 +- src/app/pages/user/user.component.scss | 0 src/app/pages/user/user.component.ts | 3 +- src/styles.scss | 68 ++++++++++++++++++- src/variables.scss | 2 +- 13 files changed, 77 insertions(+), 50 deletions(-) delete mode 100644 src/app/pages/general/general.component.scss delete mode 100644 src/app/pages/notfound/notfound.component.scss delete mode 100644 src/app/pages/unavailable/unavailable.component.scss delete mode 100644 src/app/pages/user/user.component.scss diff --git a/src/app/pages/general/general.component.scss b/src/app/pages/general/general.component.scss deleted file mode 100644 index 28a96de..0000000 --- a/src/app/pages/general/general.component.scss +++ /dev/null @@ -1,3 +0,0 @@ -.text-warning { - color: darkred; -} diff --git a/src/app/pages/general/general.component.ts b/src/app/pages/general/general.component.ts index a591b93..543448e 100644 --- a/src/app/pages/general/general.component.ts +++ b/src/app/pages/general/general.component.ts @@ -2,8 +2,7 @@ import {Component, OnInit} from '@angular/core'; @Component({ selector: 'app-imprint', - templateUrl: './general.imprint.html', - styleUrls: ['./general.component.scss'] + templateUrl: './general.imprint.html' }) export class ImprintComponent implements OnInit { @@ -17,8 +16,7 @@ export class ImprintComponent implements OnInit { @Component({ selector: 'app-privacy-policy', - templateUrl: './general.privacy-policy.html', - styleUrls: ['./general.component.scss'] + templateUrl: './general.privacy-policy.html' }) export class PrivacyPolicyComponent implements OnInit { @@ -32,8 +30,7 @@ export class PrivacyPolicyComponent implements OnInit { @Component({ selector: 'app-terms-of-service', - templateUrl: './general.terms-of-service.html', - styleUrls: ['./general.component.scss'] + templateUrl: './general.terms-of-service.html' }) export class TermsOfServiceComponent implements OnInit { diff --git a/src/app/pages/notfound/notfound.component.html b/src/app/pages/notfound/notfound.component.html index bf87a9b..e538720 100644 --- a/src/app/pages/notfound/notfound.component.html +++ b/src/app/pages/notfound/notfound.component.html @@ -1,4 +1,4 @@ - + 404 {{'not-found' | i18n}} diff --git a/src/app/pages/notfound/notfound.component.scss b/src/app/pages/notfound/notfound.component.scss deleted file mode 100644 index ce2b305..0000000 --- a/src/app/pages/notfound/notfound.component.scss +++ /dev/null @@ -1,15 +0,0 @@ -@import './../../../variables.scss'; - -mat-card-header { - background-color: $accent !important; - padding: 16px ; - padding-bottom: 0; -} - -mat-card { - padding: 0; -} - -mat-card-content { - padding: 16px; -} diff --git a/src/app/pages/notfound/notfound.component.ts b/src/app/pages/notfound/notfound.component.ts index 352b952..8e42275 100644 --- a/src/app/pages/notfound/notfound.component.ts +++ b/src/app/pages/notfound/notfound.component.ts @@ -2,8 +2,7 @@ import { Component, OnInit } from '@angular/core'; @Component({ selector: 'app-notfound', - templateUrl: './notfound.component.html', - styleUrls: ['./notfound.component.scss'] + templateUrl: './notfound.component.html' }) export class NotfoundComponent implements OnInit { diff --git a/src/app/pages/unavailable/unavailable.component.html b/src/app/pages/unavailable/unavailable.component.html index 069a441..fba5928 100644 --- a/src/app/pages/unavailable/unavailable.component.html +++ b/src/app/pages/unavailable/unavailable.component.html @@ -1,4 +1,4 @@ - + 503 {{'service-unavailable' | i18n}} diff --git a/src/app/pages/unavailable/unavailable.component.scss b/src/app/pages/unavailable/unavailable.component.scss deleted file mode 100644 index d4686fb..0000000 --- a/src/app/pages/unavailable/unavailable.component.scss +++ /dev/null @@ -1,15 +0,0 @@ -@import './../../../variables.scss'; - -mat-card-header { - background-color: $warn !important; - padding: 16px ; - padding-bottom: 0; -} - -mat-card { - padding: 0; -} - -mat-card-content, mat-card-actions { - padding: 16px !important; -} diff --git a/src/app/pages/unavailable/unavailable.component.ts b/src/app/pages/unavailable/unavailable.component.ts index d4822be..f98c126 100644 --- a/src/app/pages/unavailable/unavailable.component.ts +++ b/src/app/pages/unavailable/unavailable.component.ts @@ -3,8 +3,7 @@ import { Location } from '@angular/common' @Component({ selector: 'app-unavailable', - templateUrl: './unavailable.component.html', - styleUrls: ['./unavailable.component.scss'] + templateUrl: './unavailable.component.html' }) export class UnavailableComponent implements OnInit { diff --git a/src/app/pages/user/user.component.html b/src/app/pages/user/user.component.html index 350f4c2..404c03f 100644 --- a/src/app/pages/user/user.component.html +++ b/src/app/pages/user/user.component.html @@ -6,7 +6,7 @@ - + {{error.status}} {{'user.unavailable' | i18n}} diff --git a/src/app/pages/user/user.component.scss b/src/app/pages/user/user.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/pages/user/user.component.ts b/src/app/pages/user/user.component.ts index d04872e..efc7a3d 100644 --- a/src/app/pages/user/user.component.ts +++ b/src/app/pages/user/user.component.ts @@ -6,8 +6,7 @@ import {ProfileService} from '../../services/profile.service'; @Component({ selector: 'app-user', - templateUrl: './user.component.html', - styleUrls: ['./user.component.scss'] + templateUrl: './user.component.html' }) export class UserComponent implements OnInit { diff --git a/src/styles.scss b/src/styles.scss index 846b10c..4ad2420 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -191,6 +191,72 @@ mat-sidenav-container { } .text-warning { - color: darkred; + color: $warn; } +mat-card.warn, +mat-card.accent { + + padding: 0; + + mat-card-content { + padding: 16px; + + } + + mat-card-header { + padding: 16px; + padding-bottom: 0; + } + + mat-card-actions { + padding: 16px !important; + padding-top: 0 !important; + } + +} + +mat-card.warn mat-card-header { + background-color: $warn !important; +} + +mat-card.accent mat-card-header { + background-color: $accent !important; +} + + +table { + border: 0; + border-spacing: 0; + width: 100%; + + th, + td, + td { + color: rgba(0, 0, 0, 0.87); + font-size: 14px; + border: 0; + padding: 14px; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: rgba(0, 0, 0, 0.12); + } + + th:first-of-type, + td:first-of-type, + td:first-of-type { + padding-left: 24px; + } + + thead { + tr { + height: 56px; + + th { + color: rgba(0, 0, 0, 0.54); + font-size: 12px; + font-weight: 500; + } + } + } +} diff --git a/src/variables.scss b/src/variables.scss index 10e5ffd..21fc989 100644 --- a/src/variables.scss +++ b/src/variables.scss @@ -17,4 +17,4 @@ $dark-warn: mat-palette($mat-deep-orange); $primary: mat-color($dark-primary); $accent: mat-color($dark-accent); $warn: mat-color($dark-warn); -} +} \ No newline at end of file