mastofe

commit: f7f3e6e3bef5c69dbafa3dbd9b80ce2ec167fdd6
parent: 2ddf4e09f92471737f84d5d7d20d47c663948886
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Wed, 12 Oct 2016 19:14:47 +0200

Fix styles

Diffstat:
M
app/assets/javascripts/components/features/ui/components/column.jsx
2
--
M
app/assets/javascripts/components/features/ui/components/columns_area.jsx
1
-
M
app/assets/javascripts/components/features/ui/components/drawer.jsx
2
--
M
app/assets/stylesheets/application.scss
4
++--
M
app/assets/stylesheets/components.scss
5
+++++

5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/assets/javascripts/components/features/ui/components/column.jsx b/app/assets/javascripts/components/features/ui/components/column.jsx
@@ -30,9 +30,7 @@ const scrollTop = (node) => {
 };
 
 const style = {
-  height: '100%',
   boxSizing: 'border-box',
-  flex: '0 0 auto',
   background: '#282c37',
   display: 'flex',
   flexDirection: 'column'
diff --git a/app/assets/javascripts/components/features/ui/components/columns_area.jsx b/app/assets/javascripts/components/features/ui/components/columns_area.jsx
@@ -3,7 +3,6 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
 const style = {
   display: 'flex',
   flex: '1 1 auto',
-  flexDirection: 'row',
   justifyContent: 'flex-start',
   overflowX: 'auto'
 };
diff --git a/app/assets/javascripts/components/features/ui/components/drawer.jsx b/app/assets/javascripts/components/features/ui/components/drawer.jsx
@@ -1,8 +1,6 @@
 import PureRenderMixin from 'react-addons-pure-render-mixin';
 
 const style = {
-  height: '100%',
-  flex: '0 0 auto',
   boxSizing: 'border-box',
   background: '#454b5e',
   padding: '0',
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -77,9 +77,9 @@ table {
 }
 
 ::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
   border: 0px none #ffffff;
-  border-radius: 50px;
+  border-radius: 0;
+  background: rgba(0, 0, 0, 0.1);
 }
 
 ::-webkit-scrollbar-track:hover {
diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
@@ -231,6 +231,7 @@
 .columns-area {
   margin: 10px;
   margin-left: 0;
+  flex-direction: row;
 }
 
 .column {
@@ -243,15 +244,19 @@
 
 .column, .drawer {
   margin-left: 10px;
+  flex: 0 0 auto;
+  overflow: hidden;
 }
 
 @media screen and (max-width: 1024px) {
   .column, .drawer {
     width: 100%;
     margin: 0;
+    flex: 1 1 100%;
   }
 
   .columns-area {
     margin: 10px;
+    flex-direction: column;
   }
 }