diff --git a/angular.json b/angular.json index 114d212..6317d16 100644 --- a/angular.json +++ b/angular.json @@ -29,6 +29,11 @@ "styles": [ "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [] }, "configurations": { @@ -85,6 +90,11 @@ "styles": [ "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [], "assets": [ "src/favicon.ico", @@ -177,8 +187,13 @@ "projects/market/src/assets" ], "styles": [ - "projects/market/src/styles.scss" + "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [] }, "configurations": { @@ -249,8 +264,13 @@ "tsConfig": "projects/market/tsconfig.spec.json", "karmaConfig": "projects/market/karma.conf.js", "styles": [ - "projects/market/src/styles.scss" + "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [], "assets": [ "projects/market/src/favicon.ico", @@ -343,8 +363,13 @@ "projects/sso/src/assets" ], "styles": [ - "projects/sso/src/styles.scss" + "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [] }, "configurations": { @@ -415,8 +440,13 @@ "tsConfig": "projects/sso/tsconfig.spec.json", "karmaConfig": "projects/sso/karma.conf.js", "styles": [ - "projects/sso/src/styles.scss" + "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [], "assets": [ "projects/sso/src/favicon.ico", @@ -544,8 +574,13 @@ "projects/account/src/assets" ], "styles": [ - "projects/account/src/styles.scss" + "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [] }, "configurations": { @@ -600,8 +635,13 @@ "tsConfig": "projects/account/tsconfig.spec.json", "karmaConfig": "projects/account/karma.conf.js", "styles": [ - "projects/account/src/styles.scss" + "src/styles.scss" ], + "stylePreprocessorOptions": { + "includePaths": [ + "./src/stylesheets" + ] + }, "scripts": [], "assets": [ "projects/account/src/favicon.ico", @@ -653,4 +693,4 @@ } }, "defaultProject": "internet" -} \ No newline at end of file +} diff --git a/projects/market/src/app/app.component.html b/projects/market/src/app/app.component.html index 9641929..247b98d 100644 --- a/projects/market/src/app/app.component.html +++ b/projects/market/src/app/app.component.html @@ -6,7 +6,7 @@ Inject the marketplace app into the component of the global navigation menu library. --> -
+
diff --git a/projects/market/src/app/app.component.scss b/projects/market/src/app/app.component.scss index 263bf03..9065c29 100644 --- a/projects/market/src/app/app.component.scss +++ b/projects/market/src/app/app.component.scss @@ -1,6 +1,4 @@ -@import '../stylesheets/global'; - -.app-body { +#app-body { margin-left: 3vw; margin-right: 3vw; margin-top: 30px; diff --git a/projects/market/src/app/skills/install-button/install-button.component.html b/projects/market/src/app/skills/install-button/install-button.component.html index 1495b60..4b8704e 100644 --- a/projects/market/src/app/skills/install-button/install-button.component.html +++ b/projects/market/src/app/skills/install-button/install-button.component.html @@ -6,7 +6,7 @@ fxLayout="row" fxLayoutAlign="center center" mat-flat-button - class="uninstall-button" + id="uninstall-button" (click)="uninstallSkill()" [ngStyle]="installButtonStyle" > @@ -20,7 +20,7 @@ fxLayout="row" fxLayoutAlign="center center" mat-flat-button - class="installed-button" + id="installed-button" [disabled]="true" [ngStyle]="installButtonStyle" > @@ -34,10 +34,10 @@ fxLayout="row" fxLayoutAlign="center center" mat-flat-button - class="installing-button" + id="installing-button" [ngStyle]="installButtonStyle" > -
+
ADDING... @@ -47,10 +47,10 @@ fxLayout="row" fxLayoutAlign="center center" mat-flat-button - class="uninstalling-button" + id="uninstalling-button" [ngStyle]="installButtonStyle" > -
+
REMOVING... @@ -59,7 +59,7 @@ *ngSwitchDefault fxLayout="row" fxLayoutAlign="center center" - class="install-button" + id="install-button" mat-flat-button (click)="install_skill()" [ngStyle]="installButtonStyle" @@ -68,4 +68,4 @@ ADD - \ No newline at end of file + diff --git a/projects/market/src/app/skills/install-button/install-button.component.scss b/projects/market/src/app/skills/install-button/install-button.component.scss index 728f150..470317d 100644 --- a/projects/market/src/app/skills/install-button/install-button.component.scss +++ b/projects/market/src/app/skills/install-button/install-button.component.scss @@ -1,4 +1,4 @@ -@import '../../../stylesheets/global.scss'; +@import 'mycroft-colors'; @mixin install-status { border-radius: 4px; @@ -24,22 +24,22 @@ fa-icon { opacity: 0.6; } -.install-button { +#install-button { @include install-status; background-color: $mycroft-primary ; color: $mycroft-white; } -.install-button:hover { +#install-button:hover { @include install-status; background-color: $mycroft-tertiary-green; color: $mycroft-secondary; } -.installed-button { +#installed-button { @include install-status; } -.installing-button { +#installing-button { @include install-status; background-color: $mycroft-tertiary-green; color: $mycroft-secondary; @@ -49,14 +49,14 @@ fa-icon { margin-top: 7px; } } -.installing-spinner { +#installing-spinner { @include spinner-common; border-right-color: $mycroft-secondary; border-top-color: $mycroft-secondary; } -.uninstall-button { +#uninstall-button { @include install-status; background-color: $mycroft-dark-grey; color: $mycroft-white; @@ -68,12 +68,12 @@ fa-icon { color: $mycroft-white; } -.uninstalling-button { +#uninstalling-button { @include install-status; background-color: #eb5757; color: $mycroft-white; } -.uninstalling-spinner { +#uninstalling-spinner { @include spinner-common; border-right-color: $mycroft-white; border-top-color: $mycroft-white; diff --git a/projects/market/src/app/skills/skill-detail/skill-detail-body/skill-detail-body.component.scss b/projects/market/src/app/skills/skill-detail/skill-detail-body/skill-detail-body.component.scss index 580b1fa..1403341 100644 --- a/projects/market/src/app/skills/skill-detail/skill-detail-body/skill-detail-body.component.scss +++ b/projects/market/src/app/skills/skill-detail/skill-detail-body/skill-detail-body.component.scss @@ -1,6 +1,7 @@ -@import '../../../../stylesheets/global'; +@import 'mycroft-colors'; +@import "components/text"; -.skill-detail-body { +#skill-detail-body { background-color: $mycroft-white; border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; @@ -9,26 +10,31 @@ padding-left: 4vw; padding-right: 4vw; padding-top: 3vh; + .mat-subheading-1 { color: $mycroft-dark-grey; font-variant: small-caps; font-weight: 500; margin-bottom: 5px; } + .mat-body-1 { color: $mycroft-secondary; } - .kde-icon { + + #kde-icon { height: 40px; width: 40px; } - .skill-detail-section { + + #skill-detail-section { margin-bottom: 30px; } - .skill-detail-body-left { + + #skill-detail-body-left { min-width: 340px; margin-right: 50px; - .skill-trigger { + #skill-trigger { @include skill-trigger; @include ellipsis-overflow; margin-right: 10px; @@ -36,7 +42,8 @@ max-width: 340px; } } - .skill-detail-body-right { + + #skill-detail-body-right { margin-right: 20px; white-space: nowrap; img { diff --git a/projects/market/src/app/skills/skill-detail/skill-detail-header/skill-detail-header.component.html b/projects/market/src/app/skills/skill-detail/skill-detail-header/skill-detail-header.component.html index 1288fe0..a81d3a8 100644 --- a/projects/market/src/app/skills/skill-detail/skill-detail-header/skill-detail-header.component.html +++ b/projects/market/src/app/skills/skill-detail/skill-detail-header/skill-detail-header.component.html @@ -1,8 +1,8 @@ -
+
-
+
@@ -19,13 +19,13 @@
-
+
-
+
diff --git a/projects/market/src/app/skills/skill-detail/skill-detail.component.scss b/projects/market/src/app/skills/skill-detail/skill-detail.component.scss index fc14cc7..a368c6f 100644 --- a/projects/market/src/app/skills/skill-detail/skill-detail.component.scss +++ b/projects/market/src/app/skills/skill-detail/skill-detail.component.scss @@ -1,18 +1,18 @@ -@import '../../../stylesheets/global'; +@import 'mycroft-colors'; @mixin skill-detail-size { margin: 0 auto; max-width: 1000px; } -.navigate-back { +#navigate-back { @include skill-detail-size; color: $mycroft-dark-grey; padding-bottom: 10px; } -.skill-detail { +#skill-detail { @include skill-detail-size; box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.12); border-radius: 10px; -} \ No newline at end of file +} diff --git a/projects/market/src/app/skills/skill-summary/skill-card/skill-card-header.component.html b/projects/market/src/app/skills/skill-summary/skill-card/skill-card-header.component.html index 9946b36..a1090e6 100644 --- a/projects/market/src/app/skills/skill-summary/skill-card/skill-card-header.component.html +++ b/projects/market/src/app/skills/skill-summary/skill-card/skill-card-header.component.html @@ -1,9 +1,9 @@ -
+
-
+
-
+
-
+
-
+
{{skill.trigger}}
diff --git a/projects/market/src/app/skills/skill-summary/skill-card/skill-card.component.scss b/projects/market/src/app/skills/skill-summary/skill-card/skill-card.component.scss index fc14479..bf5d5e3 100644 --- a/projects/market/src/app/skills/skill-summary/skill-card/skill-card.component.scss +++ b/projects/market/src/app/skills/skill-summary/skill-card/skill-card.component.scss @@ -1,4 +1,5 @@ -@import '../../../../stylesheets/global.scss'; +@import 'mycroft-colors'; +@import "components/text"; @mixin card-width { width: 320px; @@ -6,10 +7,16 @@ mat-card { @include card-width; + + &:hover { + box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.2); + } + border-radius: 10px; cursor: pointer; margin: 10px; padding: 18px; + mat-card-title { @include ellipsis-overflow; color: $mycroft-secondary; @@ -18,27 +25,26 @@ mat-card { margin-bottom: 16px; text-align: center; } + mat-card-subtitle { - .skill-trigger { + #skill-trigger { @include ellipsis-overflow; @include skill-trigger; } } + mat-card-content { color: $mycroft-secondary; @include ellipsis-overflow; text-align: center; } + mat-card-actions { margin-left: 0; margin-bottom: 0; } } -mat-card:hover{ - box-shadow: 0 10px 20px 0 rgba(0, 0, 0, 0.2); -} - .login-snackbar { text-align: center; } diff --git a/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.html b/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.html index 154f1e8..a82740d 100644 --- a/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.html +++ b/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.html @@ -1,6 +1,6 @@ -
-
+
+
diff --git a/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.scss b/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.scss index 99d20ae..34dbca8 100644 --- a/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.scss +++ b/projects/market/src/app/skills/skill-summary/skill-search/skill-search.component.scss @@ -1,12 +1,13 @@ -@import '../../../../stylesheets/global'; +@import 'mycroft-colors'; fa-icon { color: $mycroft-dark-grey; } -.skill-toolbar { +#skill-toolbar { margin-left: 15px; - .search-field { + + #search-field { background-color: white; border-radius: 10px; color: $mycroft-dark-grey; @@ -14,8 +15,15 @@ fa-icon { padding-left: 20px; padding-right: 20px; padding-top: 10px; + mat-form-field { width: 100%; } } } + +#back-button { + color: $mycroft-dark-grey; + margin-left: 20px; + width: 100px; +} diff --git a/projects/market/src/app/skills/skill-summary/skill-summary.component.html b/projects/market/src/app/skills/skill-summary/skill-summary.component.html index 6472b6b..ca955bf 100644 --- a/projects/market/src/app/skills/skill-summary/skill-summary.component.html +++ b/projects/market/src/app/skills/skill-summary/skill-summary.component.html @@ -1,5 +1,5 @@ -
+
{{category}}
diff --git a/projects/market/src/app/skills/skill-summary/skill-summary.component.scss b/projects/market/src/app/skills/skill-summary/skill-summary.component.scss index 7ad775c..72dbdbc 100644 --- a/projects/market/src/app/skills/skill-summary/skill-summary.component.scss +++ b/projects/market/src/app/skills/skill-summary/skill-summary.component.scss @@ -1,22 +1,17 @@ -@import '../../../stylesheets/global'; +@import 'mycroft-colors'; -.skill-category { +#skill-category { background-color: $market-background; + mat-toolbar { background-color: $market-background; color: $mycroft-dark-grey; font-size: xx-large; margin-top: 20px; padding-left: 10px; + fa-icon { margin-right: 15px; } } } - -.back-button { - color: $mycroft-dark-grey; - margin-left: 20px; - width: 100px; -} - diff --git a/projects/market/src/stylesheets/global.scss b/projects/market/src/stylesheets/global.scss deleted file mode 100644 index 1c0e701..0000000 --- a/projects/market/src/stylesheets/global.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "base/mycroft-colors"; -@import "components/buttons"; -@import "components/text"; \ No newline at end of file diff --git a/projects/sso/src/app/app.component.scss b/projects/sso/src/app/app.component.scss index 2718fdd..59dfa7b 100644 --- a/projects/sso/src/app/app.component.scss +++ b/projects/sso/src/app/app.component.scss @@ -1,4 +1,4 @@ -@import "../stylesheets/global"; +@import "mycroft-colors"; /* Split the screen in half */ .split { @@ -40,4 +40,4 @@ img { margin-bottom: 50px; margin-top: 50px; width: 600px; -} \ No newline at end of file +} diff --git a/projects/sso/src/app/background/background.component.html b/projects/sso/src/app/background/background.component.html index 304e0ba..f24596c 100644 --- a/projects/sso/src/app/background/background.component.html +++ b/projects/sso/src/app/background/background.component.html @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/projects/sso/src/app/background/background.component.scss b/projects/sso/src/app/background/background.component.scss index 572dc6f..3e912e3 100644 --- a/projects/sso/src/app/background/background.component.scss +++ b/projects/sso/src/app/background/background.component.scss @@ -1,7 +1,7 @@ -@import "../../stylesheets/global"; +@import "mycroft-colors"; /* Split the screen in half */ -.split { +@mixin half-screen { height: 50%; left: 0; overflow-x: hidden; @@ -12,13 +12,15 @@ } /* Top Half */ -.top { +#top-half { + @include half-screen; top: 0; background-color: $mycroft-primary; } /* Bottom Half */ -.bottom { +#bottom-half { + @include half-screen; bottom: 0; background-color: #e5e5e5; } diff --git a/projects/sso/src/app/login/antisocial/antisocial.component.html b/projects/sso/src/app/login/antisocial/antisocial.component.html index 0ed4c1c..e270dee 100644 --- a/projects/sso/src/app/login/antisocial/antisocial.component.html +++ b/projects/sso/src/app/login/antisocial/antisocial.component.html @@ -28,6 +28,6 @@ > Forgot password? - +
Invalid username/password combination; try again
diff --git a/projects/sso/src/app/login/antisocial/antisocial.component.scss b/projects/sso/src/app/login/antisocial/antisocial.component.scss index e67a060..ba12041 100644 --- a/projects/sso/src/app/login/antisocial/antisocial.component.scss +++ b/projects/sso/src/app/login/antisocial/antisocial.component.scss @@ -1,36 +1,37 @@ -@import '../../../stylesheets/global'; - -button { - @include login-button; -} +@import 'mycroft-colors'; +@import "components/buttons"; form { background-color: $mycroft-white; border-radius: 10px; padding: 20px; + fa-icon { color: $mycroft-dark-grey; margin-right: 15px; } + mat-checkbox { color: $mycroft-dark-grey; } - .forgot-password { + #forgot-password { margin-left: 30px; } + button { - background-color: $mycroft-primary; + @include action-button; margin-top: 30px; text-align: center; - } - button:hover { - background-color: $mycroft-tertiary-green; - color: $mycroft-secondary; + + &:hover { + background-color: $mycroft-tertiary-green; + color: $mycroft-secondary; + } } } .mat-body-2 { - color: $mycroft-tertiary-red; + color: red; padding: 15px; } diff --git a/projects/sso/src/app/login/login.component.html b/projects/sso/src/app/login/login.component.html index de496af..cddcef2 100644 --- a/projects/sso/src/app/login/login.component.html +++ b/projects/sso/src/app/login/login.component.html @@ -1,5 +1,5 @@
-