Merge remote-tracking branch 'origin/angular-14' into explore-redesign
This commit is contained in:
commit
84f6c7a94c
|
@ -1,6 +1,13 @@
|
||||||
|
:root {
|
||||||
|
--dashboard-sidebar-width: 280px;
|
||||||
|
--dashboard-sidebar-mini-width: 100px;
|
||||||
|
--dashboard-transition-delay: 0.25s;
|
||||||
|
}
|
||||||
|
|
||||||
@dashboard-page-content-background: @global-background;
|
@dashboard-page-content-background: @global-background;
|
||||||
@dashboard-z-index: @global-z-index - 21;
|
@dashboard-z-index: @global-z-index - 21;
|
||||||
@dashboard-header-height: var(--header-height);
|
@dashboard-header-height: var(--header-height);
|
||||||
|
@dashboard-transition-delay: var(--dashboard-transition-delay);
|
||||||
|
|
||||||
@dashboard-primary-background: @global-primary-background;
|
@dashboard-primary-background: @global-primary-background;
|
||||||
@dashboard-primary-gradient: @global-primary-gradient;
|
@dashboard-primary-gradient: @global-primary-gradient;
|
||||||
|
@ -9,8 +16,8 @@
|
||||||
@dashboard-sidebar-background: @global-inverse-color;
|
@dashboard-sidebar-background: @global-inverse-color;
|
||||||
@dashboard-sidebar-border-width: @global-border-width;
|
@dashboard-sidebar-border-width: @global-border-width;
|
||||||
@dashboard-sidebar-border: @global-border;
|
@dashboard-sidebar-border: @global-border;
|
||||||
@dashboard-sidebar-width: 280px;
|
@dashboard-sidebar-width: var(--dashboard-sidebar-width);
|
||||||
@dashboard-sidebar-mini-width: 100px;
|
@dashboard-sidebar-mini-width: var(--dashboard-sidebar-mini-width);
|
||||||
|
|
||||||
@dashboard-sidebar-toggle-box-shadow: @global-default-shadow;
|
@dashboard-sidebar-toggle-box-shadow: @global-default-shadow;
|
||||||
@dashboard-sidebar-toggle-border: @global-border;
|
@dashboard-sidebar-toggle-border: @global-border;
|
||||||
|
@ -70,10 +77,10 @@
|
||||||
left: @dashboard-sidebar-width;
|
left: @dashboard-sidebar-width;
|
||||||
width: @dashboard-sidebar-toggle-size;
|
width: @dashboard-sidebar-toggle-size;
|
||||||
height: @dashboard-sidebar-toggle-size;
|
height: @dashboard-sidebar-toggle-size;
|
||||||
transition: left 0.5s linear;
|
transition: left @dashboard-transition-delay linear;
|
||||||
-webkit-transition: left 0.5s linear;
|
-webkit-transition: left @dashboard-transition-delay linear;
|
||||||
-moz-transition: left 0.5s linear;
|
-moz-transition: left @dashboard-transition-delay linear;
|
||||||
-o-transition: left 0.5s linear;
|
-o-transition: left @dashboard-transition-delay linear;
|
||||||
transform: translate(-50%, -50%);
|
transform: translate(-50%, -50%);
|
||||||
box-shadow: @dashboard-sidebar-toggle-box-shadow;
|
box-shadow: @dashboard-sidebar-toggle-box-shadow;
|
||||||
border-radius: @dashboard-sidebar-toggle-border-radius;
|
border-radius: @dashboard-sidebar-toggle-border-radius;
|
||||||
|
@ -89,10 +96,10 @@
|
||||||
content: '\e5cb';
|
content: '\e5cb';
|
||||||
font-family: "Material Icons";
|
font-family: "Material Icons";
|
||||||
font-size: @dashboard-sidebar-toggle-size - 15px;
|
font-size: @dashboard-sidebar-toggle-size - 15px;
|
||||||
transition: transform 0.5s linear;
|
transition: transform @dashboard-transition-delay linear;
|
||||||
-webkit-transition: transform 0.5s linear;
|
-webkit-transition: transform @dashboard-transition-delay linear;
|
||||||
-moz-transition: transform 0.5s linear;
|
-moz-transition: transform @dashboard-transition-delay linear;
|
||||||
-o-transition: transform 0.5s linear;
|
-o-transition: transform @dashboard-transition-delay linear;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
|
@ -112,10 +119,10 @@
|
||||||
z-index: @dashboard-z-index;
|
z-index: @dashboard-z-index;
|
||||||
background: @dashboard-sidebar-background;
|
background: @dashboard-sidebar-background;
|
||||||
border-right: @dashboard-sidebar-border-width solid @dashboard-sidebar-border;
|
border-right: @dashboard-sidebar-border-width solid @dashboard-sidebar-border;
|
||||||
transition: width 0.5s linear;
|
transition: width @dashboard-transition-delay linear;
|
||||||
-webkit-transition: width 0.5s linear;
|
-webkit-transition: width @dashboard-transition-delay linear;
|
||||||
-moz-transition: width 0.5s linear;
|
-moz-transition: width @dashboard-transition-delay linear;
|
||||||
-o-transition: width 0.5s linear;
|
-o-transition: width @dashboard-transition-delay linear;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
|
|
||||||
& .menu_section {
|
& .menu_section {
|
||||||
|
@ -145,7 +152,11 @@
|
||||||
|
|
||||||
&.uk-parent {
|
&.uk-parent {
|
||||||
& > a {
|
& > a {
|
||||||
padding: @dashboard-menu-section-item-padding-vertical (3*@dashboard-menu-section-item-padding-horizontal) @dashboard-menu-section-item-padding-vertical @dashboard-menu-section-item-padding-horizontal;
|
padding: @dashboard-menu-section-item-padding-vertical @dashboard-menu-section-item-padding-horizontal @dashboard-menu-section-item-padding-vertical @dashboard-menu-section-item-padding-horizontal;
|
||||||
|
|
||||||
|
& > .uk-flex {
|
||||||
|
margin-right: @dashboard-menu-section-item-padding-horizontal;
|
||||||
|
}
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
color: @dashboard-menu-section-item-parent-icon-color;
|
color: @dashboard-menu-section-item-parent-icon-color;
|
||||||
|
@ -212,10 +223,10 @@
|
||||||
|
|
||||||
@{dashboard-pages}, @{dashboard-elements} {
|
@{dashboard-pages}, @{dashboard-elements} {
|
||||||
padding-left: @dashboard-sidebar-width;
|
padding-left: @dashboard-sidebar-width;
|
||||||
transition: padding-left 0.5s linear;
|
transition: padding-left @dashboard-transition-delay linear;
|
||||||
-webkit-transition: padding-left 0.5s linear;
|
-webkit-transition: padding-left @dashboard-transition-delay linear;
|
||||||
-moz-transition: padding-left 0.5s linear;
|
-moz-transition: padding-left @dashboard-transition-delay linear;
|
||||||
-o-transition: padding-left 0.5s linear;
|
-o-transition: padding-left @dashboard-transition-delay linear;
|
||||||
}
|
}
|
||||||
|
|
||||||
#page_content {
|
#page_content {
|
||||||
|
@ -276,6 +287,12 @@
|
||||||
z-index: @dashboard-page-content-actions-z-index;
|
z-index: @dashboard-page-content-actions-z-index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
& .uk-sticky {
|
||||||
|
transition: width @dashboard-transition-delay linear;
|
||||||
|
-webkit-transition: width @dashboard-transition-delay linear;
|
||||||
|
-moz-transition: width @dashboard-transition-delay linear;
|
||||||
|
-o-transition: width @dashboard-transition-delay linear;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@{dashboard-pages} {
|
@{dashboard-pages} {
|
||||||
|
@ -316,12 +333,8 @@
|
||||||
|
|
||||||
& > ul > li {
|
& > ul > li {
|
||||||
&.uk-parent {
|
&.uk-parent {
|
||||||
& > a {
|
& > a::after {
|
||||||
padding-right: @dashboard-menu-section-item-padding-horizontal !important;
|
content: '';
|
||||||
|
|
||||||
&::after {
|
|
||||||
content: none;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
& .uk-nav-sub {
|
& .uk-nav-sub {
|
||||||
|
|
Loading…
Reference in New Issue