Replaced glyphicons with bootstrap icons

package.json

@@ -31,6 +31,7 @@
  "awesome-bootstrap-checkbox": "https://github.com/flatlogic/awesome-bootstrap-checkbox#bump-to-bootstrap5",
  "axios": "^0.27.2",
  "bootstrap": "5.1.3",
+ "bootstrap-icons": "^1.11.3",
  "bootstrap-slider": "^10.6.2",
  "bootstrap_calendar": "https://github.com/xero/bootstrap_calendar.git#1.0.1",
  "chroma-js": "^2.4.2",
@@ -70,6 +71,7 @@
  "react-app-polyfill": "^0.2.2",
  "react-autosize-textarea": "^5.0.1",
  "react-bootstrap": "^1.5.2",
+ "react-bootstrap-icons": "^1.11.4",
  "react-bootstrap-table": "4.3.1",
  "react-bootstrap-table-next": "^4.0.3",
  "react-bootstrap-table2-editor": "^1.4.0",

src/pages/ui-elements/icons/Icons.module.scss

@@ -16,15 +16,15 @@
  text-decoration: none;
  }
 
- .glyphicon,
+ .bi,
  .fa,
  .fi {
  width: 32px;
  margin-right: 10px;
  }
 
  &:hover {
- .glyphicon,
+ .bi,
  .fa,
  .fi {
  font-size: 28px;
@@ -36,7 +36,7 @@
  vertical-align: -5px;
  }
 
- .glyphicon {
+ .bi {
  vertical-align: -6px;
  }
  }

src/styles/_variables.scss

@@ -2,11 +2,6 @@
 
 $enable-shadows: true !default;
 
-$glyphicons-halflings-include-bonus: false !default;
-$glyphicons-halflings-class-prefix: glyphicon !default;
-$glyphicons-halflings-font-base-size: 14px !default;
-
-$glyphicons-halflings-font-path: '~glyphicons-halflings/glyphicons' !default;
 $fa-font-path: '~font-awesome/fonts/' !default;
 
 /*

src/styles/app.scss

@@ -2,9 +2,9 @@
  * Customized version of bootstrap using variables from _variables.scss.
  * This file is loaded via separate loader thus allowing to use original bootstrap classes (e.g. .btn-default) through out the app.
  */
-@import '../../node_modules/bootstrap/scss/functions';
+@import '~bootstrap/scss/functions';
 @import 'variables';
-@import '../../node_modules/bootstrap/scss/variables';
-@import '../../node_modules/bootstrap/scss/mixins';
+@import '~bootstrap/scss/variables';
+@import '~bootstrap/scss/mixins';
 @import 'mixins';
 

src/styles/theme.scss

@@ -4,13 +4,17 @@
  */
 @import url('https://fonts.googleapis.com/css?family=Montserrat:300,400,600,700,800');
 @import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,400;0,500;0,600;0,700;0,800;1,300&display=swap');
-@import '../../node_modules/bootstrap/scss/functions';
+@import '~bootstrap/scss/functions';
 @import 'variables';
 @import 'theme-variables';
-@import '../../node_modules/bootstrap/scss/bootstrap';
+@import '~bootstrap/scss/bootstrap';
 @import '../fonts/flaticon/flaticon';
 @import '~font-awesome/css/font-awesome';
 @import '~font-awesome/scss/font-awesome';
+// @import '~glyphicons-halflings/css/glyphicons-halflings';
+// @import '~glyphicons-halflings/scss/glyphicons-halflings';
+@import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
+@import '../../node_modules/bootstrap-icons/font/bootstrap-icons.css';
 @import '../../node_modules/line-awesome/dist/line-awesome/css/line-awesome.css';
 @import '../../node_modules/animate.css/animate';
 @import '../../node_modules/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox';

yarn.lock

@@ -1475,13 +1475,6 @@
  resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46"
  integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==
 
-"@flaticon/flaticon-uicons@^3.3.1":
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/@flaticon/flaticon-uicons/-/flaticon-uicons-3.3.1.tgz#4783573fd7da1f859f704e6e545f4e162edd4c90"
- integrity sha512-WN2zuECCdjuGBQrjzN0kpeSygzC5fgF8Q7pDR+FUuGtYWczSdIhIwoD+/fKBEfwqKfNIMZ1WouidevGQ4OJORg==
- optionalDependencies:
- esbuild-linux-64 "^0.14.5"
-
 "@foliojs-fork/fontkit@^1.9.1":
  version "1.9.2"
  resolved "https://registry.yarnpkg.com/@foliojs-fork/fontkit/-/fontkit-1.9.2.tgz#94241c195bc6204157bc84c33f34bdc967eca9c3"
@@ -3135,6 +3128,11 @@ boolbase@^1.0.0, boolbase@~1.0.0:
  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+bootstrap-icons@^1.11.3:
+ version "1.11.3"
+ resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz#03f9cb754ec005c52f9ee616e2e84a82cab3084b"
+ integrity sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww==
+
 bootstrap-slider@^10.6.2:
  version "10.6.2"
  resolved "https://registry.yarnpkg.com/bootstrap-slider/-/bootstrap-slider-10.6.2.tgz#7341f468c012bdaa6a1d8625d989fdeb8ed7dd38"
@@ -5272,11 +5270,6 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3:
  d "^1.0.2"
  ext "^1.7.0"
 
-esbuild-linux-64@^0.14.5:
- version "0.14.54"
- resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz#de5fdba1c95666cf72369f52b40b03be71226652"
- integrity sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==
-
 escalade@^3.1.2:
  version "3.2.0"
  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
@@ -10905,6 +10898,13 @@ react-autosize-textarea@^5.0.1:
  line-height "^0.3.1"
  prop-types "^15.5.6"
 
+react-bootstrap-icons@^1.11.4:
+ version "1.11.4"
+ resolved "https://registry.yarnpkg.com/react-bootstrap-icons/-/react-bootstrap-icons-1.11.4.tgz#f4d5a852af58b5e0523df7162758b77f6fef2eec"
+ integrity sha512-lnkOpNEZ/Zr7mNxvjA9efuarCPSgtOuGA55XiRj7ASJnBjb1wEAdtJOd2Aiv9t07r7FLI1IgyZPg9P6jqWD/IA==
+ dependencies:
+ prop-types "^15.7.2"
+
 react-bootstrap-table-next@^4.0.3:
  version "4.0.3"
  resolved "https://registry.yarnpkg.com/react-bootstrap-table-next/-/react-bootstrap-table-next-4.0.3.tgz#b55873b01adfe22a7181904b784a9d24ac2822cf"