diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-09-22 17:49:49 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-09-22 17:51:42 +0200 |
commit | 96746d7165f28553b53bd259d03aaf5d63290b7a (patch) | |
tree | d6ff84649d848b051e452ea1c72c7f1c70c74755 /assets | |
parent | 0d930454a2892715e691f9c7713e26a3bb4ee96c (diff) | |
download | Shaarli-96746d7165f28553b53bd259d03aaf5d63290b7a.tar.gz Shaarli-96746d7165f28553b53bd259d03aaf5d63290b7a.tar.zst Shaarli-96746d7165f28553b53bd259d03aaf5d63290b7a.zip |
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
Diffstat (limited to 'assets')
-rw-r--r-- | assets/default/scss/shaarli.scss | 38 | ||||
-rw-r--r-- | assets/vintage/css/shaarli.css | 2 |
2 files changed, 20 insertions, 20 deletions
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 { | |||
69 | font-family: 'Roboto'; | 69 | font-family: 'Roboto'; |
70 | font-weight: 400; | 70 | font-weight: 400; |
71 | font-style: normal; | 71 | font-style: normal; |
72 | src: local('Roboto'), | 72 | src: |
73 | local('Roboto-Regular'), | 73 | local('Roboto'), |
74 | url('../fonts/Roboto-Regular.woff2') format('woff2'), | 74 | local('Roboto-Regular'), |
75 | url('../fonts/Roboto-Regular.woff') format('woff'); | 75 | url('../fonts/Roboto-Regular.woff2') format('woff2'), |
76 | url('../fonts/Roboto-Regular.woff') format('woff'); | ||
76 | } | 77 | } |
77 | 78 | ||
78 | @font-face { | 79 | @font-face { |
79 | font-family: 'Roboto'; | 80 | font-family: 'Roboto'; |
80 | font-weight: 700; | 81 | font-weight: 700; |
81 | font-style: normal; | 82 | font-style: normal; |
82 | src: local('Roboto'), | 83 | src: |
83 | local('Roboto-Bold'), | 84 | local('Roboto'), |
84 | url('../fonts/Roboto-Bold.woff2') format('woff2'), | 85 | local('Roboto-Bold'), |
85 | url('../fonts/Roboto-Bold.woff') format('woff'); | 86 | url('../fonts/Roboto-Bold.woff2') format('woff2'), |
87 | url('../fonts/Roboto-Bold.woff') format('woff'); | ||
86 | } | 88 | } |
87 | 89 | ||
88 | body, | 90 | body, |
@@ -375,7 +377,7 @@ body, | |||
375 | } | 377 | } |
376 | 378 | ||
377 | @media screen and (max-width: 64em) { | 379 | @media screen and (max-width: 64em) { |
378 | .header-search , | 380 | .header-search, |
379 | .header-search * { | 381 | .header-search * { |
380 | visibility: hidden; | 382 | visibility: hidden; |
381 | } | 383 | } |
@@ -554,7 +556,6 @@ body, | |||
554 | color: $dark-grey; | 556 | color: $dark-grey; |
555 | font-size: .9em; | 557 | font-size: .9em; |
556 | 558 | ||
557 | |||
558 | a { | 559 | a { |
559 | display: inline-block; | 560 | display: inline-block; |
560 | margin: 3px 0; | 561 | margin: 3px 0; |
@@ -620,7 +621,7 @@ body, | |||
620 | &.selected { | 621 | &.selected { |
621 | background: var(--main-color); | 622 | background: var(--main-color); |
622 | color: $white; | 623 | color: $white; |
623 | } | 624 | } |
624 | } | 625 | } |
625 | 626 | ||
626 | input { | 627 | input { |
@@ -1609,13 +1610,14 @@ form { | |||
1609 | 1610 | ||
1610 | > div { | 1611 | > div { |
1611 | border-radius: 10px; | 1612 | border-radius: 10px; |
1612 | background: repeating-linear-gradient( | 1613 | background: |
1613 | -45deg, | 1614 | repeating-linear-gradient( |
1614 | $almost-white, | 1615 | -45deg, |
1615 | $almost-white 6px, | 1616 | $almost-white, |
1616 | var(--background-color) 6px, | 1617 | $almost-white 6px, |
1617 | var(--background-color) 12px | 1618 | var(--background-color) 6px, |
1618 | ); | 1619 | var(--background-color) 12px |
1620 | ); | ||
1619 | width: 0%; | 1621 | width: 0%; |
1620 | height: 10px; | 1622 | height: 10px; |
1621 | } | 1623 | } |
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 { | |||
746 | text-align: left; | 746 | text-align: left; |
747 | background-color: transparent; | 747 | background-color: transparent; |
748 | background-color: rgba(0, 0, 0, 0.4); | 748 | background-color: rgba(0, 0, 0, 0.4); |
749 | /* FF3+, Saf3+, Opera 10.10+, Chrome, IE9 */ | ||
750 | filter: progid: DXImageTransform.Microsoft.gradient(startColorstr=#66000000, endColorstr=#66000000); | ||
751 | /* IE6IE9 */ | 749 | /* IE6IE9 */ |
752 | text-shadow: 2px 2px 1px #000000; | 750 | text-shadow: 2px 2px 1px #000000; |
753 | } | 751 | } |