From 96746d7165f28553b53bd259d03aaf5d63290b7a Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Tue, 22 Sep 2020 17:49:49 +0200 Subject: Upgrade front end dependencies Mostly in order to get rid of deprecated deps, and upgrade vulnerable ones. - Upgrade webpack from 3.x to 4.x - Moved babel package to main repo - Replaced deprecated extract-text-webpack-plugin with extract-text-webpack-plugin - Replaced deprecated babel-minify-webpack-plugin with terser-webpack-plugin - Replaced deprecated node-sass with (dart) sass package - Replaced deprecated sass-lint with stylelint (the rules might be a bit different Related to #1531: trivy doesn't raise any more issue --- assets/default/scss/shaarli.scss | 38 ++++++++++++++++++++------------------ assets/vintage/css/shaarli.css | 2 -- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'assets') diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss index 7ab09d3f..f3782875 100644 --- a/assets/default/scss/shaarli.scss +++ b/assets/default/scss/shaarli.scss @@ -69,20 +69,22 @@ pre { font-family: 'Roboto'; font-weight: 400; font-style: normal; - src: local('Roboto'), - local('Roboto-Regular'), - url('../fonts/Roboto-Regular.woff2') format('woff2'), - url('../fonts/Roboto-Regular.woff') format('woff'); + src: + local('Roboto'), + local('Roboto-Regular'), + url('../fonts/Roboto-Regular.woff2') format('woff2'), + url('../fonts/Roboto-Regular.woff') format('woff'); } @font-face { font-family: 'Roboto'; font-weight: 700; font-style: normal; - src: local('Roboto'), - local('Roboto-Bold'), - url('../fonts/Roboto-Bold.woff2') format('woff2'), - url('../fonts/Roboto-Bold.woff') format('woff'); + src: + local('Roboto'), + local('Roboto-Bold'), + url('../fonts/Roboto-Bold.woff2') format('woff2'), + url('../fonts/Roboto-Bold.woff') format('woff'); } body, @@ -375,7 +377,7 @@ body, } @media screen and (max-width: 64em) { - .header-search , + .header-search, .header-search * { visibility: hidden; } @@ -554,7 +556,6 @@ body, color: $dark-grey; font-size: .9em; - a { display: inline-block; margin: 3px 0; @@ -620,7 +621,7 @@ body, &.selected { background: var(--main-color); color: $white; - } + } } input { @@ -1609,13 +1610,14 @@ form { > div { border-radius: 10px; - background: repeating-linear-gradient( - -45deg, - $almost-white, - $almost-white 6px, - var(--background-color) 6px, - var(--background-color) 12px - ); + background: + repeating-linear-gradient( + -45deg, + $almost-white, + $almost-white 6px, + var(--background-color) 6px, + var(--background-color) 12px + ); width: 0%; height: 10px; } diff --git a/assets/vintage/css/shaarli.css b/assets/vintage/css/shaarli.css index 87c440c8..1688dce0 100644 --- a/assets/vintage/css/shaarli.css +++ b/assets/vintage/css/shaarli.css @@ -746,8 +746,6 @@ a.bigbutton, #pageheader a.bigbutton { text-align: left; background-color: transparent; background-color: rgba(0, 0, 0, 0.4); - /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */ - filter: progid: DXImageTransform.Microsoft.gradient(startColorstr=#66000000, endColorstr=#66000000); /* IE6–IE9 */ text-shadow: 2px 2px 1px #000000; } -- cgit v1.2.3