1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Fine tune typedInput flexbox handling on option-button

This commit is contained in:
Nick O'Leary 2020-04-08 17:06:11 +01:00
parent 821b5686f2
commit e26eb85718
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
3 changed files with 14 additions and 16 deletions

View File

@ -657,11 +657,13 @@
this.optionExpandButton.shown = false; this.optionExpandButton.shown = false;
} }
if (this.optionSelectTrigger) { if (this.optionSelectTrigger) {
this.optionSelectTrigger.show(); this.optionSelectTrigger.css({"display":"inline-flex"});
if (!opt.hasValue) { if (!opt.hasValue) {
this.optionSelectTrigger.css({"flex-grow":1})
this.elementDiv.hide(); this.elementDiv.hide();
this.valueLabelContainer.hide(); this.valueLabelContainer.hide();
} else { } else {
this.optionSelectTrigger.css({"flex-grow":0})
this.elementDiv.show(); this.elementDiv.show();
this.valueLabelContainer.hide(); this.valueLabelContainer.hide();
} }

View File

@ -633,7 +633,7 @@ button.red-ui-toggleButton.toggle {
.red-ui-typedInput-value-label,.red-ui-typedInput-option-label { .red-ui-typedInput-value-label,.red-ui-typedInput-option-label {
select,.placeholder-input { select,.placeholder-input {
margin: 3px; margin: 3px;
height: 26px; height: 24px;
width: calc(100% - 10px); width: calc(100% - 10px);
padding-left: 3px; padding-left: 3px;
} }

View File

@ -171,25 +171,21 @@ button.red-ui-typedInput-option-trigger {
padding: 0 0 0 0; padding: 0 0 0 0;
position:relative; position:relative;
flex-grow: 1; flex-grow: 1;
line-height: 32px;
display: inline-flex;
.red-ui-typedInput-option-label { .red-ui-typedInput-option-label {
background:$form-button-background; background:$form-button-background;
color: $form-text-color; color: $form-text-color;
position:absolute; flex-grow: 1;
left:0; padding: 0 0 0 8px;
right:23px; display:inline-block;
top: 0;
padding: 0 5px 0 8px;
i.red-ui-typedInput-icon {
margin-right: 4px;
}
} }
.red-ui-typedInput-option-caret { .red-ui-typedInput-option-caret {
top: 0; flex-grow: 0;
position: absolute; display:inline-block;
right: 0; width: 23px;
bottom: 0; text-align: center;
width: 17px; height: 100%;
padding-left: 5px;
&:before { &:before {
content:''; content:'';
display: inline-block; display: inline-block;