Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2020-05-04 11:41:44 +01:00
18 changed files with 198 additions and 73 deletions

View File

@@ -217,6 +217,10 @@
.red-ui-debug-msg-type-number { color: $debug-message-text-color-msg-type-number; };
.red-ui-debug-msg-type-number-toggle { cursor: pointer;}
.red-ui-debug-msg-type-string {
white-space: pre-wrap;
}
.red-ui-debug-msg-row {
display: block;
padding: 4px 2px 2px;

View File

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

View File

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