Merging explore-redesign branch into develop for Explore July release #3

Merged
konstantina.galouni merged 6 commits from explore-redesign into develop 2023-07-05 11:15:39 +02:00
2 changed files with 68 additions and 2 deletions

View File

@ -5,7 +5,7 @@
--input-placeholder-color: @global-meta-color;
--input-placeholder-weight: 400;
--input-hint-color: @global-meta-color;
--input-color: @global-color;
--input-color: @global-emphasis-color;
--input-border-radius: @global-border-radius;
/* Size modifiers */
--input-padding-vertical: 12px;
@ -35,6 +35,10 @@
/* Action */
--input-action-icon-color: @global-secondary-background;
--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 */
@ -152,10 +156,21 @@
cursor: pointer;
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 {
color: var(--input-action-icon-color-disabled);
cursor: default;
pointer-events: none;
& > icon {
background-color: var(--input-action-icon-background-color-disabled);
}
}
}
@ -318,6 +333,17 @@
&.normal-font-size {
--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 {

View File

@ -10,9 +10,14 @@
--search-input-border-focus: var(--search-input-border);
--search-input-border-style-focus: var(--search-input-border-style);
/* Icon */
--search-input-icon-ratio: 1.3;
--search-input-icon-color: @global-secondary-background;
--search-input-icon-color-collapsed: @global-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-icon-padding-horizontal: 15px;
--search-input-icon-padding-vertical: 16px;
@ -37,7 +42,7 @@
}
&.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 {
color: var(--search-input-icon-color-collapsed);
@ -66,10 +71,22 @@
cursor: pointer;
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 {
color: var(--search-input-icon-color-disabled);
cursor: default;
pointer-events: none;
& > icon {
background-color: var(--search-input-icon-background-color-disabled);
}
}
}
@ -115,6 +132,29 @@
--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;
}
}
}
}