migrated to scss to fix build errors

This commit is contained in:
Shane Harris
2022-07-05 13:11:12 +02:00
parent 3b5a7cbe0c
commit e3584c13a9
30 changed files with 46 additions and 47 deletions
+8 -3
View File
@@ -23,7 +23,7 @@
"src/assets"
],
"styles": [
"src/styles.css",
"src/styles.scss",
"node_modules/materialize-css/dist/css/materialize.min.css"
],
"scripts": [
@@ -137,7 +137,7 @@
"tsConfig": "src/tsconfig.spec.json",
"karmaConfig": "src/karma.conf.js",
"styles": [
"src/styles.css"
"src/styles.scss"
],
"scripts": [],
"assets": [
@@ -200,5 +200,10 @@
"defaultProject": "desktop-app",
"cli": {
"packageManager": "yarn"
},
"schematics": {
"@schematics/angular:component": {
"styleext": "scss"
}
}
}
}
+1 -1
View File
@@ -11,7 +11,7 @@ import { environment } from '../environments/environment';
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css'],
styleUrls: ['./app.component.scss'],
})
export class AppComponent implements OnInit, AfterViewInit {
@ViewChild('spinner', { static: false }) spinner;
@@ -4,7 +4,7 @@ import { AppService } from '../app.service';
@Component({
selector: 'app-content',
templateUrl: './content.component.html',
styleUrls: ['./content.component.css'],
styleUrls: ['./content.component.scss'],
})
export class ContentComponent implements OnInit {
constructor(public appService: AppService) {}
@@ -4,7 +4,7 @@ import { ProcessBucketService } from '../process-bucket.service';
@Component({
selector: 'app-current-task-item',
templateUrl: './current-task-item.component.html',
styleUrls: ['./current-task-item.component.css'],
styleUrls: ['./current-task-item.component.scss'],
})
export class CurrentTaskItemComponent implements OnInit {
@Input() task;
@@ -6,7 +6,7 @@ import { AppService } from '../app.service';
@Component({
selector: 'app-current-tasks',
templateUrl: './current-tasks.component.html',
styleUrls: ['./current-tasks.component.css'],
styleUrls: ['./current-tasks.component.scss'],
})
export class CurrentTasksComponent implements OnInit {
constructor(public processService: ProcessBucketService, public appService: AppService) {
+1 -1
View File
@@ -19,7 +19,7 @@ declare let M;
@Component({
selector: 'app-files',
templateUrl: './files.component.html',
styleUrls: ['./files.component.css'],
styleUrls: ['./files.component.scss'],
})
export class FilesComponent implements OnInit {
@ViewChild('filesModal', { static: false }) filesModal;
@@ -32,7 +32,7 @@ interface LogCatEntry {
@Component({
selector: 'app-header',
templateUrl: './header.component.html',
styleUrls: ['./header.component.css'],
styleUrls: ['./header.component.scss'],
})
export class HeaderComponent implements OnInit {
@ViewChild('header', { static: false }) header;
+12 -15
View File
@@ -2,23 +2,20 @@ import { Component, Input, OnInit } from '@angular/core';
import { AppService } from '../app.service';
@Component({
selector: 'app-link',
templateUrl: './link.component.html',
styleUrls: ['./link.component.css']
selector: 'app-link',
templateUrl: './link.component.html',
styleUrls: ['./link.component.scss'],
})
export class LinkComponent implements OnInit {
@Input('url') url:string;
@Input('text') text:string;
@Input('isDark') isDark:boolean;
constructor(public appService:AppService) {
@Input('url') url: string;
@Input('text') text: string;
@Input('isDark') isDark: boolean;
constructor(public appService: AppService) {}
}
ngOnInit() {}
ngOnInit() {
}
open(){
console.log(this.url);
this.appService.opn(this.url);
}
open() {
console.log(this.url);
this.appService.opn(this.url);
}
}
@@ -1,15 +1,12 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-loading-spinner-small',
templateUrl: './loading-spinner-small.component.html',
styleUrls: ['./loading-spinner-small.component.css']
selector: 'app-loading-spinner-small',
templateUrl: './loading-spinner-small.component.html',
styleUrls: ['./loading-spinner-small.component.scss'],
})
export class LoadingSpinnerSmallComponent implements OnInit {
constructor() {}
constructor() { }
ngOnInit() {
}
ngOnInit() {}
}
@@ -4,7 +4,7 @@ import { LoadingSpinnerService } from '../loading-spinner.service';
@Component({
selector: 'app-loading-spinner',
templateUrl: './loading-spinner.component.html',
styleUrls: ['./loading-spinner.component.css'],
styleUrls: ['./loading-spinner.component.scss'],
})
export class LoadingSpinnerComponent implements OnInit {
isActive: boolean;
@@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
@Component({
selector: 'app-package-item',
templateUrl: './package-item.component.html',
styleUrls: ['./package-item.component.css'],
styleUrls: ['./package-item.component.scss'],
})
export class PackageItemComponent implements OnInit {
@Input() package: any;
@@ -10,7 +10,7 @@ import { PackageService } from './package.service';
@Component({
selector: 'app-packages',
templateUrl: './packages.component.html',
styleUrls: ['./packages.component.css'],
styleUrls: ['./packages.component.scss'],
})
export class PackagesComponent implements OnInit {
@ViewChild('appSettingsModal', { static: false }) appSettingsModal;
+1 -1
View File
@@ -5,7 +5,7 @@ import { AdbClientService } from '../adb-client.service';
@Component({
selector: 'app-setup',
templateUrl: './setup.component.html',
styleUrls: ['./setup.component.css'],
styleUrls: ['./setup.component.scss'],
})
export class SetupComponent implements OnInit {
isInstallingLauncher: boolean;
@@ -4,7 +4,7 @@ import { StatusBarService } from '../status-bar.service';
@Component({
selector: 'app-status-bar',
templateUrl: './status-bar.component.html',
styleUrls: ['./status-bar.component.css'],
styleUrls: ['./status-bar.component.scss'],
})
export class StatusBarComponent implements OnInit {
isWarning: boolean;
@@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription';
@Component({
selector: 'app-webview',
templateUrl: './webview.component.html',
styleUrls: ['./webview.component.css'],
styleUrls: ['./webview.component.scss'],
})
export class WebviewComponent implements OnInit {
constructor(webService: WebviewService, appService: AppService, router: Router, route: ActivatedRoute) {
@@ -242,7 +242,7 @@ code > pre, .code{
text-align: center;
text-overflow: ellipsis;
text-transform: uppercase;
color: rgb(var(--pure-material-onprimary-rgb, 255, 255, 255));
color: rgb(255, 255, 255);
background: #E51253;
border-radius: 10px;
box-shadow: 0 3px 1px -1px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
@@ -302,7 +302,7 @@ code > pre, .code{
bottom: 0;
left: 0;
right: 0;
background-color: rgb(var(--pure-material-onprimary-rgb, 255, 255, 255));
background-color: rgb(255, 255, 255);
opacity: 0;
transition: opacity 0.2s;
}
@@ -317,7 +317,7 @@ code > pre, .code{
padding: 50%;
width: 32px; /* Safari */
height: 32px; /* Safari */
background-color: rgb(var(--pure-material-onprimary-rgb, 255, 255, 255));
background-color: rgb(255, 255, 255);
opacity: 0;
transform: translate(-50%, -50%) scale(1);
transition: opacity 1s, transform 0.5s;
@@ -354,8 +354,8 @@ code > pre, .code{
/* Disabled */
.pure-material-button-contained:disabled {
color: rgba(var(--pure-material-onsurface-rgb, 255,255,255), 0.38);
background-color: rgba(var(--pure-material-onsurface-rgb, 255,255,255), 0.20);
color: rgba(255, 255, 255, 0.38);
background-color: rgba(255, 255, 255, 0.20);
box-shadow: none;
cursor: initial;
}
@@ -409,10 +409,10 @@ code > pre, .code{
transition: .2s;
}
&:not(.filled-in) + span:not(.lever):after {
border: 0;
transform: scale(0);
}
:not(.filled-in) + span:not(.lever):after {
border: 0;
transform: scale(0);
}
&:not(:checked):disabled + span:not(.lever):before {
border: none;