Fixed sidebar issue, updated build

flatlogic · Aug 10, 2021 · 3220c4c · 3220c4c
1 parent 26f401f
commit 3220c4c
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 16 deletions.
diff --git a/docs/asset-manifest.json b/docs/asset-manifest.json
@@ -1,16 +1,16 @@
 {
   "files": {
-    "main.css": "./static/css/main.4e6e2e77.chunk.css",
-    "main.js": "./static/js/main.68971197.chunk.js",
-    "main.js.map": "./static/js/main.68971197.chunk.js.map",
+    "main.css": "./static/css/main.06ab2a6a.chunk.css",
+    "main.js": "./static/js/main.8e75ec86.chunk.js",
+    "main.js.map": "./static/js/main.8e75ec86.chunk.js.map",
     "runtime-main.js": "./static/js/runtime-main.51c160d8.js",
     "runtime-main.js.map": "./static/js/runtime-main.51c160d8.js.map",
     "static/css/2.684d0aae.chunk.css": "./static/css/2.684d0aae.chunk.css",
     "static/js/2.7e0eb098.chunk.js": "./static/js/2.7e0eb098.chunk.js",
     "static/js/2.7e0eb098.chunk.js.map": "./static/js/2.7e0eb098.chunk.js.map",
     "index.html": "./index.html",
     "static/css/2.684d0aae.chunk.css.map": "./static/css/2.684d0aae.chunk.css.map",
-    "static/css/main.4e6e2e77.chunk.css.map": "./static/css/main.4e6e2e77.chunk.css.map",
+    "static/css/main.06ab2a6a.chunk.css.map": "./static/css/main.06ab2a6a.chunk.css.map",
     "static/js/2.7e0eb098.chunk.js.LICENSE.txt": "./static/js/2.7e0eb098.chunk.js.LICENSE.txt",
     "static/media/eva-icons.css": "./static/media/Eva-Icons.f6e26bbd.eot",
     "static/media/bagIcon.585bd5b6.svg": "./static/media/bagIcon.585bd5b6.svg",
@@ -55,7 +55,7 @@
     "static/js/runtime-main.51c160d8.js",
     "static/css/2.684d0aae.chunk.css",
     "static/js/2.7e0eb098.chunk.js",
-    "static/css/main.4e6e2e77.chunk.css",
-    "static/js/main.68971197.chunk.js"
+    "static/css/main.06ab2a6a.chunk.css",
+    "static/js/main.8e75ec86.chunk.js"
   ]
 }
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><title>Sofia React Template - Admin Template built with React</title><meta name="description" content="Sofia React Dashboard Template built with Bootstrap, Redux and React Router by Flatlogic."><meta name="keywords" content="react admin, react dashboard, react admin template, react theme, react dashboard template, react dashboard template"><meta name="author" content="by Flatlogic"><link href="./static/css/2.684d0aae.chunk.css" rel="stylesheet"><link href="./static/css/main.4e6e2e77.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,l=t[0],f=t[1],i=t[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(t);s.length;)s.shift()();return u.push.apply(u,i||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="./";var l=this["webpackJsonpsofia-react-template"]=this["webpackJsonpsofia-react-template"]||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var i=0;i<l.length;i++)t(l[i]);var p=f;r()}([])</script><script src="./static/js/2.7e0eb098.chunk.js"></script><script src="./static/js/main.68971197.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.png"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="./manifest.json"/><title>Sofia React Template - Admin Template built with React</title><meta name="description" content="Sofia React Dashboard Template built with Bootstrap, Redux and React Router by Flatlogic."><meta name="keywords" content="react admin, react dashboard, react admin template, react theme, react dashboard template, react dashboard template"><meta name="author" content="by Flatlogic"><link href="./static/css/2.684d0aae.chunk.css" rel="stylesheet"><link href="./static/css/main.06ab2a6a.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,l=t[0],f=t[1],i=t[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(t);s.length;)s.shift()();return u.push.apply(u,i||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,l=1;l<r.length;l++){var f=r[l];0!==o[f]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="./";var l=this["webpackJsonpsofia-react-template"]=this["webpackJsonpsofia-react-template"]||[],f=l.push.bind(l);l.push=t,l=l.slice();for(var i=0;i<l.length;i++)t(l[i]);var p=f;r()}([])</script><script src="./static/js/2.7e0eb098.chunk.js"></script><script src="./static/js/main.8e75ec86.chunk.js"></script></body></html>
diff --git a/docs/static/css/main.4e6e2e77.chunk.css → docs/static/css/main.06ab2a6a.chunk.css b/docs/static/css/main.4e6e2e77.chunk.css → docs/static/css/main.06ab2a6a.chunk.css
diff --git a/docs/static/css/main.06ab2a6a.chunk.css.map b/docs/static/css/main.06ab2a6a.chunk.css.map
diff --git a/docs/static/css/main.4e6e2e77.chunk.css.map b/docs/static/css/main.4e6e2e77.chunk.css.map
diff --git a/docs/static/js/main.68971197.chunk.js b/docs/static/js/main.68971197.chunk.js
diff --git a/docs/static/js/main.68971197.chunk.js.map b/docs/static/js/main.68971197.chunk.js.map
diff --git a/docs/static/js/main.8e75ec86.chunk.js b/docs/static/js/main.8e75ec86.chunk.js
diff --git a/docs/static/js/main.8e75ec86.chunk.js.map b/docs/static/js/main.8e75ec86.chunk.js.map
diff --git a/src/components/Sidebar/LinksGroup/LinksGroup.module.scss b/src/components/Sidebar/LinksGroup/LinksGroup.module.scss
@@ -57,6 +57,10 @@ a.headerLinkActive {
   font-size: 1rem;
   color: $white;
 
+  i {
+    color: white !important;
+  }
+
   &:hover {
     color: $white;
   }

diff --git a/src/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js
@@ -38,18 +38,20 @@ class Sidebar extends React.Component {
   }
 
   componentDidUpdate(prevProps) {
+
     if (this.props.sidebarOpened !== prevProps.sidebarOpened) {
       if (this.props.sidebarOpened) {
         this.element.style.height = `276px`;
       } else {
         this.element.classList.remove(s.sidebarOpen);
         setTimeout(() => {
-          this.element.style.height = '0px';
+          this.element.style.height = '';
         }, 0);
       }
     }
   }
 
+
   doLogout(id) {
     this.props.dispatch(logoutUser());
   }

diff --git a/src/components/Sidebar/Sidebar.module.scss b/src/components/Sidebar/Sidebar.module.scss
@@ -41,7 +41,9 @@
 }
 
 .sidebarOpen {
-  height: auto !important;
+  @media (min-width: breakpoint-min(md)) {
+    height: auto !important;
+  }
 }
 
 .logo {

diff --git a/src/pages/dashboard/Dashboard.js b/src/pages/dashboard/Dashboard.js
@@ -147,7 +147,7 @@ class Dashboard extends React.Component {
                       <p className="headline-1">Upgrade your plan</p>
                       <p className="body-3">So how did the classical Latin become so </p>
                       <div className="d-flex justify-content-between my-4">
-                        <Button size="sm" className="rounded-pill mr-1" color="primary">Go Premium</Button>
+                        <Button className="rounded-pill mr-3" color="primary">Go Premium</Button>
                         <Button className="rounded-pill body-3" outline color="dark">Try for free</Button>
                       </div>
                     </div>