Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure the object inspector toggle button is always visible #438

Merged
merged 1 commit into from
Aug 6, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/styles/sidebar_toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@

.sidebar-toggle--left {
left: -5px;
}
}

.sidebar-toggle--far-left {
left: -30px;
}
1 change: 1 addition & 0 deletions app/styles/toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
vertical-align: top;
border: 0 transparent none;
background-color: rgba(0, 0, 0, 0);
background: white;
}

.toolbar__icon-button:first-child {
Expand Down
6 changes: 4 additions & 2 deletions app/templates/main.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
<div class="split__panel">
<div class="split__panel__hd">
{{outlet "toolbar"}}
{{sidebar-toggle action="toggleInspector" side="right"
isExpanded=inspectorExpanded classNames="toolbar__icon-button"}}
{{#unless inspectorExpanded}}
{{sidebar-toggle action="toggleInspector" side="right"
isExpanded=false classNames="toolbar__icon-button"}}
{{/unless}}
</div>

{{#view "main-content" classNames="split__panel__bd"}}
Expand Down
2 changes: 2 additions & 0 deletions app/templates/mixin-stack.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{{sidebar-toggle action="toggleInspector" side="right"
isExpanded=true class="toolbar__icon-button sidebar-toggle--far-left"}}
{{#if length}}
<div class="split__panel__hd">
<div class="toolbar">
Expand Down