Skip to content

Commit 3822aa7

Browse files
authored
Merge pull request #69 from WSI-Services/layout-full-height
Layout Full Height
2 parents 98a91e5 + d7555b1 commit 3822aa7

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

assets/themes/the-program/css/_base.less

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ Base from [HTML5 Boilerplate](http://j.mp/rP0wmY)
2121
No styleguide reference.
2222
*/
2323

24-
html, body { height: 100%; }
25-
html { font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
26-
body { margin: 0; font-size: 1em; line-height: 1.4; -webkit-tap-highlight-color: rgba(255,0,0, 0.62); }
24+
html { height: 100%; font-size: 100%; overflow-y: scroll; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; }
25+
body { height: 100%; margin: 0; font-size: 1em; line-height: 1.4; -webkit-tap-highlight-color: rgba(255,0,0, 0.62); }
2726
body, button, input, select, textarea { font-family: sans-serif; }
2827
::-moz-selection { background: #073642; color: #fff; text-shadow: none; }
2928
::selection { background: #073642; color: #fff; text-shadow: none; }

assets/themes/the-program/css/_mediaqueries.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@
213213
-moz-box-shadow: rgba(255,255,255,1.0) 0px 0px 2px;
214214
-o-box-shadow: rgba(255,255,255,1.0) 0px 0px 2px;
215215
margin-right: 450px;
216-
@padding-top-bottom: (@line-height * 1px);
217-
padding: @padding-top-bottom ((@line-height * 2) * 1px);
218-
height: calc(~"100% -" @padding-top-bottom);
216+
padding: (@line-height * 1px) ((@line-height * 2) * 1px);
217+
@padding-vertical: ((@line-height * 1px) * 2);
218+
height: calc(~"100% -" @padding-vertical);
219219
}
220220
}
221221

assets/themes/the-program/css/style.css

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,15 @@ Base from [HTML5 Boilerplate](http://j.mp/rP0wmY)
3939
4040
No styleguide reference.
4141
*/
42-
html,
43-
body {
44-
height: 100%;
45-
}
4642
html {
43+
height: 100%;
4744
font-size: 100%;
4845
overflow-y: scroll;
4946
-webkit-text-size-adjust: 100%;
5047
-ms-text-size-adjust: 100%;
5148
}
5249
body {
50+
height: 100%;
5351
margin: 0;
5452
font-size: 1em;
5553
line-height: 1.4;
@@ -556,6 +554,7 @@ html {
556554
background-repeat: repeat;
557555
background-position: 0 0;
558556
background-color: #e2e2de;
557+
height: 100%;
559558
}
560559
.body .unit-body {
561560
background-color: #fafafa;
@@ -1087,7 +1086,7 @@ pre {
10871086
-o-box-shadow: #ffffff 0px 0px 2px;
10881087
margin-right: 450px;
10891088
padding: 26px 52px;
1090-
height: calc(100% - 26px);
1089+
height: calc(100% - 52px);
10911090
}
10921091
.the-footer {
10931092
position: relative;

assets/themes/the-program/css/style.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ html {
2020
background-repeat: repeat;
2121
background-position: 0 0;
2222
background-color: #e2e2de;
23+
height: 100%;
2324
}
2425

2526
.body {

0 commit comments

Comments
 (0)