Skip to content

Commit

Permalink
changed content-wrapper calc() from % to vh & added content-wrapp…
Browse files Browse the repository at this point in the history
…er calc() with collapsed header
  • Loading branch information
REJack committed Jul 10, 2019
1 parent b90ae59 commit 33ecce7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 5 deletions.
8 changes: 7 additions & 1 deletion build/less/core.less
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,17 @@ body {
}

.content-wrapper {
min-height: ~"calc(100% - 102px)";
min-height: ~"calc(100vh - 101px)";
background-color: @content-bg;
z-index: 800;
}

@media (max-width: @screen-header-collapse) {
.content-wrapper {
min-height: ~"calc(100vh - 151px)";
}
}

.main-footer {
background: #fff;
padding: 15px;
Expand Down
7 changes: 6 additions & 1 deletion dist/css/AdminLTE.css
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,15 @@ body {
}
}
.content-wrapper {
min-height: calc(100% - 102px);
min-height: calc(100vh - 101px);
background-color: #ecf0f5;
z-index: 800;
}
@media (max-width: 767px) {
.content-wrapper {
min-height: calc(100vh - 151px);
}
}
.main-footer {
background: #fff;
padding: 15px;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/AdminLTE.min.css

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion dist/css/alt/AdminLTE-without-plugins.css
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,15 @@ body {
}
}
.content-wrapper {
min-height: calc(100% - 102px);
min-height: calc(100vh - 101px);
background-color: #ecf0f5;
z-index: 800;
}
@media (max-width: 767px) {
.content-wrapper {
min-height: calc(100vh - 151px);
}
}
.main-footer {
background: #fff;
padding: 15px;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/alt/AdminLTE-without-plugins.min.css

Large diffs are not rendered by default.

0 comments on commit 33ecce7

Please sign in to comment.