diff options
| author | Noah Loomans <noahloomans@gmail.com> | 2017-06-21 11:05:32 +0200 |
|---|---|---|
| committer | Noah Loomans <noahloomans@gmail.com> | 2017-06-21 11:05:32 +0200 |
| commit | 1fe16cf17b0333eac2f849dbbed8452ec2fdf4fc (patch) | |
| tree | f6fbabd5e13ccf9b739873c636960c8733c80504 | |
| parent | 9a6983d2977dd20944626f9c23f9e02d80b1ca85 (diff) | |
| parent | 7648e2a4d5d16be21675324c2cb30f77fbfa4ab3 (diff) | |
Merge branch 'master' into beta
| -rw-r--r-- | bower.json | 3 | ||||
| -rw-r--r-- | public/stylesheets/style.css | 22 | ||||
| -rw-r--r-- | views/index.jade | 12 | ||||
| -rw-r--r-- | views/layout.jade | 2 |
4 files changed, 35 insertions, 4 deletions
@@ -16,6 +16,7 @@ "tests" ], "dependencies": { - "sw-toolbox": "^3.3.0" + "sw-toolbox": "^3.3.0", + "material-design-lite": "^1.3.0" } } diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index b3fb6d8..830b007 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -368,3 +368,25 @@ body.week-selector-not-visible #week-selector { .print { display: none; } + +#notification { + max-width: 600px; + padding: 10px; + margin: 0 auto; +} + +#notification .box { + display: flex; + background-color: #e0e0e0; + padding: 8px; + border-radius: 2px; + align-items: center; +} + +#notification .text { + padding-left: 8px; +} + +.grow { + flex-grow: 1; +} diff --git a/views/index.jade b/views/index.jade index e7005c7..3ee0d28 100644 --- a/views/index.jade +++ b/views/index.jade @@ -7,8 +7,8 @@ block head link(rel='stylesheet', href='/stylesheets/style.css') link(rel='stylesheet', href='/stylesheets/print.css', media='print') link(rel='stylesheet', href='https://fonts.googleapis.com/icon?family=Material+Icons') - link(rel='stylesheet', href='https://code.getmdl.io/1.2.1/material.indigo-pink.min.css') - script(defer='', src='https://code.getmdl.io/1.2.1/material.min.js') + link(rel='stylesheet', href='/components/material-design-lite/material.min.css') + script(defer='', src='/components/material-design-lite/material.min.js') block content form#search @@ -43,6 +43,14 @@ block content span.print button(type='button').material-icons  + #notification + .box + .text + strong Het rooster is ingekort + span in verband met de warmte. + .grow + a(href='http://hetmml.nl/', class='mdl-button mdl-js-button mdl-js-ripple-effect') Meer info + #schedule block scripts diff --git a/views/layout.jade b/views/layout.jade index db12477..f7f9e1f 100644 --- a/views/layout.jade +++ b/views/layout.jade @@ -2,7 +2,7 @@ block variables - var bodyStyle = ''; doctype html -html +html(lang='nl') head block head_top if isBeta |