Skip to content

Commit 930a233

Browse files
authored
Fix footer (#1095)
1 parent 70fbd80 commit 930a233

File tree

6 files changed

+31
-7
lines changed

6 files changed

+31
-7
lines changed

src/Modules/SimplCommerce.Module.Core/Areas/Core/Views/HomeAdmin/Index.cshtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@
238238
</div>
239239
</div>
240240

241-
<div class="container-fluid body-content">
242-
<div ui-view></div>
241+
<div class="container-fluid body-content body-content-custom">
242+
<div class="ui-view-content" ui-view></div>
243243
<hr />
244244
<footer>
245245
<p class="pull-left">&copy; @DateTime.Now.Year - SimplCommerce</p>

src/Modules/SimplCommerce.Module.Core/wwwroot/admin/admin-core.css

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
body {
2-
height: auto;
2+
height: 100%;
3+
display:flex;
4+
flex-direction: column;
35
}
46

57
.inline {
@@ -208,4 +210,15 @@ td>span.glyphicon-remove {
208210
.btn-translate {
209211
margin-right: 3px;
210212
}
211-
213+
214+
.body-content-custom {
215+
width: 100% !important;
216+
margin: 0 !important;
217+
flex: 1;
218+
display: flex;
219+
flex-direction:column;
220+
}
221+
222+
.ui-view-content {
223+
flex: 1;
224+
}

src/Modules/SimplCommerce.Module.Core/wwwroot/site.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
/* Set widths on the form inputs since otherwise they're 100% wide */
2+
html {
3+
height: 100%;
4+
}
5+
6+
body {
7+
height: 100%;
8+
display: flex;
9+
flex-direction: column;
10+
}
11+
212
input,
313
select,
414
textarea {
@@ -143,6 +153,7 @@ li.nav-item-group, li.nav-item-group a {
143153
}
144154

145155
.footer-content {
156+
padding-top: 20px;
146157
margin-top: 30px;
147158
background-color: #eee;
148159
}

src/SimplCommerce.WebHost/Themes/CozaStore/Views/Shared/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
@RenderSection("featured", false)
119119

120-
<div class="container body-content clearfix">
120+
<div class="container body-content clearfix flex-grow-1">
121121
@RenderBody()
122122
</div>
123123
<!-- Footer -->

src/SimplCommerce.WebHost/Themes/SampleTheme/Views/Shared/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</div>
6161
</div>
6262
</div>
63-
<div class="container body-content">
63+
<div class="container body-content flex-grow-1">
6464
@RenderBody()
6565
</div>
6666
<div class="footer-content">

src/SimplCommerce.WebHost/Views/Shared/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</div>
5555
</div>
5656
<partial name="_CookieConsentPartial" />
57-
<div class="container body-content clearfix">
57+
<div class="container body-content clearfix flex-grow-1">
5858
@RenderBody()
5959
</div>
6060
<div class="footer-content">

0 commit comments

Comments
 (0)