From 01ad5611c648d952e8f666249e3604b35a2f09d9 Mon Sep 17 00:00:00 2001 From: catarak Date: Sat, 3 Sep 2016 20:29:18 -0400 Subject: [PATCH] sidebar styling fixes --- client/modules/IDE/pages/IDEView.js | 4 ++-- client/styles/components/_sidebar.scss | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/modules/IDE/pages/IDEView.js b/client/modules/IDE/pages/IDEView.js index 4d8274c7..a1cc2710 100644 --- a/client/modules/IDE/pages/IDEView.js +++ b/client/modules/IDE/pages/IDEView.js @@ -45,7 +45,7 @@ class IDEView extends React.Component { } this.consoleSize = this.props.ide.consoleIsExpanded ? 180 : 29; - this.sidebarSize = this.props.ide.sidebarIsExpanded ? 180 : 20; + this.sidebarSize = this.props.ide.sidebarIsExpanded ? 200 : 20; this.forceUpdate(); } @@ -55,7 +55,7 @@ class IDEView extends React.Component { } if (this.props.ide.sidebarIsExpanded !== nextProps.ide.sidebarIsExpanded) { - this.sidebarSize = nextProps.ide.sidebarIsExpanded ? 180 : 20; + this.sidebarSize = nextProps.ide.sidebarIsExpanded ? 200 : 20; } if (nextProps.params.project_id && !this.props.params.project_id) { diff --git a/client/styles/components/_sidebar.scss b/client/styles/components/_sidebar.scss index bea88324..0efd4f25 100644 --- a/client/styles/components/_sidebar.scss +++ b/client/styles/components/_sidebar.scss @@ -79,7 +79,9 @@ .sidebar__file-item--selected > & { background-color: $ide-border-color; } - + .sidebar--contracted & { + display: none; + } } .sidebar__file-item-name { @@ -92,7 +94,7 @@ @extend %icon; display: none; position: absolute; - right: #{20 / $base-font-size}rem; + right: #{26 / $base-font-size}rem; .sidebar__file-item--selected > .file-item__content & { display: inline-block; } @@ -127,7 +129,7 @@ .sidebar__contract { @extend %icon; - margin-left: #{4 / $base-font-size}rem; + margin-left: #{10 / $base-font-size}rem; height: #{14 / $base-font-size}rem; & svg { height: #{14 / $base-font-size}rem;