Update bootstrap version to 4.5

makee-workshop · Jul 31, 2020 · 5a4736b · 5a4736b
1 parent aee209b
commit 5a4736b
Show file tree

Hide file tree

Showing 37 changed files with 563 additions and 3,509 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Built heavily based on [Aqua](https://github.com/jedireza/aqua) and [Drywall](ht
 | Express       | Bootstrap      | react-scripts|
 | Mongoose      | React          | Nodemon      |
 | Passport      | Redux          | concurrently |
-| Async         | Font-Awesome   |              |
+| Async         | Linearicons    |              |
 | EmailJS       |                |              |
 
 ![img](https://oranwind.s3.amazonaws.com/2018/Jun/SSS-1530366578247.PNG)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "huayra",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "start": "concurrently \"npm run server\" \"npm run client\"",
@@ -35,6 +35,7 @@
     "axios": "^0.19.2",
     "bcrypt": "^3.0.8",
     "body-parser": "1.x.x",
+    "bootstrap": "^4.5.0",
     "classnames": "^2.2.5",
     "clean-css": "^4.1.11",
     "compression": "1.x.x",
@@ -70,6 +71,7 @@
     "react-router-dom": "^5.1.2",
     "react-scripts": "3.4.0",
     "react-table": "^6.8.6",
+    "reactstrap": "^8.5.1",
     "redux": "^3.6.0",
     "redux-devtools": "^3.3.2",
     "redux-devtools-dock-monitor": "^1.1.1",

diff --git a/public/index.html b/public/index.html
@@ -17,16 +17,14 @@
     <title>Huayra</title>
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
-    <link rel="stylesheet" href="/layouts/core.min.css">
-    <link rel="stylesheet" href="/layouts/default.min.css">
+    <link rel="stylesheet" href="https://cdn.linearicons.com/free/1.0.0/icon-font.min.css">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
-
   </head>
   <body>
       <div id="root"></div>

diff --git a/public/layouts/admin.less b/public/layouts/admin.less
diff --git a/public/layouts/core.js b/public/layouts/core.js
diff --git a/public/layouts/core.less b/public/layouts/core.less
diff --git a/public/layouts/core.min.css b/public/layouts/core.min.css
diff --git a/public/layouts/default.min.css b/public/layouts/default.min.css
diff --git a/public/layouts/ie-sucks.js b/public/layouts/ie-sucks.js
diff --git a/public/less/bootstrap-build.less b/public/less/bootstrap-build.less