Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2020-04-02 16:52:55 +01:00
3 changed files with 20 additions and 74 deletions

View File

@@ -18,7 +18,7 @@
border: 1px solid $form-input-border-color;
border-radius: 4px;
height: 34px;
display: inline-block;
display: inline-flex;
padding: 0;
margin: 0;
vertical-align: middle;
@@ -26,12 +26,7 @@
overflow:visible;
position: relative;
.red-ui-typedInput-input-wrap {
position: absolute;
left:0;
right:0;
top:0;
bottom:0;
outline: red;
flex-grow: 1;
}
input.red-ui-typedInput-input {
width: 100%;
@@ -49,7 +44,7 @@
border-color: $form-input-focus-color !important;
}
.red-ui-typedInput-value-label {
position: absolute;
flex-grow: 1;
display: inline-block;
height: 32px;
box-sizing: border-box;
@@ -107,12 +102,11 @@ button.red-ui-typedInput-option-trigger
{
text-align: left;
border: none;
position: absolute;
flex-basis: auto;
box-sizing: border-box;
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
padding: 0 1px 0 5px;
display:inline-block;
background: $form-button-background;
height: 32px;
line-height: 30px;
@@ -154,7 +148,7 @@ button.red-ui-typedInput-option-trigger
text-decoration: none;
}
&.red-ui-typedInput-full-width {
width: 100%;
flex-grow: 1;
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
@@ -170,7 +164,6 @@ button.red-ui-typedInput-option-expand {
border-bottom-right-radius: 4px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
right: 0;
}
button.red-ui-typedInput-option-trigger {
@@ -179,8 +172,8 @@ button.red-ui-typedInput-option-trigger {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
padding: 0 0 0 0;
position:absolute;
right: 0;
position:relative;
flex-grow: 1;
.red-ui-typedInput-option-label {
background:$form-button-background;
color: $form-text-color;