Commit 7ba02615 authored by Alessandro Curci's avatar Alessandro Curci
Browse files

Angular 12 upgrade + fixe sass deprecation warning

parent fc678fcc
......@@ -11,7 +11,6 @@
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
......@@ -26,7 +25,13 @@
],
"scripts": [
"node_modules/pace-js/pace.js"
]
],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
......@@ -40,7 +45,6 @@
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"aot": true,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
......@@ -51,7 +55,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
......
This diff is collapsed.
......@@ -20,15 +20,15 @@
},
"private": true,
"dependencies": {
"@angular/animations": "11.2.14",
"@angular/common": "11.2.14",
"@angular/compiler": "11.2.14",
"@angular/core": "11.2.14",
"@angular/forms": "11.2.14",
"@angular/platform-browser": "11.2.14",
"@angular/platform-browser-dynamic": "11.2.14",
"@angular/router": "11.2.14",
"@angular/upgrade": "11.2.14",
"@angular/animations": "12.2.16",
"@angular/common": "12.2.16",
"@angular/compiler": "12.2.16",
"@angular/core": "12.2.16",
"@angular/forms": "12.2.16",
"@angular/platform-browser": "12.2.16",
"@angular/platform-browser-dynamic": "12.2.16",
"@angular/router": "12.2.16",
"@angular/upgrade": "12.2.16",
"@auth0/angular-jwt": "^5.0.2",
"@fortawesome/fontawesome-svg-core": "1.2.36",
"@fortawesome/free-brands-svg-icons": "5.15.4",
......@@ -57,13 +57,13 @@
"text-mask-addons": "3.8.0",
"ts-helpers": "1.1.2",
"tslib": "^2.0.0",
"zone.js": "~0.10.3"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1102.18",
"@angular/cli": "11.2.18",
"@angular/compiler-cli": "11.2.14",
"@angular/language-service": "11.2.14",
"@angular-devkit/build-angular": "~12.2.16",
"@angular/cli": "12.2.16",
"@angular/compiler-cli": "12.2.16",
"@angular/language-service": "12.2.16",
"@cypress/schematic": "^1.6.0",
"@fortawesome/fontawesome-pro": "5.15.4",
"@types/jasmine": "~3.6.0",
......@@ -83,7 +83,7 @@
"karma-jasmine-html-reporter": "^1.5.0",
"ts-node": "8.0.3",
"tslint": "~6.1.0",
"typescript": "4.0.7",
"typescript": "4.3.5",
"webpack-bundle-analyzer": "4.5.0"
}
}
......@@ -55,7 +55,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.
/***************************************************************************************************
......
......@@ -14,7 +14,7 @@
}
.text-white .text-muted {
color: rgba(255,255,255,.6) !important;
color: rgba(255, 255, 255, 0.6) !important;
}
.card-header {
......@@ -43,7 +43,7 @@
}
.nav-link {
padding: $card-spacer-y $card-spacer-x / 2;
padding: $card-spacer-y $card-spacer-x * 0.5;
color: $text-muted;
border-top: 0;
......@@ -109,7 +109,7 @@
// Card Actions
.card-header {
> i {
margin-right: $spacer / 2;
margin-right: $spacer * 0.5;
}
.card-actions {
position: absolute;
......@@ -166,8 +166,8 @@
.card-full {
margin-top: - $spacer;
margin-right: - $grid-gutter-width / 2;
margin-left: - $grid-gutter-width / 2;
margin-right: - $grid-gutter-width * 0.5;
margin-left: - $grid-gutter-width * 0.5;
border: 0;
border-bottom: $card-border-width solid $border-color;
}
......
@use "sass:math";
.row.row-equal {
padding-right: ($grid-gutter-width / 4);
padding-left: ($grid-gutter-width / 4);
margin-right: ($grid-gutter-width / -2);
margin-left: ($grid-gutter-width / -2);
padding-right: ($grid-gutter-width * 0.25);
padding-left: ($grid-gutter-width * 0.25);
margin-right: math.div($grid-gutter-width, -2);
margin-left: math.div($grid-gutter-width, -2);
[class*="col-"] {
padding-right: ($grid-gutter-width / 4);
padding-left: ($grid-gutter-width / 4);
padding-right: ($grid-gutter-width * 0.25);
padding-left: ($grid-gutter-width * 0.25);
}
}
......
// IE10&11 Flexbox fix
@media all and (-ms-high-contrast:none) {
@media all and (-ms-high-contrast: none) {
html {
display: flex;
flex-direction: column;
......@@ -27,7 +27,8 @@ app-root {
display: flex;
flex-direction: row;
flex-grow: 1;
/*overflow-x: hidden;*/
/* overflow-x: hidden; */
.main {
flex: 1;
......@@ -56,6 +57,7 @@ app-root {
z-index: $zindex-sticky;
width: 100%;
}
.app-body {
margin-top: $navbar-height;
}
......@@ -83,12 +85,14 @@ app-root {
// }
}
.main, .app-footer {
.main,
.app-footer {
margin-left: $sidebar-width;
}
&.sidebar-hidden {
.main, .app-footer {
.main,
.app-footer {
margin-left: 0;
}
}
......@@ -115,7 +119,8 @@ app-root {
}
&.sidebar-fixed {
.main, .app-footer {
.main,
.app-footer {
margin-left: $sidebar-compact-width;
}
......@@ -124,11 +129,13 @@ app-root {
}
&.sidebar-hidden {
.main, .app-footer {
.main,
.app-footer {
margin-left: 0;
}
}
}
.sidebar-minimizer {
display: none;
}
......@@ -146,7 +153,8 @@ app-root {
}
&.sidebar-fixed {
.main, .app-footer {
.main,
.app-footer {
margin-left: $sidebar-minimized-width;
}
......@@ -155,7 +163,8 @@ app-root {
}
&.sidebar-hidden {
.main, .app-footer {
.main,
.app-footer {
margin-left: 0;
}
}
......@@ -183,12 +192,14 @@ app-root {
}
}
.main, .app-footer {
.main,
.app-footer {
margin-right: $aside-menu-width;
}
&.aside-menu-hidden {
.main, .app-footer {
.main,
.app-footer {
margin-right: 0;
}
}
......@@ -213,6 +224,7 @@ app-root {
.breadcrumb-fixed {
.main {
$breadcrumb-height: 2 * $breadcrumb-padding-y + $font-size-base + 1.5 * $spacer;
padding-top: $breadcrumb-height;
}
......@@ -253,13 +265,15 @@ app-root {
}
}
&.sidebar-hidden, &.sidebar-off-canvas {
&.sidebar-hidden,
&.sidebar-off-canvas {
.main .breadcrumb {
left: 0;
}
}
&.aside-menu-hidden, &.aside-menu-off-canvas {
&.aside-menu-hidden,
&.aside-menu-off-canvas {
.main .breadcrumb {
right: 0;
}
......@@ -294,9 +308,11 @@ app-root {
.aside-menu {
transition: margin-left $layout-transition-speed, margin-right $layout-transition-speed, width $layout-transition-speed, flex $layout-transition-speed;
}
.sidebar-nav {
transition: width $layout-transition-speed;
}
.breadcrumb {
transition: left $layout-transition-speed, right $layout-transition-speed, width $layout-transition-speed;
}
......@@ -312,12 +328,15 @@ app-root {
width: 100%;
text-align: center;
background-color: $navbar-brand-bg;
@include borders($navbar-brand-border);
.navbar-toggler {
@if (lightness( $navbar-brand-bg ) > 40) {
color: $navbar-color;
} @else {
}
@else {
color: #fff;
}
}
......@@ -325,7 +344,7 @@ app-root {
.navbar-brand {
position: absolute;
left: 50%;
margin-left: - ($navbar-brand-width / 2);
margin-left: - ($navbar-brand-width * 0.5);
}
}
......@@ -359,7 +378,8 @@ app-root {
}
}
.main, .app-footer {
.main,
.app-footer {
margin-left: 0 !important;
}
......
......@@ -135,7 +135,7 @@
.nav-link {
direction: rtl;
i {
margin: 0 0 0 ($sidebar-nav-link-padding-x / 2);
margin: 0 0 0 ($sidebar-nav-link-padding-x * 0.5);
}
.badge {
float: left;
......
......@@ -127,7 +127,7 @@
i {
display: inline-block;
width: 20px;
margin: 0 ($sidebar-nav-link-padding-x / 2) 0 0;
margin: 0 ($sidebar-nav-link-padding-x * 0.5) 0 0;
font-size: 14px;
color: $sidebar-nav-link-icon-color;
text-align: center;
......@@ -226,7 +226,7 @@
.nav-label {
display: block;
padding: ($sidebar-nav-link-padding-y / 8) $sidebar-nav-link-padding-x;
padding: ($sidebar-nav-link-padding-y * 0.125) $sidebar-nav-link-padding-x;
color: $sidebar-nav-title-color;
&:hover {
......@@ -236,7 +236,7 @@
i {
width: 20px;
margin: -3px ($sidebar-nav-link-padding-x / 2) 0 0;
margin: -3px ($sidebar-nav-link-padding-x * 0.5) 0 0;
font-size: 10px;
color: $sidebar-nav-link-icon-color;
text-align: center;
......@@ -274,7 +274,7 @@
background-image: $sidebar-minimizer-indicator;
background-repeat: no-repeat;
background-position: center;
background-size: $sidebar-minimizer-height / 4;
background-size: $sidebar-minimizer-height * 0.25;
transition: .3s;
}
......@@ -316,7 +316,7 @@
i {
display: block;
width: 100%;
margin: $spacer / 4 0;
margin: $spacer * 0.25 0;
font-size: 24px;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment