From ffce8404481ce10beb7125bcf5904fcba67d922f Mon Sep 17 00:00:00 2001 From: Santiago Perez De Rosso Date: Mon, 4 Nov 2019 12:41:21 -0800 Subject: [PATCH] minor fixes --- .../authentication/sign-out/sign-out.component.html | 1 - .../event/create-event/create-event.component.html | 5 ++--- .../update-object/update-object.component.html | 3 +-- .../create-schedule/create-schedule.component.html | 2 +- .../create-score/create-score.component.html | 2 +- packages/compiler/src/app/app.compiler.ts | 6 ++++-- packages/themes/scss/template.scss | 13 ++++++------- samples/sn/src/styles.scss | 4 +--- 8 files changed, 16 insertions(+), 20 deletions(-) diff --git a/packages/catalog/authentication/src/app/authentication/sign-out/sign-out.component.html b/packages/catalog/authentication/src/app/authentication/sign-out/sign-out.component.html index 65d48a5c2..a1881f74a 100644 --- a/packages/catalog/authentication/src/app/authentication/sign-out/sign-out.component.html +++ b/packages/catalog/authentication/src/app/authentication/sign-out/sign-out.component.html @@ -1,4 +1,3 @@
- diff --git a/packages/catalog/event/src/app/event/create-event/create-event.component.html b/packages/catalog/event/src/app/event/create-event/create-event.component.html index 3823439b0..bfc6c11af 100644 --- a/packages/catalog/event/src/app/event/create-event/create-event.component.html +++ b/packages/catalog/event/src/app/event/create-event/create-event.component.html @@ -61,9 +61,8 @@
-
diff --git a/packages/catalog/property/src/app/property/update-object/update-object.component.html b/packages/catalog/property/src/app/property/update-object/update-object.component.html index f12e1ddb2..6470c3afd 100644 --- a/packages/catalog/property/src/app/property/update-object/update-object.component.html +++ b/packages/catalog/property/src/app/property/update-object/update-object.component.html @@ -28,8 +28,7 @@
diff --git a/packages/catalog/schedule/src/app/schedule/create-schedule/create-schedule.component.html b/packages/catalog/schedule/src/app/schedule/create-schedule/create-schedule.component.html index 9b21e215b..42075560c 100644 --- a/packages/catalog/schedule/src/app/schedule/create-schedule/create-schedule.component.html +++ b/packages/catalog/schedule/src/app/schedule/create-schedule/create-schedule.component.html @@ -106,7 +106,7 @@
{{ viewDate | calendarDate:(view + 'ViewTitle'):'en' }}

diff --git a/packages/catalog/scoring/src/app/scoring/create-score/create-score.component.html b/packages/catalog/scoring/src/app/scoring/create-score/create-score.component.html index 716726eec..369905e7b 100644 --- a/packages/catalog/scoring/src/app/scoring/create-score/create-score.component.html +++ b/packages/catalog/scoring/src/app/scoring/create-score/create-score.component.html @@ -36,7 +36,7 @@
diff --git a/packages/compiler/src/app/app.compiler.ts b/packages/compiler/src/app/app.compiler.ts index 5158d8cf1..acb4220dc 100644 --- a/packages/compiler/src/app/app.compiler.ts +++ b/packages/compiler/src/app/app.compiler.ts @@ -133,11 +133,13 @@ export class AppCompiler { } } - const globalStyleFileScss = path.join(this.projectDir, 'src', 'styles.scss'); + const globalStyleFileScss = path.join( + this.projectDir, 'src', 'styles.scss'); const globalStyleScss: string = existsSync(globalStyleFileScss) ? readFileSync(globalStyleFileScss, 'utf8') : ''; - // Read user defined css and compile it into scss + // CSS is valid SCSS. Thus, if the user provided a global CSS file we + // add the CSS code to the SCSS file content. const globalStyleFileCss = path.join(this.projectDir, 'src', 'styles.css'); const globalStyleCss: string = existsSync(globalStyleFileCss) ? readFileSync(globalStyleFileCss, 'utf8') : ''; diff --git a/packages/themes/scss/template.scss b/packages/themes/scss/template.scss index e2e06d083..380d7f051 100644 --- a/packages/themes/scss/template.scss +++ b/packages/themes/scss/template.scss @@ -1,5 +1,5 @@ - -/* default color palatte */ +// Base template +// default color palette $primaryColor: #00237d !default; $textColor: #000000 !default; $linkColor: #0000EE !default; @@ -19,7 +19,7 @@ $navbarLinkHoverColor: #0000EE !default; $navbarVerticalAlign: middle !default; $navbarPadding: 0 0; -$mainFont: 'Arial', san-serif !default; +$mainFont: 'Arial', sans-serif !default; $textFont: $mainFont !default; $headingFontWeight: bold !default; @@ -99,7 +99,7 @@ nav { } html, -body{ +body { background: $backgroundColor; font-family: $mainFont; } @@ -131,8 +131,8 @@ main { // About mat-button // there are three ways to overwrite the button information -// 1. Have a wrapper class called "dv-mat-button" on every -// in any concept [CHOSEN] +// 1. Have a wrapper class called "dv-mat-button" on every button in +// concept components [CHOSEN] // 2. Put an important tag after class "mat-button" // 3. Not use mat-button @@ -154,7 +154,6 @@ main { } } - @import "~@angular/material/theming"; @import "~@angular/material/prebuilt-themes/indigo-pink.css"; @import "~css-star-rating/dist/css/star-rating.min.css"; diff --git a/samples/sn/src/styles.scss b/samples/sn/src/styles.scss index 869566f6f..0585aa1f3 100644 --- a/samples/sn/src/styles.scss +++ b/samples/sn/src/styles.scss @@ -52,8 +52,7 @@ $navbarButtonPadding: 0 5px; border-left: 1px solid black; width: 1px; height: 15px; - margin-left: 4px; - margin-right: 4px; + margin: 3px 4px 0px 4px; } .write-comment-container { @@ -88,7 +87,6 @@ ul { min-height: 100vh; } - .navbar { .container { .navbar-brand {