Merge remote-tracking branch 'origin/develop' into explore-redesign
This commit is contained in:
commit
4794bc9f62
|
@ -74,8 +74,8 @@
|
||||||
|
|
||||||
& > .placeholder {
|
& > .placeholder {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 0;
|
|
||||||
top: 0;
|
top: 0;
|
||||||
|
left: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
@ -122,6 +122,7 @@
|
||||||
&:disabled {
|
&:disabled {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: var(--input-color-disabled);
|
color: var(--input-color-disabled);
|
||||||
|
-webkit-text-fill-color: var(--input-color-disabled);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
@navbar-nav-item-font-size: @global-small-font-size;
|
@navbar-nav-item-font-size: @global-small-font-size;
|
||||||
@navbar-nav-item-font-weight: 600;
|
@navbar-nav-item-font-weight: 600;
|
||||||
@navbar-nav-item-height: @global-header-height;
|
@navbar-nav-item-height: @global-header-height;
|
||||||
|
@navbar-nav-logo-max-width: @width-xsmall-width;
|
||||||
@navbar-nav-item-color: @global-color;
|
@navbar-nav-item-color: @global-color;
|
||||||
@navbar-nav-item-before-background: @global-secondary-background;
|
@navbar-nav-item-before-background: @global-secondary-background;
|
||||||
@navbar-nav-item-hover-color: @navbar-nav-item-before-background;
|
@navbar-nav-item-hover-color: @navbar-nav-item-before-background;
|
||||||
|
@ -52,9 +53,16 @@
|
||||||
/* Navbar */
|
/* Navbar */
|
||||||
|
|
||||||
.hook-navbar() {
|
.hook-navbar() {
|
||||||
|
|
||||||
& .uk-logo {
|
& .uk-logo {
|
||||||
|
|
||||||
& > img {
|
& > img {
|
||||||
height: @navbar-nav-item-height - 20px;
|
height: @navbar-nav-item-height - 20px;
|
||||||
|
object-fit: contain;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.small > img {
|
||||||
|
max-width: @navbar-nav-logo-max-width !important;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,12 @@
|
||||||
@progress-height: 16px;
|
@progress-height: 16px;
|
||||||
@progress-background: transparent;
|
@progress-background: fade(@progress-bar-background, 30%);
|
||||||
@progress-border-radius: 500px;
|
@progress-border-radius: 500px;
|
||||||
@progress-box-shadow: @global-inset-shadow;
|
@progress-box-shadow: none;
|
||||||
@progress-bar-background: @global-secondary-background;
|
@progress-bar-background: @global-primary-background;
|
||||||
|
|
||||||
|
@progress-circle-size: 100px;
|
||||||
|
@progress-circle-text-font-weight: @text-bold-weight;
|
||||||
|
@progress-circle-text-font-size: @global-large-font-size;
|
||||||
|
|
||||||
.hook-progress() {
|
.hook-progress() {
|
||||||
border-radius: @progress-border-radius;
|
border-radius: @progress-border-radius;
|
||||||
|
@ -13,3 +16,24 @@
|
||||||
.hook-progress-bar() {
|
.hook-progress-bar() {
|
||||||
border-radius: @progress-border-radius;
|
border-radius: @progress-border-radius;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hook-progress-misc() {
|
||||||
|
.uk-progress-circle[percentage] {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
width: @progress-circle-size;
|
||||||
|
height: @progress-circle-size;
|
||||||
|
border-radius: 50%;
|
||||||
|
background:
|
||||||
|
radial-gradient(closest-side, @table-color 70%, @global-inverse-color 70% 80%, transparent 80% 100%),
|
||||||
|
conic-gradient(@progress-bar-background calc(var(--percentage) * 1%), @progress-background 0);
|
||||||
|
|
||||||
|
&::before {
|
||||||
|
color: @progress-bar-background;
|
||||||
|
font-weight: @progress-circle-text-font-weight;
|
||||||
|
font-size: @progress-circle-text-font-size;
|
||||||
|
content: attr(percentage) '%';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue