mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-12 20:43:08 +00:00
Merge pull request #228 from LotteHofstede/bootstrap-upgrade
Bootstrap upgrade
This commit is contained in:
Tim Donohue
90
package.json
90
package.json
@@ -69,26 +69,26 @@
|
||||
"coverage": "http-server -c-1 -o -p 9875 ./coverage"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular/animations": "5.2.1",
|
||||
"@angular/common": "5.2.1",
|
||||
"@angular/core": "5.2.1",
|
||||
"@angular/forms": "5.2.1",
|
||||
"@angular/http": "5.2.1",
|
||||
"@angular/platform-browser": "5.2.1",
|
||||
"@angular/platform-browser-dynamic": "5.2.1",
|
||||
"@angular/platform-server": "5.2.1",
|
||||
"@angular/router": "5.2.1",
|
||||
"@angular/animations": "^5.2.5",
|
||||
"@angular/common": "^5.2.5",
|
||||
"@angular/core": "^5.2.5",
|
||||
"@angular/forms": "^5.2.5",
|
||||
"@angular/http": "^5.2.5",
|
||||
"@angular/platform-browser": "^5.2.5",
|
||||
"@angular/platform-browser-dynamic": "^5.2.5",
|
||||
"@angular/platform-server": "^5.2.5",
|
||||
"@angular/router": "^5.2.5",
|
||||
"@angularclass/bootloader": "1.0.1",
|
||||
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.9",
|
||||
"@ngrx/effects": "4.1.1",
|
||||
"@ngrx/router-store": "4.1.1",
|
||||
"@ngrx/store": "4.1.1",
|
||||
"@ng-bootstrap/ng-bootstrap": "^1.0.0",
|
||||
"@ngrx/effects": "^5.1.0",
|
||||
"@ngrx/router-store": "^5.0.1",
|
||||
"@ngrx/store": "^5.1.0",
|
||||
"@nguniversal/express-engine": "5.0.0-beta.5",
|
||||
"@ngx-translate/core": "9.1.1",
|
||||
"@ngx-translate/http-loader": "2.0.1",
|
||||
"angular-idle-preload": "2.0.4",
|
||||
"body-parser": "1.18.2",
|
||||
"bootstrap": "4.0.0-beta",
|
||||
"bootstrap": "^4.0.0",
|
||||
"cerialize": "0.1.18",
|
||||
"compression": "1.7.1",
|
||||
"cookie-parser": "1.4.3",
|
||||
@@ -106,45 +106,45 @@
|
||||
"pem": "1.12.3",
|
||||
"reflect-metadata": "0.1.12",
|
||||
"rxjs": "5.5.6",
|
||||
"ts-md5": "1.2.3",
|
||||
"ts-md5": "^1.2.4",
|
||||
"uuid": "^3.2.1",
|
||||
"webfontloader": "1.6.28",
|
||||
"zone.js": "0.8.20"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular/compiler": "^5.2.1",
|
||||
"@angular/compiler-cli": "^5.2.1",
|
||||
"@ngrx/store-devtools": "4.1.1",
|
||||
"@ngtools/webpack": "1.9.5",
|
||||
"@angular/compiler": "^5.2.5",
|
||||
"@angular/compiler-cli": "^5.2.5",
|
||||
"@ngrx/store-devtools": "^5.1.0",
|
||||
"@ngtools/webpack": "^1.10.0",
|
||||
"@types/cookie-parser": "1.4.1",
|
||||
"@types/deep-freeze": "0.1.1",
|
||||
"@types/express": "4.11.0",
|
||||
"@types/express": "^4.11.1",
|
||||
"@types/express-serve-static-core": "4.11.1",
|
||||
"@types/hammerjs": "2.0.35",
|
||||
"@types/jasmine": "2.8.4",
|
||||
"@types/jasmine": "^2.8.6",
|
||||
"@types/memory-cache": "0.2.0",
|
||||
"@types/mime": "2.0.0",
|
||||
"@types/node": "^9.3.0",
|
||||
"@types/node": "^9.4.6",
|
||||
"@types/serve-static": "1.13.1",
|
||||
"@types/uuid": "^3.4.3",
|
||||
"@types/webfontloader": "1.6.29",
|
||||
"ajv": "6.0.1",
|
||||
"ajv-keywords": "3.0.0",
|
||||
"ajv": "^6.1.1",
|
||||
"ajv-keywords": "^3.1.0",
|
||||
"angular2-template-loader": "0.6.2",
|
||||
"autoprefixer": "7.2.5",
|
||||
"autoprefixer": "^8.0.0",
|
||||
"awesome-typescript-loader": "3.4.1",
|
||||
"caniuse-lite": "1.0.30000792",
|
||||
"caniuse-lite": "^1.0.30000697",
|
||||
"codelyzer": "^4.1.0",
|
||||
"compression-webpack-plugin": "1.1.3",
|
||||
"copy-webpack-plugin": "4.3.1",
|
||||
"compression-webpack-plugin": "^1.1.6",
|
||||
"copy-webpack-plugin": "^4.4.1",
|
||||
"coveralls": "3.0.0",
|
||||
"css-loader": "0.28.9",
|
||||
"deep-freeze": "0.0.1",
|
||||
"exports-loader": "0.6.4",
|
||||
"exports-loader": "^0.7.0",
|
||||
"html-webpack-plugin": "2.30.1",
|
||||
"imports-loader": "0.7.1",
|
||||
"istanbul-instrumenter-loader": "3.0.0",
|
||||
"jasmine-core": "2.9.1",
|
||||
"jasmine-core": "^2.99.1",
|
||||
"jasmine-marbles": "0.2.0",
|
||||
"jasmine-spec-reporter": "4.2.1",
|
||||
"json-loader": "0.5.7",
|
||||
@@ -156,31 +156,31 @@
|
||||
"karma-jasmine": "1.1.1",
|
||||
"karma-mocha-reporter": "2.2.5",
|
||||
"karma-phantomjs-launcher": "1.0.4",
|
||||
"karma-remap-coverage": "0.1.4",
|
||||
"karma-remap-coverage": "^0.1.5",
|
||||
"karma-remap-istanbul": "0.6.0",
|
||||
"karma-sourcemap-loader": "0.3.7",
|
||||
"karma-webdriver-launcher": "1.0.5",
|
||||
"karma-webpack": "2.0.9",
|
||||
"ngrx-store-freeze": "0.2.0",
|
||||
"node-sass": "4.7.2",
|
||||
"nodemon": "1.14.11",
|
||||
"ngrx-store-freeze": "^0.2.1",
|
||||
"node-sass": "^4.7.2",
|
||||
"nodemon": "^1.15.0",
|
||||
"npm-run-all": "4.1.2",
|
||||
"postcss": "6.0.16",
|
||||
"postcss": "^6.0.18",
|
||||
"postcss-apply": "0.8.0",
|
||||
"postcss-cli": "4.1.1",
|
||||
"postcss-cli": "^5.0.0",
|
||||
"postcss-cssnext": "3.1.0",
|
||||
"postcss-loader": "2.0.10",
|
||||
"postcss-loader": "^2.1.0",
|
||||
"postcss-responsive-type": "1.0.0",
|
||||
"postcss-smart-import": "0.7.6",
|
||||
"protractor": "5.2.2",
|
||||
"protractor": "^5.3.0",
|
||||
"protractor-istanbul-plugin": "2.0.0",
|
||||
"raw-loader": "0.5.1",
|
||||
"resolve-url-loader": "2.2.1",
|
||||
"rimraf": "2.6.2",
|
||||
"rollup": "0.54.1",
|
||||
"rollup-plugin-commonjs": "8.2.6",
|
||||
"rollup": "^0.56.0",
|
||||
"rollup-plugin-commonjs": "^8.3.0",
|
||||
"rollup-plugin-node-globals": "1.1.0",
|
||||
"rollup-plugin-node-resolve": "3.0.2",
|
||||
"rollup-plugin-node-resolve": "^3.0.3",
|
||||
"rollup-plugin-uglify": "3.0.0",
|
||||
"sass-loader": "6.0.6",
|
||||
"script-ext-html-webpack-plugin": "1.8.8",
|
||||
@@ -191,11 +191,11 @@
|
||||
"ts-helpers": "1.1.2",
|
||||
"ts-node": "4.1.0",
|
||||
"tslint": "5.9.1",
|
||||
"typedoc": "0.9.0",
|
||||
"typedoc": "^0.9.0",
|
||||
"typescript": "2.6.2",
|
||||
"webpack": "^3.10.0",
|
||||
"webpack-bundle-analyzer": "2.9.2",
|
||||
"webpack-dev-middleware": "2.0.4",
|
||||
"webpack": "^3.11.0",
|
||||
"webpack-bundle-analyzer": "^2.10.0",
|
||||
"webpack-dev-middleware": "^2.0.5",
|
||||
"webpack-dev-server": "2.11.1",
|
||||
"webpack-merge": "4.1.1",
|
||||
"webpack-node-externals": "1.6.0"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<header>
|
||||
<nav class="navbar navbar-expand-md navbar-dark bg-dark">
|
||||
<nav class="navbar navbar-dark bg-primary navbar-expand-md">
|
||||
<div [ngClass]="{'clearfix': !(isNavBarCollapsed | async)}">
|
||||
<a class="navbar-brand" routerLink="/home">{{ 'title' | translate }}</a>
|
||||
</div>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div [ngClass]="{'col-sm-9': isNotEmpty(scopes)}" class="col-12">
|
||||
<div class="form-group input-group">
|
||||
<input type="text" [(ngModel)]="query" name="query" class="form-control" aria-label="Search input">
|
||||
<span class="input-group-btn">
|
||||
<span class="input-group-append">
|
||||
<button type="submit" class="search-button btn btn-secondary">{{ ('search.form.search' | translate) }}</button>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -29,3 +29,8 @@ $theme-colors: (
|
||||
/* Fonts */
|
||||
$link-color: map-get($theme-colors, info) !default;
|
||||
|
||||
$navbar-dark-color: rgba(white, .5) !default;
|
||||
$navbar-light-color: rgba(black, .5) !default;
|
||||
$navbar-dark-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-dark-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E");
|
||||
$navbar-light-toggler-icon-bg: url("data%3Aimage%2Fsvg+xml%3Bcharset%3Dutf8%2C%3Csvg+viewBox%3D%270+0+30+30%27+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%3E%3Cpath+stroke%3D%27#{$navbar-light-color}%27+stroke-width%3D%272%27+stroke-linecap%3D%27round%27+stroke-miterlimit%3D%2710%27+d%3D%27M4+7h22M4+15h22M4+23h22%27%2F%3E%3C%2Fsvg%3E");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user