|
96 | 96 | display: inline-flex; |
97 | 97 | width: max-content; |
98 | 98 | align-items: center; |
99 | | - |
100 | | - @if $indigo-theme { |
101 | | - min-height: calc(100% - #{rem(1px)}) !important; |
102 | | - } @else { |
103 | | - min-height: 100% !important; |
104 | | - } |
105 | | - |
| 99 | + min-height: 100% !important; |
106 | 100 | transition: color $transition-timing, background $transition-timing; |
107 | 101 |
|
108 | 102 | &:not(:empty) { |
|
155 | 149 | [igxPrefix] { |
156 | 150 | @extend %form-group-prefix; |
157 | 151 | outline-style: none; |
| 152 | + |
| 153 | + &:first-child { |
| 154 | + @if $variant == 'fluent' { |
| 155 | + border-start-start-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size)); |
| 156 | + border-end-start-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size)); |
| 157 | + } @else if $variant == "indigo" { |
| 158 | + border-start-start-radius: var-get($theme, 'box-border-radius'); |
| 159 | + } |
| 160 | + } |
158 | 161 | } |
159 | 162 |
|
160 | 163 | igx-suffix, |
161 | 164 | [igxSuffix] { |
162 | 165 | @extend %form-group-suffix; |
163 | 166 | outline-style: none; |
| 167 | + |
| 168 | + &:last-child { |
| 169 | + @if $variant == 'fluent' { |
| 170 | + border-start-end-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size)); |
| 171 | + border-end-end-radius: calc(var-get($theme, 'border-border-radius') - var(--_fluent-input-border-size)); |
| 172 | + } @else if $variant == "indigo" { |
| 173 | + border-start-end-radius: var-get($theme, 'box-border-radius'); |
| 174 | + } |
| 175 | + } |
164 | 176 | } |
165 | 177 |
|
166 | 178 | input, |
|
680 | 692 | %bootstrap-file-warning, |
681 | 693 | %bootstrap-file-invalid { |
682 | 694 | %form-group-bundle { |
683 | | - border-radius: var-get($theme, 'box-border-radius'); |
| 695 | + border-radius: var-get($theme, 'border-border-radius'); |
684 | 696 | transition: box-shadow .15s ease-out, border .15s ease-out; |
685 | 697 |
|
686 | 698 | &:hover { |
|
793 | 805 |
|
794 | 806 | .igx-input-group--bootstrap:not(.igx-input-group--prefixed) { |
795 | 807 | .igx-input-group__upload-button { |
796 | | - border-radius: var-get($theme, 'box-border-radius') 0 0 var-get($theme, 'box-border-radius'); |
| 808 | + border-radius: var-get($theme, 'border-border-radius') 0 0 var-get($theme, 'border-border-radius'); |
797 | 809 | } |
798 | 810 |
|
799 | 811 | .igx-input-group__file-input { |
|
1025 | 1037 | %form-group-bundle--search { |
1026 | 1038 | background: var-get($theme, 'search-background'); |
1027 | 1039 | box-shadow: var-get($theme, 'search-resting-elevation'); |
| 1040 | + border-radius: var-get($theme, 'search-border-radius'); |
1028 | 1041 |
|
1029 | 1042 | @if $variant != 'bootstrap' { |
1030 | | - border-radius: var-get($theme, 'search-border-radius'); |
1031 | 1043 | overflow: hidden; |
1032 | 1044 | } |
1033 | 1045 |
|
|
1500 | 1512 | align-self: end; |
1501 | 1513 | transform: scaleX(0); |
1502 | 1514 | transform-origin: center; |
1503 | | - background: var-get($theme, 'focused-secondary-color'); |
| 1515 | + background: var-get($theme, 'focused-bottom-line-color'); |
1504 | 1516 | z-index: 1; |
1505 | 1517 | } |
1506 | 1518 | } |
|
2053 | 2065 | } |
2054 | 2066 |
|
2055 | 2067 | %fluent-label-success { |
2056 | | - color: var-get($theme, 'idle-text-color'); |
| 2068 | + color: var-get($theme, 'idle-secondary-color'); |
2057 | 2069 | } |
2058 | 2070 |
|
2059 | 2071 | %fluent-label-error { |
2060 | | - color: var-get($theme, 'idle-text-color'); |
| 2072 | + color: var-get($theme, 'idle-secondary-color'); |
2061 | 2073 | } |
2062 | 2074 |
|
2063 | 2075 | %fluent-label-disabled { |
|
2087 | 2099 | } |
2088 | 2100 | } |
2089 | 2101 |
|
2090 | | - .igx-input-group--fluent [igxPrefix], |
2091 | | - .igx-input-group--fluent igx-prefix { |
2092 | | - &:first-child { |
2093 | | - [igxButton]::after, |
2094 | | - button::after { |
2095 | | - border: { |
2096 | | - start: { |
2097 | | - start-radius: var-get($theme, 'border-border-radius'); |
2098 | | - }; |
2099 | | - end: { |
2100 | | - start-radius: var-get($theme, 'border-border-radius'); |
2101 | | - }; |
2102 | | - } |
2103 | | - } |
2104 | | - } |
2105 | | - } |
2106 | | - |
2107 | 2102 | %form-group-prefix-fluent, |
2108 | 2103 | %form-group-suffix-fluent, |
2109 | 2104 | %form-group-prefix-fluent-search, |
|
2233 | 2228 | end-width: rem(1px); |
2234 | 2229 | }; |
2235 | 2230 | start: { |
2236 | | - start-radius: var-get($theme, 'box-border-radius'); |
| 2231 | + start-radius: var-get($theme, 'border-border-radius'); |
2237 | 2232 | }; |
2238 | 2233 | end: { |
2239 | | - start-radius: var-get($theme, 'box-border-radius'); |
| 2234 | + start-radius: var-get($theme, 'border-border-radius'); |
2240 | 2235 | }; |
2241 | 2236 | } |
2242 | 2237 | } |
|
2253 | 2248 | end-width: rem(1px); |
2254 | 2249 | }; |
2255 | 2250 | start: { |
2256 | | - end-radius: var-get($theme, 'box-border-radius'); |
| 2251 | + end-radius: var-get($theme, 'border-border-radius'); |
2257 | 2252 | }; |
2258 | 2253 | end: { |
2259 | | - end-radius: var-get($theme, 'box-border-radius'); |
| 2254 | + end-radius: var-get($theme, 'border-border-radius'); |
2260 | 2255 | }; |
2261 | 2256 | } |
2262 | 2257 | } |
|
2323 | 2318 | map.get($bootstrap-inline-padding, 'cosy'), |
2324 | 2319 | map.get($bootstrap-inline-padding, 'comfortable') |
2325 | 2320 | ); |
2326 | | - border-radius: var-get($theme, 'box-border-radius'); |
| 2321 | + border-radius: var-get($theme, 'border-border-radius'); |
2327 | 2322 |
|
2328 | 2323 | } |
2329 | 2324 |
|
|
0 commit comments