From aaea4df364d1374d83c10f0b001ccf8e57353055 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 23 May 2015 09:38:49 +0200 Subject: Sync with ikiwiki 3.20150329. --- style.css | 45 +++++++++++++++++++++++++++++++++++++++++++++ templates/note.mdwn | 5 +++-- templates/popup.mdwn | 5 +++-- 3 files changed, 51 insertions(+), 4 deletions(-) diff --git a/style.css b/style.css index 4c48e5c..fe1eb90 100644 --- a/style.css +++ b/style.css @@ -548,3 +548,48 @@ a.openid_large_btn:focus { .trailsep { display: none; } + +/* mobile/small-screen-friendly layout */ +@media (max-width: 600px) { + .sidebar { + width: auto; + float: none; + margin-top: 0; + border: none; + } + + /* if the mobile browser is new enough, use flex layout to shuffle + * the sidebar to the end */ + .page { + display: -webkit-box; + display: -webkit-flexbox; + display: -webkit-flex; + display: -moz-box; + display: -ms-flexbox; + display: flex; + -webkit-box-orient: vertical; + -webkit-flex-direction: tb; + -webkit-flex-direction: column; + -webkit-flex-flow: column; + -ms-flex-direction: column; + flex-direction: column; + } + #pageheader { + -webkit-box-ordinal-group: -1; + -webkit-order: -1; + -ms-box-ordinal-group: -1; + -ms-flex-order: -1; + order: -1; + } + .sidebar, #footer { + -webkit-box-ordinal-group: 1; + -webkit-order: 1; + -ms-box-ordinal-group: 1; + -ms-flex-order: 1; + order: 1; + } + + .blogform, #blogform { + padding: 4px 4px; + } +} diff --git a/templates/note.mdwn b/templates/note.mdwn index 9ef5ad9..8de7374 100644 --- a/templates/note.mdwn +++ b/templates/note.mdwn @@ -1,11 +1,12 @@ +[[!templatebody < - +ENDBODY]] + Use this template to insert a note into a page. The note will be styled to float to the right of other text on the page. This template has one parameter:
  • `text` - the text to display in the note
- diff --git a/templates/popup.mdwn b/templates/popup.mdwn index 92455eb..b721a95 100644 --- a/templates/popup.mdwn +++ b/templates/popup.mdwn @@ -1,4 +1,3 @@ - Use this template to create a popup window that is displayed when the mouse is over part of the page. This template has two parameters:
    @@ -10,7 +9,9 @@ large for good usability.
Note that browsers that do not support the CSS will display the popup inline in the page, inside square brackets. - + +[[templatebody < [] +ENDBODY]] -- cgit v1.2.3 From 690b6b44b6210530beb35799d691af67cb4dcdac Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 6 Sep 2017 21:56:03 +0200 Subject: Sync with ikiwiki 3.20150610. --- style.css | 20 ++++++++++---------- templates.mdwn | 5 +++-- wikiicons/email.png | Bin 0 -> 550 bytes 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 wikiicons/email.png diff --git a/style.css b/style.css index fe1eb90..f0846c0 100644 --- a/style.css +++ b/style.css @@ -465,40 +465,40 @@ li.L8 { list-style: upper-alpha; } display: none; } -/* openid selector */ -#openid_choice { +/* login selector */ +#login_choice { display: none; } -#openid_input_area { +#login_input_area { clear: both; padding: 10px; } -#openid_btns, #openid_btns br { +#login_btns, #login_btns br { clear: both; } -#openid_highlight { +#login_highlight { background-color: black; float: left; } -.openid_large_btn { +.login_large_btn { padding: 1em 1.5em; border: 1px solid #DDD; margin: 3px; float: left; } -.openid_small_btn { +.login_small_btn { padding: 4px 4px; border: 1px solid #DDD; margin: 3px; float: left; } -a.openid_large_btn:focus { +a.login_large_btn:focus { outline: none; } -a.openid_large_btn:focus { +a.login_large_btn:focus { outline-style: none; } -.openid_selected { +.login_selected { border: 4px solid #DDD; } diff --git a/templates.mdwn b/templates.mdwn index 80372fc..c45316e 100644 --- a/templates.mdwn +++ b/templates.mdwn @@ -92,8 +92,9 @@ Here is a full list of the template files used: * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user - interface; do not normally need to be customised. + `passwordmail.tmpl`, `emailauth.tmpl, `login-selector.tmpl`, + `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need + to be customised. [[!meta robots="noindex, follow"]] diff --git a/wikiicons/email.png b/wikiicons/email.png new file mode 100644 index 0000000..859251f Binary files /dev/null and b/wikiicons/email.png differ -- cgit v1.2.3 From 23eaf62659795d6fa1d0b48ab3cf32ecd75f4d33 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 6 Sep 2017 21:58:04 +0200 Subject: Sync with ikiwiki 3.20160121. --- templates.mdwn | 2 +- wikiicons/email.png | Bin 550 -> 550 bytes wikiicons/revert.png | Bin 397 -> 397 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/templates.mdwn b/templates.mdwn index c45316e..378e579 100644 --- a/templates.mdwn +++ b/templates.mdwn @@ -92,7 +92,7 @@ Here is a full list of the template files used: * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl`, `emailauth.tmpl, `login-selector.tmpl`, + `passwordmail.tmpl`, `emailauth.tmpl`, `login-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user interface; do not normally need to be customised. diff --git a/wikiicons/email.png b/wikiicons/email.png index 859251f..bab85e5 100644 Binary files a/wikiicons/email.png and b/wikiicons/email.png differ diff --git a/wikiicons/revert.png b/wikiicons/revert.png index c39e65c..7de03b7 100644 Binary files a/wikiicons/revert.png and b/wikiicons/revert.png differ -- cgit v1.2.3 From d4f362fdfe17c885e417334b6677963193aa3542 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 6 Sep 2017 21:59:14 +0200 Subject: Sync with ikiwiki 3.20160506. --- ikiwiki/pagespec/attachment.mdwn | 2 +- wikiicons/email.png | Bin 550 -> 550 bytes wikiicons/revert.png | Bin 397 -> 397 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn index fa2bc58..868fb23 100644 --- a/ikiwiki/pagespec/attachment.mdwn +++ b/ikiwiki/pagespec/attachment.mdwn @@ -12,7 +12,7 @@ while allowing larger mp3 files to be uploaded by joey into a specific directory, and check all attachments for viruses, something like this could be used: - virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb))) + virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or ((mimetype(image/jpeg) or mimetype(image/png)) and maxsize(50kb))) The regular [[ikiwiki/PageSpec]] syntax is expanded with the following additional tests: diff --git a/wikiicons/email.png b/wikiicons/email.png index bab85e5..8bba3ae 100644 Binary files a/wikiicons/email.png and b/wikiicons/email.png differ diff --git a/wikiicons/revert.png b/wikiicons/revert.png index 7de03b7..caa5e4e 100644 Binary files a/wikiicons/revert.png and b/wikiicons/revert.png differ -- cgit v1.2.3 From 070309915a8e8096179969e8d0f8e51e8c713f07 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 6 Sep 2017 22:02:08 +0200 Subject: Sync with ikiwiki 3.20161219. --- shortcuts.mdwn | 2 +- style.css | 2 +- wikiicons/email.png | Bin 550 -> 550 bytes wikiicons/revert.png | Bin 397 -> 397 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shortcuts.mdwn b/shortcuts.mdwn index 1748a02..ea905d8 100644 --- a/shortcuts.mdwn +++ b/shortcuts.mdwn @@ -44,7 +44,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=iki url="http://ikiwiki.info/%S/"]] * [[!shortcut name=ljuser url="http://%s.livejournal.com/"]] * [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]] -* [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]] +* [[!shortcut name=c2 url="http://wiki.c2.com/?%s"]] * [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]] * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]] * [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]] diff --git a/style.css b/style.css index f0846c0..8c16e7a 100644 --- a/style.css +++ b/style.css @@ -10,7 +10,7 @@ footer,header,hgroup,menu,nav,section { display: block; } -.header { +div.header, header.header { margin: 0; font-size: 140%; font-weight: bold; diff --git a/wikiicons/email.png b/wikiicons/email.png index 8bba3ae..874f1f3 100644 Binary files a/wikiicons/email.png and b/wikiicons/email.png differ diff --git a/wikiicons/revert.png b/wikiicons/revert.png index caa5e4e..55a76a9 100644 Binary files a/wikiicons/revert.png and b/wikiicons/revert.png differ -- cgit v1.2.3 From a4d8b1a6fba4a0c21a9acecabc6ddd1b54aacb44 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Wed, 6 Sep 2017 22:04:08 +0200 Subject: Sync with ikiwiki 3.20170110. --- shortcuts.mdwn | 2 ++ wikiicons/email.png | Bin 550 -> 550 bytes wikiicons/revert.png | Bin 397 -> 397 bytes 3 files changed, 2 insertions(+) diff --git a/shortcuts.mdwn b/shortcuts.mdwn index ea905d8..7d1f491 100644 --- a/shortcuts.mdwn +++ b/shortcuts.mdwn @@ -28,6 +28,8 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]] * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`. See for details. * [[!shortcut name=debwiki url="https://wiki.debian.org/%S"]] +* [[!shortcut name=debcve url="https://security-tracker.debian.org/tracker/%S"]] + * also supports Debian bug numbers, packages and whatever the [security tracker](https://security-tracker.debian.org/tracker/) supports. * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]] * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]] * [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]] diff --git a/wikiicons/email.png b/wikiicons/email.png index 874f1f3..3cf8caf 100644 Binary files a/wikiicons/email.png and b/wikiicons/email.png differ diff --git a/wikiicons/revert.png b/wikiicons/revert.png index 55a76a9..403c4dd 100644 Binary files a/wikiicons/revert.png and b/wikiicons/revert.png differ -- cgit v1.2.3