fix control bar appearance

This commit is contained in:
Val Erastov 2018-01-16 01:54:37 -08:00 committed by xibyte
parent fdc52ec85d
commit 51d17361df
4 changed files with 24 additions and 13 deletions

View file

@ -7,10 +7,10 @@ export default function ControlBar({left, right}) {
return <div className={ls.root}>
<div className={ls.left}>
{right}
{left}
</div>
<div className={ls.right}>
{left}
{right}
</div>
</div>
}

View file

@ -12,22 +12,33 @@
}
.button {
display: inline-block;
cursor: pointer;
padding: 0.3em 0.3em 0.4em 0.6em;
padding: 0.4em 0.5em;
@border: 1px solid @border-color;
&.left {
border-right: @border;
}
&.right {
border-left: @border;
}
&:hover {
background-color: @work-area-control-bar-bg-color-active;
}
line-height: 1;
}
.left, .right {
display: flex;
align-items: baseline;
}
.right {
flex-direction: row-reverse;
}
@border: 1px solid @border-color;
.left .button {
border-right: @border;
}
.right .button {
border-left: @border;
}
.button.disabled {
color: @font-color-suppressed;
&:hover {

View file

@ -16,7 +16,7 @@ export function activate({bus, services}) {
x: undefined,
y: undefined
});
if (!appearance) {
if (!appearance.label) {
appearance.label = id;
}
showMenuActions.push({

View file

@ -16,7 +16,7 @@ export function activate({bus, services}) {
bus.dispatch(UI_TOKENS.CONTROL_BAR_RIGHT, [
['Info', {label: null}],
['RefreshSketches', {label: null}],
['ShowSketches', {label: 'sketches'}], ['DeselectAll', null], ['ToggleCameraMode', null]
['ShowSketches', {label: 'sketches'}], ['DeselectAll', {label: null}], ['ToggleCameraMode', {label: null}]
]);
bus.dispatch(UI_TOKENS.TOOLBAR_BAR_LEFT, ['PLANE', 'EditFace', 'EXTRUDE', 'CUT', 'REVOLVE']);