Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
a0797a5ecc
|
@ -21,6 +21,21 @@
|
||||||
|
|
||||||
@dropdown-nav-divider-margin: 5px;
|
@dropdown-nav-divider-margin: 5px;
|
||||||
|
|
||||||
|
/* Mobile Dropdown*/
|
||||||
|
@dropdown-mobile-z-index: @global-z-index;
|
||||||
|
@dropdown-mobile-background: rgba(0, 0, 0, 0.8);
|
||||||
|
@dropdown-mobile-container-height: 70vh;
|
||||||
|
@dropdown-mobile-container-background: @global-inverse-color;
|
||||||
|
@dropdown-mobile-container-border-radius: 30px 30px 0 0;
|
||||||
|
@dropdown-mobile-container-border: @global-border;
|
||||||
|
@dropdown-mobile-container-border-width: @global-border-width;
|
||||||
|
@dropdown-mobile-container-padding-top: @global-medium-gutter + 10px;
|
||||||
|
@dropdown-mobile-container-divider-width: 60px;
|
||||||
|
@dropdown-mobile-container-divider-height: 4px;
|
||||||
|
@dropdown-mobile-container-divider-background: @dropdown-mobile-container-border;
|
||||||
|
@dropdown-mobile-container-divider-border-radius: 50px;
|
||||||
|
@dropdown-mobile-container-close-position: @global-small-gutter;
|
||||||
|
|
||||||
.hook-dropdown() {
|
.hook-dropdown() {
|
||||||
box-shadow: @dropdown-box-shadow;
|
box-shadow: @dropdown-box-shadow;
|
||||||
border: @dropdown-border-width solid @dropdown-border;
|
border: @dropdown-border-width solid @dropdown-border;
|
||||||
|
@ -51,4 +66,57 @@
|
||||||
.uk-dropdown-nav > li.uk-active > a {
|
.uk-dropdown-nav > li.uk-active > a {
|
||||||
font-weight: @dropdown-nav-item-active-font-weight;
|
font-weight: @dropdown-nav-item-active-font-weight;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.uk-dropdown-mobile {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
bottom: 0;
|
||||||
|
right: 0;
|
||||||
|
height: 100vh;
|
||||||
|
z-index: @dropdown-mobile-z-index;
|
||||||
|
overflow-y: auto;
|
||||||
|
background: @dropdown-mobile-background;
|
||||||
|
display: none;
|
||||||
|
|
||||||
|
&.uk-open {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
& > .uk-dropdown-mobile-container {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
height: @dropdown-mobile-container-height;
|
||||||
|
background: @dropdown-mobile-container-background;
|
||||||
|
border-radius: @dropdown-mobile-container-border-radius;
|
||||||
|
border: @dropdown-mobile-container-border-width solid @dropdown-mobile-container-border;
|
||||||
|
padding-top: @dropdown-mobile-container-padding-top;
|
||||||
|
|
||||||
|
&:before {
|
||||||
|
content: '';
|
||||||
|
width: @dropdown-mobile-container-divider-width;
|
||||||
|
height: @dropdown-mobile-container-divider-height;
|
||||||
|
background: @dropdown-mobile-container-divider-background;
|
||||||
|
border-radius: @dropdown-mobile-container-divider-border-radius;
|
||||||
|
position: absolute;
|
||||||
|
top: 15px;
|
||||||
|
left: 50%;
|
||||||
|
transform: translate(-50%, -50%);
|
||||||
|
}
|
||||||
|
|
||||||
|
& > .uk-close {
|
||||||
|
position: absolute;
|
||||||
|
right: @dropdown-mobile-container-close-position;
|
||||||
|
top: @dropdown-mobile-container-close-position;
|
||||||
|
}
|
||||||
|
|
||||||
|
& > .uk-content {
|
||||||
|
box-sizing: border-box;
|
||||||
|
max-height: 100%;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,4 +11,20 @@
|
||||||
.uk-height-max-xsmall {
|
.uk-height-max-xsmall {
|
||||||
max-height: @height-xsmall-height;
|
max-height: @height-xsmall-height;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.uk-height-min-xsmall {
|
||||||
|
min-height: @height-xsmall-height;
|
||||||
|
}
|
||||||
|
|
||||||
|
.uk-height-min-small {
|
||||||
|
min-height: @height-small-height;
|
||||||
|
}
|
||||||
|
|
||||||
|
.uk-height-min-medium {
|
||||||
|
min-height: @height-medium-height;
|
||||||
|
}
|
||||||
|
|
||||||
|
.uk-height-min-large {
|
||||||
|
min-height: @height-large-height;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
--input-placeholder-color: @global-meta-color;
|
--input-placeholder-color: @global-meta-color;
|
||||||
--input-placeholder-weight: 400;
|
--input-placeholder-weight: 400;
|
||||||
--input-hint-color: @global-meta-color;
|
--input-hint-color: @global-meta-color;
|
||||||
--input-color: @global-color;
|
--input-color: @global-emphasis-color;
|
||||||
--input-border-radius: @global-border-radius;
|
--input-border-radius: @global-border-radius;
|
||||||
/* Size modifiers */
|
/* Size modifiers */
|
||||||
--input-padding-vertical: 12px;
|
--input-padding-vertical: 12px;
|
||||||
|
@ -35,6 +35,10 @@
|
||||||
/* Action */
|
/* Action */
|
||||||
--input-action-icon-color: @global-secondary-background;
|
--input-action-icon-color: @global-secondary-background;
|
||||||
--input-action-icon-color-disabled: @global-muted-color;
|
--input-action-icon-color-disabled: @global-muted-color;
|
||||||
|
--input-action-icon-display: inline;
|
||||||
|
--input-action-icon-background-color: transparent;
|
||||||
|
--input-action-icon-background-color-disabled: transparent;
|
||||||
|
--input-action-icon-background-padding: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Input Wrapper */
|
/** Input Wrapper */
|
||||||
|
@ -115,7 +119,7 @@
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:disabled {
|
&:disabled, &.uk-disabled {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: var(--input-color-disabled);
|
color: var(--input-color-disabled);
|
||||||
-webkit-text-fill-color: var(--input-color-disabled);
|
-webkit-text-fill-color: var(--input-color-disabled);
|
||||||
|
@ -152,10 +156,21 @@
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
|
||||||
|
& > icon {
|
||||||
|
padding: var(--input-action-icon-background-padding);
|
||||||
|
border-radius: 50%;
|
||||||
|
display: var(--input-action-icon-display);
|
||||||
|
background-color: var(--input-action-icon-background-color);
|
||||||
|
}
|
||||||
|
|
||||||
&.disabled {
|
&.disabled {
|
||||||
color: var(--input-action-icon-color-disabled);
|
color: var(--input-action-icon-color-disabled);
|
||||||
cursor: default;
|
cursor: default;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|
||||||
|
& > icon {
|
||||||
|
background-color: var(--input-action-icon-background-color-disabled);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -318,6 +333,17 @@
|
||||||
&.normal-font-size {
|
&.normal-font-size {
|
||||||
--input-font-size: 16px;
|
--input-font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.background {
|
||||||
|
--input-action-icon-color: @global-inverse-color;
|
||||||
|
--input-action-icon-display: block;
|
||||||
|
--input-action-icon-background-color: @global-secondary-background;
|
||||||
|
--input-action-icon-background-padding: 5px;
|
||||||
|
|
||||||
|
&.small, &.small-vertical {
|
||||||
|
--input-action-icon-background-padding: 3px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.uk-dropdown.options {
|
.uk-dropdown.options {
|
||||||
|
|
|
@ -10,9 +10,14 @@
|
||||||
--search-input-border-focus: var(--search-input-border);
|
--search-input-border-focus: var(--search-input-border);
|
||||||
--search-input-border-style-focus: var(--search-input-border-style);
|
--search-input-border-style-focus: var(--search-input-border-style);
|
||||||
/* Icon */
|
/* Icon */
|
||||||
|
--search-input-icon-ratio: 1.3;
|
||||||
--search-input-icon-color: @global-secondary-background;
|
--search-input-icon-color: @global-secondary-background;
|
||||||
--search-input-icon-color-collapsed: @global-color;
|
--search-input-icon-color-collapsed: @global-color;
|
||||||
--search-input-icon-color-disabled: @global-muted-color;
|
--search-input-icon-color-disabled: @global-muted-color;
|
||||||
|
--search-input-icon-display: inline;
|
||||||
|
--search-input-icon-background-color: transparent;
|
||||||
|
--search-input-icon-background-color-disabled: transparent;
|
||||||
|
--search-input-icon-background-padding: 0px;
|
||||||
--search-input-divider: @global-border-width solid @global-border;
|
--search-input-divider: @global-border-width solid @global-border;
|
||||||
--search-input-icon-padding-horizontal: 15px;
|
--search-input-icon-padding-horizontal: 15px;
|
||||||
--search-input-icon-padding-vertical: 16px;
|
--search-input-icon-padding-vertical: 16px;
|
||||||
|
@ -37,7 +42,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
&.collapsed {
|
&.collapsed {
|
||||||
width: calc(2 * var(--search-input-icon-padding-horizontal) + 26px);
|
width: calc(2 * (var(--search-input-icon-padding-horizontal) + var(--search-input-icon-background-padding)) + var(--search-input-icon-ratio)*20px);
|
||||||
|
|
||||||
& .search-icon {
|
& .search-icon {
|
||||||
color: var(--search-input-icon-color-collapsed);
|
color: var(--search-input-icon-color-collapsed);
|
||||||
|
@ -66,10 +71,22 @@
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
|
|
||||||
|
& > icon {
|
||||||
|
padding: var(--search-input-icon-background-padding);
|
||||||
|
border-radius: 50%;
|
||||||
|
display: var(--search-input-icon-display);
|
||||||
|
background-color: var(--search-input-icon-background-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
&.disabled {
|
&.disabled {
|
||||||
color: var(--search-input-icon-color-disabled);
|
color: var(--search-input-icon-color-disabled);
|
||||||
cursor: default;
|
cursor: default;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|
||||||
|
& > icon {
|
||||||
|
background-color: var(--search-input-icon-background-color-disabled);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,6 +132,29 @@
|
||||||
--input-font-size: 14px;
|
--input-font-size: 14px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.small-vertical {
|
||||||
|
--search-input-icon-padding-vertical: 10px;
|
||||||
|
|
||||||
|
& .search {
|
||||||
|
--input-padding-vertical: 10px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&.background {
|
||||||
|
--search-input-icon-ratio: 1;
|
||||||
|
--search-input-icon-color: @global-inverse-color;
|
||||||
|
--search-input-icon-color-collapsed: @global-inverse-color;
|
||||||
|
--search-input-icon-display: block;
|
||||||
|
--search-input-icon-background-color: @global-secondary-background;
|
||||||
|
--search-input-icon-background-padding: 7px;
|
||||||
|
--search-input-icon-padding-horizontal: 10px;
|
||||||
|
--search-input-icon-padding-vertical: 10px;
|
||||||
|
|
||||||
|
&.small-vertical {
|
||||||
|
--search-input-icon-padding-vertical: 6px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,10 @@
|
||||||
|
|
||||||
.hook-utility-misc() {
|
.hook-utility-misc() {
|
||||||
/* Border */
|
/* Border */
|
||||||
|
.uk-border-box {
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
.uk-border {
|
.uk-border {
|
||||||
border: @border-width solid @border-color;
|
border: @border-width solid @border-color;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue