diff options
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 index be4fa8908..c2060749a 100644 --- 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 index 3f88b1ea3..8d316e26b 100644 --- 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 index 1fbb9333e..8966602e2 100644 --- 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 index ddaece8d8..60875a3b3 100644 --- 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 index ef39a87ed..0fd026fee 100644 --- 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; } } |