mirror of https://github.com/ColorlibHQ/AdminLTE
Fixed Safari control sidebar issue #377
parent
cf6a37dc80
commit
4780c4ad61
|
@ -5,25 +5,21 @@
|
||||||
//This is a hack to make the background visible while scrolling
|
//This is a hack to make the background visible while scrolling
|
||||||
.control-sidebar-bg {
|
.control-sidebar-bg {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 900;
|
z-index: 1000;
|
||||||
top: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: @control-sidebar-width;
|
|
||||||
}
|
}
|
||||||
//Transitions
|
//Transitions
|
||||||
.control-sidebar-bg,
|
.control-sidebar-bg,
|
||||||
.control-sidebar {
|
.control-sidebar {
|
||||||
.translate(@control-sidebar-width, 0);
|
top: 0;
|
||||||
.transition-transform(@transition-speed ease-in-out);
|
right: -@control-sidebar-width;
|
||||||
|
width: @control-sidebar-width;
|
||||||
|
.transition(right @transition-speed ease-in-out);
|
||||||
}
|
}
|
||||||
//The sidebar
|
//The sidebar
|
||||||
.control-sidebar {
|
.control-sidebar {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
|
||||||
padding-top: @navbar-height;
|
padding-top: @navbar-height;
|
||||||
right: 0;
|
|
||||||
width: @control-sidebar-width;
|
|
||||||
z-index: 1010;
|
z-index: 1010;
|
||||||
//Fix position after header collapse
|
//Fix position after header collapse
|
||||||
@media (max-width: @screen-sm) {
|
@media (max-width: @screen-sm) {
|
||||||
|
@ -37,7 +33,7 @@
|
||||||
&.control-sidebar-open {
|
&.control-sidebar-open {
|
||||||
&,
|
&,
|
||||||
+ .control-sidebar-bg {
|
+ .control-sidebar-bg {
|
||||||
.translate(0, 0);
|
right: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -45,7 +41,7 @@
|
||||||
.control-sidebar-open {
|
.control-sidebar-open {
|
||||||
.control-sidebar-bg,
|
.control-sidebar-bg,
|
||||||
.control-sidebar {
|
.control-sidebar {
|
||||||
.translate(0,0);
|
right: 0;
|
||||||
}
|
}
|
||||||
@media(min-width: @screen-sm) {
|
@media(min-width: @screen-sm) {
|
||||||
.content-wrapper,
|
.content-wrapper,
|
||||||
|
|
|
@ -23,7 +23,7 @@ body {
|
||||||
.wrapper {
|
.wrapper {
|
||||||
.clearfix();
|
.clearfix();
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
position: static;
|
position: relative;
|
||||||
overflow: hidden!important;
|
overflow: hidden!important;
|
||||||
.layout-boxed & {
|
.layout-boxed & {
|
||||||
max-width: 1250px;
|
max-width: 1250px;
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
position: relative;
|
position: relative;
|
||||||
> a {
|
> a {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
> a > span {
|
> a > span {
|
||||||
border-top-right-radius: 4px;
|
border-top-right-radius: 4px;
|
||||||
|
|
|
@ -29,7 +29,7 @@ body {
|
||||||
/* Layout */
|
/* Layout */
|
||||||
.wrapper {
|
.wrapper {
|
||||||
min-height: 100%;
|
min-height: 100%;
|
||||||
position: static;
|
position: relative;
|
||||||
overflow: hidden!important;
|
overflow: hidden!important;
|
||||||
}
|
}
|
||||||
.wrapper:before,
|
.wrapper:before,
|
||||||
|
@ -587,6 +587,7 @@ a:focus {
|
||||||
}
|
}
|
||||||
.sidebar-mini.sidebar-collapse .sidebar-menu > li > a {
|
.sidebar-mini.sidebar-collapse .sidebar-menu > li > a {
|
||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
.sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span {
|
.sidebar-mini.sidebar-collapse .sidebar-menu > li > a > span {
|
||||||
border-top-right-radius: 4px;
|
border-top-right-radius: 4px;
|
||||||
|
@ -668,29 +669,21 @@ a:focus {
|
||||||
*/
|
*/
|
||||||
.control-sidebar-bg {
|
.control-sidebar-bg {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 900;
|
z-index: 1000;
|
||||||
top: 0;
|
|
||||||
right: 0;
|
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 230px;
|
|
||||||
}
|
}
|
||||||
.control-sidebar-bg,
|
.control-sidebar-bg,
|
||||||
.control-sidebar {
|
.control-sidebar {
|
||||||
-webkit-transform: translate(230px, 0);
|
top: 0;
|
||||||
-ms-transform: translate(230px, 0);
|
right: -230px;
|
||||||
-o-transform: translate(230px, 0);
|
width: 230px;
|
||||||
transform: translate(230px, 0);
|
-webkit-transition: right 0.3s ease-in-out;
|
||||||
-webkit-transition: -webkit-transform 0.3s ease-in-out;
|
-o-transition: right 0.3s ease-in-out;
|
||||||
-moz-transition: -moz-transform 0.3s ease-in-out;
|
transition: right 0.3s ease-in-out;
|
||||||
-o-transition: -o-transform 0.3s ease-in-out;
|
|
||||||
transition: transform 0.3s ease-in-out;
|
|
||||||
}
|
}
|
||||||
.control-sidebar {
|
.control-sidebar {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
|
||||||
padding-top: 50px;
|
padding-top: 50px;
|
||||||
right: 0;
|
|
||||||
width: 230px;
|
|
||||||
z-index: 1010;
|
z-index: 1010;
|
||||||
}
|
}
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 768px) {
|
||||||
|
@ -703,17 +696,11 @@ a:focus {
|
||||||
}
|
}
|
||||||
.control-sidebar.control-sidebar-open,
|
.control-sidebar.control-sidebar-open,
|
||||||
.control-sidebar.control-sidebar-open + .control-sidebar-bg {
|
.control-sidebar.control-sidebar-open + .control-sidebar-bg {
|
||||||
-webkit-transform: translate(0, 0);
|
right: 0;
|
||||||
-ms-transform: translate(0, 0);
|
|
||||||
-o-transform: translate(0, 0);
|
|
||||||
transform: translate(0, 0);
|
|
||||||
}
|
}
|
||||||
.control-sidebar-open .control-sidebar-bg,
|
.control-sidebar-open .control-sidebar-bg,
|
||||||
.control-sidebar-open .control-sidebar {
|
.control-sidebar-open .control-sidebar {
|
||||||
-webkit-transform: translate(0, 0);
|
right: 0;
|
||||||
-ms-transform: translate(0, 0);
|
|
||||||
-o-transform: translate(0, 0);
|
|
||||||
transform: translate(0, 0);
|
|
||||||
}
|
}
|
||||||
@media (min-width: 768px) {
|
@media (min-width: 768px) {
|
||||||
.control-sidebar-open .content-wrapper,
|
.control-sidebar-open .content-wrapper,
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue