Skip to content

Commit 7f9256d

Browse files
authored
Merge pull request #103 from hryanjones/gh-pages_FIXED_TOC
Sorry I didn't see this sooner, I'm not sure how I missed it! This is a good fix, thanks.
2 parents 00f047f + 0290f0f commit 7f9256d

File tree

2 files changed

+38
-16
lines changed

2 files changed

+38
-16
lines changed

README.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Getting started
2+
3+
These are the documentation pages for http://witheve.com/ and use [Jekyll integration with Github pages][jekyll].
4+
5+
## Install dependencies
6+
7+
- ruby
8+
- you may need [the development version][ruby-dev])
9+
- [gem][gem]
10+
- [bundler][bundler]
11+
- you may need to install zlib as well
12+
- run the bundle command `bundle install`
13+
14+
## Running
15+
16+
`bundle exec jekyll serve`
17+
18+
[jekyll]: https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/#step-4-build-your-local-jekyll-site
19+
[ruby-dev]: https://stackoverflow.com/questions/4304438/gem-install-failed-to-build-gem-native-extension-cant-find-header-files
20+
[gem]: https://rubygems.org/pages/download/)
21+
[bundler]: http://bundler.io/

css/style.css

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ time, mark, audio, video {
8585
vertical-align: baseline;
8686
}
8787

88-
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;}
88+
html, body { /* This is required so scroll will work correctly on main article and navigation */
89+
height: 100%;
90+
overflow: hidden;
91+
}
92+
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;}
8994

9095

9196
pre {
@@ -149,15 +154,15 @@ img {
149154
}
150155

151156
.main {
152-
display: flex;
153-
align-items: stretch;
154-
min-height: 100%;
157+
margin-top: 80px;
158+
margin: 5px;
155159
}
156160

157161
.drawer {
158162
color: rgb(85, 85, 85);
159163
padding-bottom: 20px;
160-
padding-top: 10px;
164+
padding: 20px;
165+
height: auto;
161166
}
162167

163168
.highlight {
@@ -176,6 +181,7 @@ img {
176181
.article {
177182
padding-left: 50px;
178183
padding-bottom: 200px;
184+
overflow: auto;
179185
}
180186

181187
.article a {
@@ -256,14 +262,14 @@ b {
256262
.flex-row.double-spaced > * + * { margin-left: 60px; }
257263
.flex-row.stretched { align-self: stretch; }
258264

259-
.layer-wrapper { display: flex; flex-direction: column; align-items: center; margin-top: 60px; padding: 0 40px; }
260-
.layer { max-width: 100%; width: 960px; display: flex; align-items: center; }
261-
.toplayer { max-width: 100%; width: 960px; display: flex; align-items: top; }
265+
.layer-wrapper { display: flex; flex-direction: column; align-items: center; margin-top: 20px;}
266+
.layer {width: 95%; display: flex;align-items: center; flex-wrap: wrap;}
267+
.toplayer {width: 100%;display: flex; height: auto; padding: 7px; overflow: hidden;}
262268
.sub-layer { margin-top: 30px; }
263269

264-
.header-wrapper { }
265-
.logo { display: flex; flex: 0 0 auto; align-items: center; padding: 0; }
266-
.logo > img { max-width: 60px; }
270+
.header-wrapper {margin: 0px; width: 100%; padding: 10px 0px; box-shadow: 0 0 1.25rem #9da5ab; flex-shrink: 0;}
271+
.logo {display: flex;flex: 0 0 auto;align-items: center;padding: 0;}
272+
.logo > img {max-width: 45px;}
267273
.logo > h1 { margin: 0; margin-left: 18px; padding: 0; height: 26px; margin-top: -32px; }
268274
.logo > h1 > img { height: 100%; }
269275

@@ -273,11 +279,6 @@ nav > *:hover { background: #f2f2f2; }
273279
nav > *:active { background: #e9e9e9; }
274280
nav > .play-cta { margin: 0; padding: 10px 20px; color: white; }
275281

276-
@media (max-width: 760px) {
277-
header { flex-direction: column; }
278-
header .logo { margin-bottom: 30px; }
279-
}
280-
281282
@media (max-width: 540px) {
282283
nav { flex-wrap: wrap; }
283284
nav > * { flex: 1 0 auto; padding: 10px 15px; text-align: center; }

0 commit comments

Comments
 (0)