diff --git a/.gitignore b/.gitignore
index e9e922d..6da5789 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,21 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-# dependencies
+### JetBrains ###
+/.idea/
+
+### dependencies ###
/node_modules
/.pnp
.pnp.js
-# testing
+### testing ###
/coverage
-# production
+### production ###
/build
+/package-lock.json
-# misc
+### misc ###
.DS_Store
.env.local
.env.development.local
diff --git a/public/index.html b/public/index.html
index 9828354..8429492 100755
--- a/public/index.html
+++ b/public/index.html
@@ -2,17 +2,19 @@
+
+
Iceberx NTUOSS
-
+
diff --git a/src/layout/SideBar/index.jsx b/src/layout/SideBar/index.jsx
index 1eb629e..fa8e056 100644
--- a/src/layout/SideBar/index.jsx
+++ b/src/layout/SideBar/index.jsx
@@ -1,5 +1,5 @@
import React from 'react';
-import PropTypes from 'prop-types';
+import * as PropTypes from 'prop-types';
import { withRouter } from 'react-router-dom';
import { Icon } from '@material-ui/core';
diff --git a/src/styles/index.js b/src/styles/index.js
index 024788e..62257b9 100644
--- a/src/styles/index.js
+++ b/src/styles/index.js
@@ -1,13 +1,16 @@
import React from 'react';
-import PropTypes from 'prop-types';
+import * as PropTypes from 'prop-types';
import { createGlobalStyle, ThemeProvider } from 'styled-components';
const GlobalStyle = createGlobalStyle`
html {
color: ${props => props.theme.primaryColor};
background: ${props => props.theme.backgroundColor};
- overflow: hidden;
+ }
+ html, body {
height: 100%;
+ margin:0;
+ overflow: hidden;
}
a {
text-decoration: none;
@@ -20,6 +23,30 @@ const GlobalStyle = createGlobalStyle`
box-shadow: inherit;
}
}
+ /* only apply in webkit */
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
+ .iceberx-app-container {
+ color: rgba(0,0,0,0);
+ text-shadow: 0 0 black;
+ box-shadow: 0 1px 6px black;
+ transition: color .8s;
+ }
+ .iceberx-app-container:hover {
+ color: rgba(0,0,0,0.3);
+ }
+ *::-webkit-scrollbar {
+ width: 6px;
+ height: 8px;
+ }
+ *::-webkit-scrollbar-track {
+ display: none;
+ }
+ *::-webkit-scrollbar-thumb {
+ border-radius: 3px;
+ box-shadow: inset 0 0 0 3px;
+ background-color: inherit;
+ }
+ }
`;
const theme = {