diff options
author | Monty Taylor <mordred@inaugust.com> | 2015-08-01 01:18:29 +1000 |
---|---|---|
committer | Monty Taylor <mordred@inaugust.com> | 2015-08-01 01:18:29 +1000 |
commit | 69d66321015064c63ef6377ccff5f6d35560fb19 (patch) | |
tree | 9d5aab64b377ee26f7a54c7884839cce6c0cdaec | |
parent | e51d88e3bcda4f4cfd5173ff1d6dc58f37fd96ca (diff) |
Move talks down a level
-rw-r--r-- | bower.json | 3 | ||||
-rw-r--r-- | gulpfile.js | 14 | ||||
-rw-r--r-- | src/css/mordred.css | 84 | ||||
-rw-r--r-- | src/images/smallInAugustLogo.jpeg | bin | 0 -> 17258 bytes | |||
-rw-r--r-- | src/index.html | 79 | ||||
-rw-r--r-- | src/talks/a-vision-for-the-future/index.html (renamed from src/a-vision-for-the-future/index.html) | 0 | ||||
-rw-r--r-- | src/talks/index.hbs (renamed from src/index.hbs) | 2 | ||||
-rw-r--r-- | src/talks/template/index.hbs (renamed from src/template/index.hbs) | 0 |
8 files changed, 173 insertions, 9 deletions
@@ -17,7 +17,8 @@ | |||
17 | "font-awesome": "~4.3.0", | 17 | "font-awesome": "~4.3.0", |
18 | "font-mfizz": "~2.0.1", | 18 | "font-mfizz": "~2.0.1", |
19 | "reveal.js": "~3.1.0", | 19 | "reveal.js": "~3.1.0", |
20 | "bootstrap": "~3.3.5" | 20 | "bootstrap": "~3.3.5", |
21 | "modernizr": "~2.8.2" | ||
21 | }, | 22 | }, |
22 | "overrides": { | 23 | "overrides": { |
23 | "font-mfizz": { | 24 | "font-mfizz": { |
diff --git a/gulpfile.js b/gulpfile.js index 20ca3b1..f6334a3 100644 --- a/gulpfile.js +++ b/gulpfile.js | |||
@@ -26,10 +26,10 @@ | |||
26 | // List of file paths. | 26 | // List of file paths. |
27 | var paths = { | 27 | var paths = { |
28 | 'html': dir.src + '/**/*.html', | 28 | 'html': dir.src + '/**/*.html', |
29 | 'hbs': dir.src + '/index.hbs', | ||
30 | 'index': dir.src + '/index.hbs', | 29 | 'index': dir.src + '/index.hbs', |
31 | 'css': dir.src + '/css/**/*.css', | 30 | 'css': dir.src + '/css/**/*.css', |
32 | 'js': dir.src + '/js/**/*.js', | 31 | 'js': dir.src + '/js/**/*.js', |
32 | 'talks': dir.src + '/talks', | ||
33 | 'images': [ | 33 | 'images': [ |
34 | dir.src + '/**/*.png', | 34 | dir.src + '/**/*.png', |
35 | dir.src + '/**/*.gif', | 35 | dir.src + '/**/*.gif', |
@@ -62,10 +62,10 @@ | |||
62 | */ | 62 | */ |
63 | function buildPresentationManifest () { | 63 | function buildPresentationManifest () { |
64 | var presentations = []; | 64 | var presentations = []; |
65 | var files = fs.readdirSync(dir.src); | 65 | var files = fs.readdirSync(paths.talks); |
66 | 66 | ||
67 | for (var i = 0; i < files.length; i++) { | 67 | for (var i = 0; i < files.length; i++) { |
68 | var file = dir.src + '/' + files[i] + '/index.html'; | 68 | var file = paths.talks + '/' + files[i] + '/index.html'; |
69 | try { | 69 | try { |
70 | var stat = fs.statSync(file); | 70 | var stat = fs.statSync(file); |
71 | var $ = cheerio.load(fs.readFileSync(file)); | 71 | var $ = cheerio.load(fs.readFileSync(file)); |
@@ -163,7 +163,7 @@ | |||
163 | /** | 163 | /** |
164 | * Package the handlebars files. | 164 | * Package the handlebars files. |
165 | */ | 165 | */ |
166 | gulp.task('package:hbs', function () { | 166 | gulp.task('package:talks', function () { |
167 | 167 | ||
168 | var templateData = { | 168 | var templateData = { |
169 | 'presentations': buildPresentationManifest(), | 169 | 'presentations': buildPresentationManifest(), |
@@ -171,7 +171,7 @@ | |||
171 | }; | 171 | }; |
172 | 172 | ||
173 | // Automatically build the site list. | 173 | // Automatically build the site list. |
174 | return gulp.src(paths.hbs, {'base': dir.src}) | 174 | return gulp.src(paths.talks + '/index.hbs', {'base': dir.src}) |
175 | .pipe(handlebars(templateData, handlebarsConfig)) | 175 | .pipe(handlebars(templateData, handlebarsConfig)) |
176 | .pipe(rename(function (path) { | 176 | .pipe(rename(function (path) { |
177 | path.extname = ".html"; | 177 | path.extname = ".html"; |
@@ -247,7 +247,7 @@ | |||
247 | /** | 247 | /** |
248 | * Package the entire site into the dist folder. | 248 | * Package the entire site into the dist folder. |
249 | */ | 249 | */ |
250 | gulp.task('package', ['package:html', 'package:hbs', 'package:libs', | 250 | gulp.task('package', ['package:html', 'package:talks', 'package:libs', |
251 | 'package:images', 'package:css', 'package:js']); | 251 | 'package:images', 'package:css', 'package:js']); |
252 | 252 | ||
253 | gulp.task('rsync', function () { | 253 | gulp.task('rsync', function () { |
@@ -272,7 +272,7 @@ | |||
272 | gulp.task('serve', function () { | 272 | gulp.task('serve', function () { |
273 | gulp.watch(paths.html, ['package:html']); | 273 | gulp.watch(paths.html, ['package:html']); |
274 | gulp.watch(paths.images, ['package:images']); | 274 | gulp.watch(paths.images, ['package:images']); |
275 | gulp.watch(paths.hbs, ['package:hbs']); | 275 | gulp.watch(paths.hbs, ['package:talks']); |
276 | gulp.watch(paths.css, ['package:css']); | 276 | gulp.watch(paths.css, ['package:css']); |
277 | gulp.watch(paths.js, ['package:js']); | 277 | gulp.watch(paths.js, ['package:js']); |
278 | 278 | ||
diff --git a/src/css/mordred.css b/src/css/mordred.css new file mode 100644 index 0000000..23674ee --- /dev/null +++ b/src/css/mordred.css | |||
@@ -0,0 +1,84 @@ | |||
1 | .browsehappy { | ||
2 | margin: 0.2em 0; | ||
3 | background: #ccc; | ||
4 | color: #000; | ||
5 | padding: 0.2em 0; | ||
6 | } | ||
7 | |||
8 | /* Space out content a bit */ | ||
9 | body { | ||
10 | padding-bottom: 20px; | ||
11 | } | ||
12 | |||
13 | /* Everything but the jumbotron gets side spacing for mobile first views */ | ||
14 | .header, | ||
15 | .marketing, | ||
16 | .footer { | ||
17 | padding-left: 15px; | ||
18 | padding-right: 15px; | ||
19 | } | ||
20 | |||
21 | /* Custom page header */ | ||
22 | .header { | ||
23 | border-bottom: 1px solid #e5e5e5; | ||
24 | } | ||
25 | |||
26 | /* Make the masthead heading the same height as the navigation */ | ||
27 | .header h3 { | ||
28 | margin-top: 0; | ||
29 | margin-bottom: 0; | ||
30 | line-height: 40px; | ||
31 | padding-bottom: 19px; | ||
32 | } | ||
33 | |||
34 | /* Custom page footer */ | ||
35 | .footer { | ||
36 | padding-top: 19px; | ||
37 | color: #777; | ||
38 | border-top: 1px solid #e5e5e5; | ||
39 | } | ||
40 | |||
41 | .container-narrow > hr { | ||
42 | margin: 30px 0; | ||
43 | } | ||
44 | |||
45 | /* Main marketing message and sign up button */ | ||
46 | .jumbotron { | ||
47 | background: url(/images/smallInAugustLogo.jpeg) no-repeat; | ||
48 | text-align: center; | ||
49 | border-bottom: 1px solid #e5e5e5; | ||
50 | } | ||
51 | |||
52 | .jumbotron .btn { | ||
53 | font-size: 21px; | ||
54 | padding: 14px 24px; | ||
55 | } | ||
56 | |||
57 | /* Supporting marketing content */ | ||
58 | .marketing { | ||
59 | margin: 40px 0; | ||
60 | } | ||
61 | |||
62 | .markerting > p + h4 { | ||
63 | margin-top: 28px; | ||
64 | } | ||
65 | |||
66 | /* Responsive: Portrait tablets and up */ | ||
67 | @media screen and (min-width: 768px) { | ||
68 | .container { | ||
69 | max-width: 730px; | ||
70 | } | ||
71 | |||
72 | /* Remove the padding we set earlier */ | ||
73 | .header, | ||
74 | .marketing, | ||
75 | .footer { | ||
76 | padding-left: 0; | ||
77 | padding-right: 0; | ||
78 | } | ||
79 | |||
80 | /* Space out the masthead */ | ||
81 | .header { | ||
82 | margin-bottom: 10px; | ||
83 | } | ||
84 | } | ||
diff --git a/src/images/smallInAugustLogo.jpeg b/src/images/smallInAugustLogo.jpeg new file mode 100644 index 0000000..6d2a40c --- /dev/null +++ b/src/images/smallInAugustLogo.jpeg | |||
Binary files differ | |||
diff --git a/src/index.html b/src/index.html new file mode 100644 index 0000000..340aab5 --- /dev/null +++ b/src/index.html | |||
@@ -0,0 +1,79 @@ | |||
1 | <!doctype html> | ||
2 | <html class="no-js"> | ||
3 | <head> | ||
4 | <meta charset="utf-8"> | ||
5 | <title>In August Productions</title> | ||
6 | <meta name="description" content=""> | ||
7 | <meta name="viewport" content="width=device-width"> | ||
8 | <link rel="shortcut icon" href="/favicon.ico"> | ||
9 | <link rel="stylesheet" | ||
10 | href="/css/bootstrap.css"> | ||
11 | <link rel="stylesheet" | ||
12 | href="/css/modernizr.css"> | ||
13 | <link rel="stylesheet" | ||
14 | href="/css/mordred.css"> | ||
15 | |||
16 | </head> | ||
17 | <body> | ||
18 | <!--[if lt IE 10]> | ||
19 | <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> | ||
20 | <![endif]--> | ||
21 | |||
22 | |||
23 | <!-- | ||
24 | <nav class="navbar navbar-inverse navbar-fixed-top"> | ||
25 | <div class="container"> | ||
26 | <div class="header"> | ||
27 | <ul class="nav nav-pills pull-right"> | ||
28 | <li class="active"><a href="/">Home</a></li> | ||
29 | </ul> | ||
30 | <h3 class="text-muted"><a href="/">inaugust.com</a></h3> | ||
31 | </div> | ||
32 | </div> | ||
33 | </nav> | ||
34 | --> | ||
35 | |||
36 | <!-- Main jumbotron for a primary marketing message or call to action --> | ||
37 | <div class="jumbotron" | ||
38 | xmlns:dct="http://purl.org/dc/terms/" | ||
39 | href="http://purl.org/dc/dcmitype/InteractiveResource" | ||
40 | property="dct:title" | ||
41 | rel="dct:type"> | ||
42 | <div class="container"> | ||
43 | <p class="lead">Things you may or may not care or not care about.</p> | ||
44 | </div> | ||
45 | </div> | ||
46 | |||
47 | <div class="container"> | ||
48 | <div class="row"> | ||
49 | <h3><a href='talks'>Slides for Talks I've Given</a></h3> | ||
50 | </div> | ||
51 | <div class="row"> | ||
52 | <h3><a href='big-tent.html'>The Big Tent</a></h3> | ||
53 | </div> | ||
54 | |||
55 | <div class="footer"> | ||
56 | <p>© | ||
57 | <span xmlns:cc="http://creativecommons.org/ns#" | ||
58 | property="cc:attributionName">Monty Taylor</span> | ||
59 | 2015 | ||
60 | </p> | ||
61 | |||
62 | <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"> | ||
63 | <img alt="Creative Commons License" | ||
64 | style="border-width:0" | ||
65 | src="https://i.creativecommons.org/l/by/4.0/88x31.png" /> | ||
66 | </a><br /> | ||
67 | <a xmlns:cc="http://creativecommons.org/ns#" | ||
68 | rel="cc:attributionURL" | ||
69 | href='http://inaugust.com'>http://inaugust.com</a> is licensed under a | ||
70 | <a rel="license" | ||
71 | href="http://creativecommons.org/licenses/by/4.0/"> | ||
72 | Creative Commons Attribution 4.0 International License | ||
73 | </a>. | ||
74 | <br /> | ||
75 | Website source code available at <a href='https://github.com/emonty/inaugust.com'>https://github.com/emonty/inaugust.com</a> | ||
76 | </div> | ||
77 | |||
78 | </body> | ||
79 | </html> | ||
diff --git a/src/a-vision-for-the-future/index.html b/src/talks/a-vision-for-the-future/index.html index 88fdbe5..88fdbe5 100644 --- a/src/a-vision-for-the-future/index.html +++ b/src/talks/a-vision-for-the-future/index.html | |||
diff --git a/src/index.hbs b/src/talks/index.hbs index 97114c7..4fba0b1 100644 --- a/src/index.hbs +++ b/src/talks/index.hbs | |||
@@ -5,7 +5,7 @@ | |||
5 | <meta charset="utf-8"> | 5 | <meta charset="utf-8"> |
6 | <title>Conference Talks</title> | 6 | <title>Conference Talks</title> |
7 | <link rel="stylesheet" | 7 | <link rel="stylesheet" |
8 | href="css/bootstrap.css"> | 8 | href="/css/bootstrap.css"> |
9 | <meta name="description" | 9 | <meta name="description" |
10 | content="Conference Talks by {{author.name}}"> | 10 | content="Conference Talks by {{author.name}}"> |
11 | <meta name="author" content="{{author.name}}"> | 11 | <meta name="author" content="{{author.name}}"> |
diff --git a/src/template/index.hbs b/src/talks/template/index.hbs index 1d05d8f..1d05d8f 100644 --- a/src/template/index.hbs +++ b/src/talks/template/index.hbs | |||