Merge pull request #1228 from shyash/align-toolbar

Fix toolbar alignment (#914)
This commit is contained in:
Cassie Tarakajian 2020-01-08 12:34:16 -05:00 committed by GitHub
commit f4995b0725
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions

View file

@ -116,7 +116,7 @@ class Toolbar extends React.Component {
} }
}} }}
> >
{this.props.project.name}&nbsp; <span>{this.props.project.name}</span>
{ {
this.canEditProjectName() && this.canEditProjectName() &&
<InlineSVG className="toolbar__edit-name-button" src={editProjectNameUrl} alt="Edit Project Name" /> <InlineSVG className="toolbar__edit-name-button" src={editProjectNameUrl} alt="Edit Project Name" />

View file

@ -74,7 +74,6 @@
} }
margin-left: #{10 / $base-font-size}rem; margin-left: #{10 / $base-font-size}rem;
padding-left: #{10 / $base-font-size}rem; padding-left: #{10 / $base-font-size}rem;
height: 70%;
display: flex; display: flex;
align-items: center; align-items: center;
} }
@ -90,7 +89,8 @@
} }
} }
cursor: pointer; cursor: pointer;
line-height: #{18 / $base-font-size}rem; display: flex;
align-items: center;
.toolbar__project-name-container--editing & { .toolbar__project-name-container--editing & {
display: none; display: none;
@ -151,7 +151,6 @@
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
height: #{18 / $base-font-size}rem; height: #{18 / $base-font-size}rem;
margin-left: #{-4 / $base-font-size}rem;
& svg { & svg {
width: #{18 / $base-font-size}rem; width: #{18 / $base-font-size}rem;
height: #{18 / $base-font-size}rem; height: #{18 / $base-font-size}rem;