Skip to content

Commit

Permalink
Merge c42c4c6 into 6e175a4
Browse files Browse the repository at this point in the history
  • Loading branch information
wwelling committed Aug 26, 2020
2 parents 6e175a4 + c42c4c6 commit eafe33a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 28 deletions.
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
"test:ci": "npm run test:coverage && npm run test:audit"
},
"dependencies": {
"@angular/animations": "^10.0.9",
"@angular/common": "^10.0.9",
"@angular/compiler": "^10.0.9",
"@angular/core": "^10.0.9",
"@angular/elements": "^10.0.9",
"@angular/forms": "^10.0.9",
"@angular/localize": "^10.0.9",
"@angular/platform-browser": "^10.0.9",
"@angular/platform-browser-dynamic": "^10.0.9",
"@angular/router": "^10.0.9",
"@angular/animations": "^10.0.12",
"@angular/common": "^10.0.12",
"@angular/compiler": "^10.0.12",
"@angular/core": "^10.0.12",
"@angular/elements": "^10.0.12",
"@angular/forms": "^10.0.12",
"@angular/localize": "^10.0.12",
"@angular/platform-browser": "^10.0.12",
"@angular/platform-browser-dynamic": "^10.0.12",
"@angular/router": "^10.0.12",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@types/json5": "0.0.30",
"dotenv-override": "^5.0.1",
Expand All @@ -76,18 +76,18 @@
"zone.js": "~0.10.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1000.5",
"@angular-devkit/build-ng-packagr": "~0.1000.5",
"@angular-devkit/schematics": "^10.0.5",
"@angular/cli": "^10.0.5",
"@angular/compiler-cli": "^10.0.9",
"@angular/language-service": "^10.0.9",
"@angular-devkit/build-angular": "~0.1000.7",
"@angular-devkit/build-ng-packagr": "~0.1000.7",
"@angular-devkit/schematics": "^10.0.7",
"@angular/cli": "^10.0.7",
"@angular/compiler-cli": "^10.0.12",
"@angular/language-service": "^10.0.12",
"@compodoc/compodoc": "^1.1.11",
"@lhci/cli": "^0.4.4",
"@lhci/cli": "^0.5.0",
"@pickra/copy-code-block": "^1.2.0",
"@types/jasmine": "~3.5.12",
"@types/jasmine": "~3.5.13",
"@types/jasminewd2": "~2.0.8",
"@types/node": "^14.0.27",
"@types/node": "^14.6.0",
"angular-tslint-rules": "^1.20.4",
"chalk": "^4.1.0",
"chrome-launcher": "^0.13.4",
Expand All @@ -106,13 +106,13 @@
"karma-jasmine-html-reporter": "^1.5.4",
"lighthouse": "^6.2.0",
"lighthouse-badges": "^1.0.33",
"ng-packagr": "^10.0.3",
"ng-packagr": "^10.0.4",
"protractor": "~7.0.0",
"rimraf": "^3.0.2",
"static-server": "^2.2.1",
"ts-loader": "^8.0.2",
"ts-node": "~8.10.2",
"ts-loader": "^8.0.3",
"ts-node": "~9.0.0",
"tslint": "~6.1.3",
"typescript": "~3.9.7"
"typescript": "~3.9.4"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
@import '~bootstrap/scss/bootstrap.scss';

:host {
--wvr-black: #{$black};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import "../../shared/styles/wvr-variables.scss";

:host {
--wvr-nav-li-cursor: pointer;
--wvr-nav-li-height: 100%;
Expand Down Expand Up @@ -51,4 +53,4 @@ li.nav-item:hover {
color: var(--wvr-nav-link-color-hover);
text-decoration: var(--wvr-nav-link-text-decoration-hover);
}
}
}
2 changes: 0 additions & 2 deletions src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/* You can add global styles to this file, and also import other style files */

@import "~bootstrap/scss/bootstrap";

0 comments on commit eafe33a

Please sign in to comment.