Merge remote-tracking branch 'origin/new-theme' into new-theme
This commit is contained in:
commit
dfefbe4421
|
@ -1,6 +1,6 @@
|
||||||
@dashboard-background: @global-inverse-color;
|
@dashboard-background: @global-inverse-color;
|
||||||
@dashboard-page-content-background: @global-background;
|
@dashboard-page-content-background: @global-background;
|
||||||
@dashboard-z-index: @global-z-index - 20;
|
@dashboard-z-index: @global-z-index - 21;
|
||||||
@dashboard-header-height: var(--header-height);
|
@dashboard-header-height: var(--header-height);
|
||||||
|
|
||||||
@dashboard-primary-background: @global-primary-background;
|
@dashboard-primary-background: @global-primary-background;
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
padding-top: @dashboard-header-height;
|
padding-top: @dashboard-header-height;
|
||||||
z-index: @dashboard-z-index - 1;
|
z-index: @dashboard-z-index;
|
||||||
background: @dashboard-background;
|
background: @dashboard-background;
|
||||||
transition: 0.5s;
|
transition: 0.5s;
|
||||||
transition-property: width;
|
transition-property: width;
|
||||||
|
@ -107,16 +107,20 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
#page_content_header.uk-sticky.uk-active,
|
#page_content_header.uk-sticky,
|
||||||
#page_content_actions.uk-sticky.uk-active {
|
#page_content_actions.uk-sticky {
|
||||||
border-bottom: @dashboard-page-content-sticky-border-width solid @dashboard-page-content-sticky-border;
|
z-index: @dashboard-z-index;
|
||||||
|
|
||||||
.uk-tab {
|
&.uk-active {
|
||||||
margin-bottom: 0;
|
border-bottom: @dashboard-page-content-sticky-border-width solid @dashboard-page-content-sticky-border;
|
||||||
}
|
|
||||||
|
|
||||||
*:last-child.uk-tab:before {
|
.uk-tab {
|
||||||
content: none;
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
*:last-child.uk-tab:before {
|
||||||
|
content: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -149,7 +153,7 @@
|
||||||
min-height: calc(100vh - @dashboard-header-height);
|
min-height: calc(100vh - @dashboard-header-height);
|
||||||
background-color: @dashboard-page-content-background;
|
background-color: @dashboard-page-content-background;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: @dashboard-z-index - 2;
|
z-index: @dashboard-z-index - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* No sidebar */
|
/* No sidebar */
|
||||||
|
|
Loading…
Reference in New Issue