From de732da4ef94cb10feb36031b5019af73ae20f2e Mon Sep 17 00:00:00 2001 From: carofun Date: Thu, 10 Jun 2021 09:17:56 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20(frontend)=20upgrade?= =?UTF-8?q?=20bootstrap=20to=20version=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bootstrap version 5 is out. We want Ashley to be updated with latest versions of our dependencies. --- src/frontend/package.json | 2 +- src/frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/frontend/package.json b/src/frontend/package.json index 695c356c..4cd65087 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -71,7 +71,7 @@ "@formatjs/cli": "4.2.10", "@formatjs/intl-relativetimeformat": "8.1.6", "@fortawesome/fontawesome-free": "5.15.3", - "bootstrap": "4.6.0", + "bootstrap": "5.0.1", "core-js": "3.11.1", "draft-js": "0.11.7", "draft-js-code": "0.3.0", diff --git a/src/frontend/yarn.lock b/src/frontend/yarn.lock index 67296ad3..c6f9eecc 100644 --- a/src/frontend/yarn.lock +++ b/src/frontend/yarn.lock @@ -2543,10 +2543,10 @@ bluebird@^3.7.2: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -bootstrap@4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.0.tgz#97b9f29ac98f98dfa43bf7468262d84392552fd7" - integrity sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw== +bootstrap@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.0.1.tgz#e7939d599119dc818a90478a2a299bdaff037e09" + integrity sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw== boxen@^4.2.0: version "4.2.0" From 44a317b8f15306c5b17f3a2aec12fa6d7fe941af Mon Sep 17 00:00:00 2001 From: carofun Date: Thu, 10 Jun 2021 09:23:33 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=97=91=EF=B8=8F(frontend)=20define=20?= =?UTF-8?q?SASS=20color=20variable=20out=20of=20bootstrap=20v5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $table-head-color used in saas fil is not set-up anymore. The upgrade of the library bootrstrap version 4 to 5 doesn't have this variable pre-configured anymore. As a result, the frontend won't be able to be build anymore. We fix this issue by giving a color to this variable so that Ashley can use bootstrap 5. --- src/frontend/scss/_variables.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/frontend/scss/_variables.scss b/src/frontend/scss/_variables.scss index aaf41a35..2033d59f 100644 --- a/src/frontend/scss/_variables.scss +++ b/src/frontend/scss/_variables.scss @@ -9,5 +9,6 @@ $red: #fe3925; // Relative path the the fontawesome webfonts (from the compiled CSS file) $fa-font-path: '../font'; -$unread-color: lighten($red, 20%); $read-color: lighten($blue, 15%); +$table-head-color: #495057; +$unread-color: lighten($red, 20%);