Skip to content

Commit 2d9c114

Browse files
authored
Merge pull request #107 from witheve/fix/flex-scrolling
Fix/flex scrolling
2 parents 7f9256d + 3d58b78 commit 2d9c114

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CNAME merge=ours
2+
_config.yml merge=ours

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ _cache/
44
_jekyll_s3.yml
55
.DS_Store
66
*.swp
7-
.jekyll-metadata
7+
.jekyll-metadata
8+
CNAME

CNAME

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
docs.witheve.com
1+
docs.witheve.com

Gemfile.lock

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ GEM
167167
nokogiri (1.8.0)
168168
mini_portile2 (~> 2.2.0)
169169
octokit (4.7.0)
170-
sawyer (~> 0.8.0, >= 0.5.3)
170+
sawyer (>= 0.5.3, ~> 0.8.0)
171171
pathutil (0.14.0)
172172
forwardable-extended (~> 2.6)
173173
public_suffix (2.0.5)
@@ -194,6 +194,3 @@ PLATFORMS
194194

195195
DEPENDENCIES
196196
github-pages
197-
198-
BUNDLED WITH
199-
1.15.1

_config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ permalink: pretty
22
markdown: kramdown
33
timezone: America/Los_Angeles
44
future: true
5-
url: http://docs.witheve.com
65
markdown_ext: "markdown,mkdown,mkdn,mkd,md,eve"
76
github: [metadata]

css/style.css

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ html, body { /* This is required so scroll will work correctly on main article a
9090
overflow: hidden;
9191
}
9292

93-
body {display: flex; flex-direction: column; margin: 0;background: white; color: #555; line-height: 1.7; font-family: "Open Sans", Avenir, "Helvetica neue", sans-serif;}
93+
body {display: flex; flex-direction: column; height: 100vh; margin: 0; background: white; color: #555; line-height: 1.7; font-family: "Open Sans", Avenir, "Helvetica neue", sans-serif;}
9494

9595

9696
pre {
@@ -146,7 +146,7 @@ em {
146146
}
147147

148148
li {
149-
margin-left: 20px;
149+
margin-left: 20px;
150150
}
151151

152152
img {
@@ -156,6 +156,7 @@ img {
156156
.main {
157157
margin-top: 80px;
158158
margin: 5px;
159+
flex: 1 1 0;
159160
}
160161

161162
.drawer {
@@ -167,7 +168,7 @@ img {
167168

168169
.highlight {
169170
margin-bottom: 20px;
170-
margin-top: 20px;
171+
margin-top: 20px;
171172
}
172173

173174
.colored {
@@ -264,10 +265,10 @@ b {
264265

265266
.layer-wrapper { display: flex; flex-direction: column; align-items: center; margin-top: 20px;}
266267
.layer {width: 95%; display: flex;align-items: center; flex-wrap: wrap;}
267-
.toplayer {width: 100%;display: flex; height: auto; padding: 7px; overflow: hidden;}
268+
.toplayer {width: 100%;display: flex; flex: 1 1 0; height: auto; padding: 7px; overflow: hidden;}
268269
.sub-layer { margin-top: 30px; }
269270

270-
.header-wrapper {margin: 0px; width: 100%; padding: 10px 0px; box-shadow: 0 0 1.25rem #9da5ab; flex-shrink: 0;}
271+
.header-wrapper {margin: 0px; width: 100%; padding: 10px 0px; box-shadow: 0 0 1.25rem #9da5ab; flex: 0 1 auto;}
271272
.logo {display: flex;flex: 0 0 auto;align-items: center;padding: 0;}
272273
.logo > img {max-width: 45px;}
273274
.logo > h1 { margin: 0; margin-left: 18px; padding: 0; height: 26px; margin-top: -32px; }
@@ -333,17 +334,17 @@ code { white-space: pre-wrap; font-family: "Inconsolata", "Monaco", "Consolas",
333334

334335
strong { font-weight: 600; }
335336

336-
table {
337-
border: 1px #888a8f solid;
338-
margin-bottom: 1em;
339-
min-width: 820px;
337+
table {
338+
border: 1px #888a8f solid;
339+
margin-bottom: 1em;
340+
min-width: 820px;
340341
border-collapse: collapse;
341342
border-spacing: 0;
342343
}
343344

344-
td {
345-
border: 1px #AAA solid;
346-
width: 20em;
345+
td {
346+
border: 1px #AAA solid;
347+
width: 20em;
347348
padding: 10px;
348349
}
349350

@@ -358,4 +359,4 @@ td {
358359

359360
.libitem {
360361
margin-bottom: 20px;
361-
}
362+
}

test.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
test!

0 commit comments

Comments
 (0)