diff options
| author | Hauke Stieler <mail@hauke-stieler.de> | 2019-04-08 17:50:31 +0300 |
|---|---|---|
| committer | Hauke Stieler <mail@hauke-stieler.de> | 2019-04-08 17:50:31 +0300 |
| commit | 98790c1946a5bda8ac3160643e25e96a22691d9e (patch) | |
| tree | 950850eb9478912aa27a3111a972710a4d1639a4 | |
| parent | 645b1990acea7b5983ea3fbc7bf8cecace477f80 (diff) | |
| parent | 325e52a7bb55417a41b3437e1e2e5e5d4fe1a513 (diff) | |
Merge branch 'dev' into feature/commento
| -rw-r--r-- | layouts/shortcodes/note.html | 5 | ||||
| -rw-r--r-- | static/css/color-theme.css | 11 | ||||
| -rw-r--r-- | static/css/main.css | 12 |
3 files changed, 28 insertions, 0 deletions
diff --git a/layouts/shortcodes/note.html b/layouts/shortcodes/note.html new file mode 100644 index 0000000..22fcaf4 --- /dev/null +++ b/layouts/shortcodes/note.html @@ -0,0 +1,5 @@ +{{ $note := (index .Params 0) }} + +<div class="note note-border"> + {{ $note | markdownify }} +</div> diff --git a/static/css/color-theme.css b/static/css/color-theme.css index b7ce984..9423607 100644 --- a/static/css/color-theme.css +++ b/static/css/color-theme.css @@ -153,3 +153,14 @@ a.btn-primary.disabled:focus { .embedded-image:focus { border: 1px solid #9ccc65; } + +/* Bootstrap adjustions */ +blockquote { + border-left: 3px solid #bdbdbd; +} + +/* Note box */ +.note { + border: 1px solid #dcedc8; + border-left: 3px solid #9ccc65; +} diff --git a/static/css/main.css b/static/css/main.css index a70f1c4..ffce049 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -274,6 +274,12 @@ article section img { border-radius: 0px; } +blockquote { + padding: 20px; + margin: 15px 0px; + font-size: unset; +} + /* XXX Maybe but this in? Somethimes it's not smooth and that makes it ugly... .btn, .btn-primary, a.btn-default, a { @@ -347,3 +353,9 @@ I don't use the default pager-class because I want to use the normal buttons wit .embedded-image { padding: 5px; } + +/* Note box */ +.note { + padding: 20px; + margin: 15px 0px; +} |