From 6120655ef2283d82943f9e905498e244757071d7 Mon Sep 17 00:00:00 2001 From: shyash Date: Mon, 23 Dec 2019 17:12:10 +0530 Subject: [PATCH 1/2] align toolbar --- client/styles/components/_toolbar.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss index a7c81415..274cad11 100644 --- a/client/styles/components/_toolbar.scss +++ b/client/styles/components/_toolbar.scss @@ -68,6 +68,11 @@ align-items: center; } +.toolbar__autorefresh{ + display: flex; + align-items: center; +} + .toolbar__project-name-container { @include themify() { border-color: getThemifyVariable('inactive-text-color'); From df27b36b0bd3ba91e0eeda91a03627a6067c07a0 Mon Sep 17 00:00:00 2001 From: Cassie Tarakajian Date: Wed, 8 Jan 2020 12:33:36 -0500 Subject: [PATCH 2/2] Fixes #914, aligns project name and autorefresh on Mac and Windows --- client/modules/IDE/components/Toolbar.jsx | 2 +- client/styles/components/_toolbar.scss | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/client/modules/IDE/components/Toolbar.jsx b/client/modules/IDE/components/Toolbar.jsx index 7e659a20..b331e10e 100644 --- a/client/modules/IDE/components/Toolbar.jsx +++ b/client/modules/IDE/components/Toolbar.jsx @@ -116,7 +116,7 @@ class Toolbar extends React.Component { } }} > - {this.props.project.name}  + {this.props.project.name} { this.canEditProjectName() && diff --git a/client/styles/components/_toolbar.scss b/client/styles/components/_toolbar.scss index 274cad11..86dec1b2 100644 --- a/client/styles/components/_toolbar.scss +++ b/client/styles/components/_toolbar.scss @@ -68,18 +68,12 @@ align-items: center; } -.toolbar__autorefresh{ - display: flex; - align-items: center; -} - .toolbar__project-name-container { @include themify() { border-color: getThemifyVariable('inactive-text-color'); } margin-left: #{10 / $base-font-size}rem; padding-left: #{10 / $base-font-size}rem; - height: 70%; display: flex; align-items: center; } @@ -95,7 +89,8 @@ } } cursor: pointer; - line-height: #{18 / $base-font-size}rem; + display: flex; + align-items: center; .toolbar__project-name-container--editing & { display: none; @@ -156,7 +151,6 @@ display: inline-block; vertical-align: top; height: #{18 / $base-font-size}rem; - margin-left: #{-4 / $base-font-size}rem; & svg { width: #{18 / $base-font-size}rem; height: #{18 / $base-font-size}rem;