github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed layout-navbar–fixed on iOS & macOS Safari

pull/2437/head
REJack 2019-11-25 08:41:25 +01:00
parent 17a48d70c7
commit 502887c71c
No known key found for this signature in database
GPG Key ID: 9F3976CC630CC888
5 changed files with 123 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/scss/_layout.scss
View File

@ -78,6 +78,26 @@ body,
}
}
body:not(.layout-fixed).layout-navbar-fixed & {
.main-sidebar {
margin-top: calc(#{$main-header-height} / -1);
.sidebar {
margin-top: $main-header-height;
}
}
}
body:not(.layout-fixed).layout-navbar-fixed.text-sm & {
.main-sidebar {
margin-top: calc(#{$main-header-height-sm} / -1);
.sidebar {
margin-top: $main-header-height-sm;
}
}
}
.layout-navbar-fixed & {
.control-sidebar {
top: 0;
@ -269,6 +289,26 @@ body,
}
}
body:not(.layout-fixed).layout#{$infix}-navbar-fixed & {
.main-sidebar {
margin-top: calc(#{$main-header-height} / -1);
.sidebar {
margin-top: $main-header-height;
}
}
}
body:not(.layout-fixed).layout#{$infix}-navbar-fixed.text-sm & {
.main-sidebar {
margin-top: calc(#{$main-header-height-sm} / -1);
.sidebar {
margin-top: $main-header-height-sm;
}
}
}
.layout#{$infix}-navbar-not-fixed & {
.brand-link {
position: static;

80
dist/css/adminlte.css vendored
View File

@ -10165,6 +10165,22 @@ body,
height: calc(2.93725rem + 1px);
}
body:not(.layout-fixed).layout-navbar-fixed .wrapper .main-sidebar {
margin-top: calc(calc(3.5rem + 1px) / -1);
}
body:not(.layout-fixed).layout-navbar-fixed .wrapper .main-sidebar .sidebar  {
margin-top: calc(3.5rem + 1px);
}
body:not(.layout-fixed).layout-navbar-fixed.text-sm .wrapper .main-sidebar {
margin-top: calc(calc(2.93725rem + 1px) / -1);
}
body:not(.layout-fixed).layout-navbar-fixed.text-sm .wrapper .main-sidebar .sidebar  {
margin-top: calc(2.93725rem + 1px);
}
.layout-navbar-fixed .wrapper .control-sidebar {
top: 0;
}
@ -10435,6 +10451,22 @@ body,
margin-top: calc(2.93725rem + 1px);
}
body:not(.layout-fixed).layout-navbar-fixed .wrapper .main-sidebar {
margin-top: calc(calc(3.5rem + 1px) / -1);
}
body:not(.layout-fixed).layout-navbar-fixed .wrapper .main-sidebar .sidebar  {
margin-top: calc(3.5rem + 1px);
}
body:not(.layout-fixed).layout-navbar-fixed.text-sm .wrapper .main-sidebar {
margin-top: calc(calc(2.93725rem + 1px) / -1);
}
body:not(.layout-fixed).layout-navbar-fixed.text-sm .wrapper .main-sidebar .sidebar  {
margin-top: calc(2.93725rem + 1px);
}
.layout-navbar-not-fixed .wrapper .brand-link {
position: static;
}
@ -10566,6 +10598,18 @@ body,
.layout-sm-navbar-fixed.text-sm .wrapper .content-wrapper {
margin-top: calc(2.93725rem + 1px);
}
body:not(.layout-fixed).layout-sm-navbar-fixed .wrapper .main-sidebar {
margin-top: calc(calc(3.5rem + 1px) / -1);
}
body:not(.layout-fixed).layout-sm-navbar-fixed .wrapper .main-sidebar .sidebar  {
margin-top: calc(3.5rem + 1px);
}
body:not(.layout-fixed).layout-sm-navbar-fixed.text-sm .wrapper .main-sidebar {
margin-top: calc(calc(2.93725rem + 1px) / -1);
}
body:not(.layout-fixed).layout-sm-navbar-fixed.text-sm .wrapper .main-sidebar .sidebar  {
margin-top: calc(2.93725rem + 1px);
}
.layout-sm-navbar-not-fixed .wrapper .brand-link {
position: static;
}
@ -10695,6 +10739,18 @@ body,
.layout-md-navbar-fixed.text-sm .wrapper .content-wrapper {
margin-top: calc(2.93725rem + 1px);
}
body:not(.layout-fixed).layout-md-navbar-fixed .wrapper .main-sidebar {
margin-top: calc(calc(3.5rem + 1px) / -1);
}
body:not(.layout-fixed).layout-md-navbar-fixed .wrapper .main-sidebar .sidebar  {
margin-top: calc(3.5rem + 1px);
}
body:not(.layout-fixed).layout-md-navbar-fixed.text-sm .wrapper .main-sidebar {
margin-top: calc(calc(2.93725rem + 1px) / -1);
}
body:not(.layout-fixed).layout-md-navbar-fixed.text-sm .wrapper .main-sidebar .sidebar  {
margin-top: calc(2.93725rem + 1px);
}
.layout-md-navbar-not-fixed .wrapper .brand-link {
position: static;
}
@ -10824,6 +10880,18 @@ body,
.layout-lg-navbar-fixed.text-sm .wrapper .content-wrapper {
margin-top: calc(2.93725rem + 1px);
}
body:not(.layout-fixed).layout-lg-navbar-fixed .wrapper .main-sidebar {
margin-top: calc(calc(3.5rem + 1px) / -1);
}
body:not(.layout-fixed).layout-lg-navbar-fixed .wrapper .main-sidebar .sidebar  {
margin-top: calc(3.5rem + 1px);
}
body:not(.layout-fixed).layout-lg-navbar-fixed.text-sm .wrapper .main-sidebar {
margin-top: calc(calc(2.93725rem + 1px) / -1);
}
body:not(.layout-fixed).layout-lg-navbar-fixed.text-sm .wrapper .main-sidebar .sidebar  {
margin-top: calc(2.93725rem + 1px);
}
.layout-lg-navbar-not-fixed .wrapper .brand-link {
position: static;
}
@ -10953,6 +11021,18 @@ body,
.layout-xl-navbar-fixed.text-sm .wrapper .content-wrapper {
margin-top: calc(2.93725rem + 1px);
}
body:not(.layout-fixed).layout-xl-navbar-fixed .wrapper .main-sidebar {
margin-top: calc(calc(3.5rem + 1px) / -1);
}
body:not(.layout-fixed).layout-xl-navbar-fixed .wrapper .main-sidebar .sidebar  {
margin-top: calc(3.5rem + 1px);
}
body:not(.layout-fixed).layout-xl-navbar-fixed.text-sm .wrapper .main-sidebar {
margin-top: calc(calc(2.93725rem + 1px) / -1);
}
body:not(.layout-fixed).layout-xl-navbar-fixed.text-sm .wrapper .main-sidebar .sidebar  {
margin-top: calc(2.93725rem + 1px);
}
.layout-xl-navbar-not-fixed .wrapper .brand-link {
position: static;
}

2
dist/css/adminlte.css.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/adminlte.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/css/adminlte.min.css.map vendored
View File

File diff suppressed because one or more lines are too long