Skip to content

Commit 5160ff5

Browse files
committed
fix Holy Grail Layout
1 parent cc0f93a commit 5160ff5

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

doc/css/holy-grail-layout.css

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body {
1010
}
1111

1212
.HolyGrail-container {
13-
width: 980px;
13+
width: 100%;
1414
height: 100%;
1515
box-sizing: border-box;
1616
display: -webkit-flex;
@@ -41,26 +41,29 @@ body {
4141

4242
.HolyGrail-content {
4343
box-sizing: border-box;
44-
-webkit-flex: 0 0 48.66667%;
45-
-ms-flex: 0 0 48.66667%;
46-
flex: 0 0 48.66667%;
44+
max-width: 100%;
45+
width: auto;
46+
-webkit-flex: 1 1 auto;
47+
-ms-flex: 1 1 auto;
48+
flex: 1 1 auto;
49+
margin: 0 2%;
4750
}
4851

4952
.HolyGrail-nav {
5053
box-sizing: border-box;
51-
-webkit-flex: 0 0 23.66667%;
52-
-ms-flex: 0 0 23.66667%;
53-
flex: 0 0 23.66667%;
54+
-webkit-flex: 0 0 240px;
55+
-ms-flex: 0 0 240px;
56+
flex: 0 0 240px;
5457
-webkit-order: -1;
5558
-ms-flex-order: -1;
5659
order: -1;
5760
}
5861

5962
.HolyGrail-aside {
6063
box-sizing: border-box;
61-
-webkit-flex: 0 0 23.66667%;
62-
-ms-flex: 0 0 23.66667%;
63-
flex: 0 0 23.66667%;
64+
-webkit-flex: 0 0 120px;
65+
-ms-flex: 0 0 120px;
66+
flex: 0 0 120px;
6467
}
6568

6669
header,
@@ -73,7 +76,6 @@ footer {
7376

7477
.HolyGrail-body {
7578
background: #a5c3e2;
76-
border: 1px solid #130e7d;
7779
}
7880

7981
header,

doc/sass/holy-grail-layout.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body {
1515
}
1616

1717
.HolyGrail-container {
18-
width: 980px;
18+
width: 100%;
1919
height: 100%;
2020
@include grid($flex-flow: column nowrap);
2121
margin: auto;
@@ -27,13 +27,14 @@ body {
2727
}
2828

2929
.HolyGrail-content {
30-
@include grid-col($col: 6, $col-offset: $default-col-offset, $flex-shrink: 1);
30+
@include grid-col($col: auto, $flex-shrink: 0 );
31+
margin: 0 2%;
3132
}
3233
.HolyGrail-nav {
33-
@include grid-col($col: 3, $col-offset: $default-col-offset, $flex-shrink: 1, $order: -1);
34+
@include grid-col($col: 240px, $flex-shrink: 0, $order: -1);
3435
}
3536
.HolyGrail-aside {
36-
@include grid-col($col: 3, $col-offset: $default-col-offset, $flex-shrink: 1);
37+
@include grid-col($col: 120px, $flex-shrink: 0);
3738
}
3839

3940
header,
@@ -43,7 +44,6 @@ footer {
4344

4445
.HolyGrail-body {
4546
background: #a5c3e2;
46-
border: 1px solid #130e7d;
4747
}
4848

4949
header,

0 commit comments

Comments
 (0)