diff --git a/src/moin/static/css/common.css b/src/moin/static/css/common.css index 90f62cbd3..aee4503c2 100644 --- a/src/moin/static/css/common.css +++ b/src/moin/static/css/common.css @@ -19,31 +19,31 @@ /* smileys -- :-) */ .moin-text-icon { font-size: 0; color: transparent; } -.moin-alert:before { content: url('../img/smileys/alert.png'); } -.moin-angry:before { content: url('../img/smileys/angry.png'); } -.moin-attention:before { content: url('../img/smileys/attention.png'); } -.moin-biggrin:before { content: url('../img/smileys/biggrin.png'); } -.moin-checkmark:before { content: url('../img/smileys/checkmark.png'); } -.moin-devil:before { content: url('../img/smileys/devil.png'); } -.moin-frown:before { content: url('../img/smileys/frown.png'); } -.moin-icon-error:before { content: url('../img/smileys/icon-error.png'); } -.moin-icon-info:before { content: url('../img/smileys/icon-info.png'); } -.moin-idea:before { content: url('../img/smileys/idea.png'); } -.moin-ohwell:before { content: url('../img/smileys/ohwell.png'); } -.moin-prio1:before { content: url('../img/smileys/prio1.png'); } -.moin-prio2:before { content: url('../img/smileys/prio2.png'); } -.moin-prio3:before { content: url('../img/smileys/prio3.png'); } -.moin-redface:before { content: url('../img/smileys/redface.png'); } -.moin-sad:before { content: url('../img/smileys/sad.png'); } -.moin-smile:before { content: url('../img/smileys/smile.png'); } -.moin-smile2:before { content: url('../img/smileys/smile2.png'); } -.moin-smile3:before { content: url('../img/smileys/smile3.png'); } -.moin-smile4:before { content: url('../img/smileys/smile4.png'); } -.moin-star_off:before { content: url('../img/smileys/star_off.png'); } -.moin-star_on:before { content: url('../img/smileys/star_on.png'); } -.moin-thumbs-up:before { content: url('../img/smileys/thumbs-up.png'); } -.moin-tired:before { content: url('../img/smileys/tired.png'); } -.moin-tongue:before { content: url('../img/smileys/tongue.png'); } +.moin-alert:before { content: url('../img/icons/alert.png'); } +.moin-angry:before { content: url('../img/icons/angry.png'); } +.moin-attention:before { content: url('../img/icons/attention.png'); } +.moin-biggrin:before { content: url('../img/icons/biggrin.png'); } +.moin-checkmark:before { content: url('../img/icons/checkmark.png'); } +.moin-devil:before { content: url('../img/icons/devil.png'); } +.moin-frown:before { content: url('../img/icons/frown.png'); } +.moin-icon-error:before { content: url('../img/icons/icon-error.png'); } +.moin-icon-info:before { content: url('../img/icons/icon-info.png'); } +.moin-idea:before { content: url('../img/icons/idea.png'); } +.moin-ohwell:before { content: url('../img/icons/ohwell.png'); } +.moin-prio1:before { content: url('../img/icons/prio1.png'); } +.moin-prio2:before { content: url('../img/icons/prio2.png'); } +.moin-prio3:before { content: url('../img/icons/prio3.png'); } +.moin-redface:before { content: url('../img/icons/redface.png'); } +.moin-sad:before { content: url('../img/icons/sad.png'); } +.moin-smile:before { content: url('../img/icons/smile.png'); } +.moin-smile2:before { content: url('../img/icons/smile2.png'); } +.moin-smile3:before { content: url('../img/icons/smile3.png'); } +.moin-smile4:before { content: url('../img/icons/smile4.png'); } +.moin-star_off:before { content: url('../img/icons/star_off.png'); } +.moin-star_on:before { content: url('../img/icons/star_on.png'); } +.moin-thumbs-up:before { content: url('../img/icons/thumbs-up.png'); } +.moin-tired:before { content: url('../img/icons/tired.png'); } +.moin-tongue:before { content: url('../img/icons/tongue.png'); } /* end of smileys */ /* admonitions - no moin- prefix added here, these classes are used within wiki markup: @@ -53,15 +53,15 @@ TODO: create icons for attention, danger, error, and hint. */ -div.attention:before { content: url("../img/admonitions/important.png"); float: left; padding-right: 1em; } -div.caution:before { content: url("../img/admonitions/caution.png"); float: left; padding-right: 1em; } -div.danger:before { content: url("../img/admonitions/warning.png"); float: left; padding-right: 1em; } -div.error:before { content: url("../img/admonitions/warning.png"); float: left; padding-right: 1em; } -div.hint:before { content: url("../img/admonitions/tip.png"); float: left; padding-right: 1em; } -div.important:before { content: url("../img/admonitions/important.png"); float: left; padding-right: 1em; } -div.note:before { content: url("../img/admonitions/note.png"); float: left; padding-right: 1em; } -div.tip:before { content: url("../img/admonitions/tip.png"); float: left; padding-right: 1em; } -div.warning:before { content: url("../img/admonitions/warning.png"); float: left; padding-right: 1em; } +div.attention:before { content: url("../img/icons/admon-important.png"); float: left; padding-right: 1em; } +div.caution:before { content: url("../img/icons/admon-caution.png"); float: left; padding-right: 1em; } +div.danger:before { content: url("../img/icons/admon-warning.png"); float: left; padding-right: 1em; } +div.error:before { content: url("../img/icons/admon-warning.png"); float: left; padding-right: 1em; } +div.hint:before { content: url("../img/icons/admon-tip.png"); float: left; padding-right: 1em; } +div.important:before { content: url("../img/icons/admon-important.png"); float: left; padding-right: 1em; } +div.note:before { content: url("../img/icons/admon-note.png"); float: left; padding-right: 1em; } +div.tip:before { content: url("../img/icons/admon-tip.png"); float: left; padding-right: 1em; } +div.warning:before { content: url("../img/icons/admon-warning.png"); float: left; padding-right: 1em; } div.attention, div.caution, div.danger, @@ -109,27 +109,27 @@ div.warning > p { margin-top: 8px; padding-left: 4em; } /* mime type icons */ .moin-www:before, .moin-http:before, -.moin-https:before { content: url("../img/mime-type/moin-www.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-https:before { content: url("../img/icons/moin-www.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } .moin-file:before, -.moin-ftp:before { content: url("../img/mime-type/moin-ftp.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-ftp:before { content: url("../img/icons/moin-ftp.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } .moin-nntp:before, -.moin-news:before { content: url("../img/mime-type/moin-news.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-news:before { content: url("../img/icons/moin-news.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } .moin-telnet:before, .moin-ssh:before, .moin-irc:before, -.moin-ircs:before { content: url("../img/mime-type/moin-telnet.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mailto:before { content: url("../img/mime-type/moin-email.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-attachment:before { content: url("../img/mime-type/moin-attach.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-interwiki:before { content: url("../img/mime-type/moin-inter.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-action:before { content: url("../img/mime-type/moin-action.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-text:before { content: url("../img/mime-type/moin-text.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-image:before { content: url("../img/mime-type/moin-image.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-audio:before { content: url("../img/mime-type/moin-audio.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-video:before { content: url("../img/mime-type/moin-video.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-application:before { content: url("../img/mime-type/moin-application.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-pdf:before { content: url("../img/mime-type/moin-pdf.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-package:before { content: url("../img/mime-type/moin-package.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } -.moin-mime-drawing:before { content: url("../img/mime-type/moin-drawing.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-ircs:before { content: url("../img/icons/moin-telnet.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mailto:before { content: url("../img/icons/moin-email.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-attachment:before { content: url("../img/icons/moin-attach.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-interwiki:before { content: url("../img/icons/moin-inter.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-action:before { content: url("../img/icons/moin-action.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-text:before { content: url("../img/icons/moin-text.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-image:before { content: url("../img/icons/moin-image.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-audio:before { content: url("../img/icons/moin-audio.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-video:before { content: url("../img/icons/moin-video.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-application:before { content: url("../img/icons/moin-application.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-pdf:before { content: url("../img/icons/moin-pdf.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-package:before { content: url("../img/icons/moin-package.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } +.moin-mime-drawing:before { content: url("../img/icons/moin-drawing.png"); margin: 0 .2em; vertical-align: middle; cursor: pointer; } /* end of mime type icons */ /* start of userstyles - css clases that are defined for use in wiki markup: {{{#!wiki solid */ @@ -180,7 +180,7 @@ a.moin-nonexistent object { background: var(--bg-disabled); border: 3px dashed /* end of links */ /* misc highlighting */ -.moin-error:before { content: url("../img/admonitions/warning.png"); float: left; height: 100%; padding: 0 1em; } +.moin-error:before { content: url("../img/icons/admon-warning.png"); float: left; height: 100%; padding: 0 1em; } .moin-error { color: var(--error); background-color: var(--bg-error); border: 1px solid var(--border); margin: 10px 30px 10px 30px; min-height: 64px; padding: 8px 8px 8px 8px; clear: both; display: inline-block; } @@ -657,10 +657,10 @@ figcaption { font-weight: bold; } padding: 1em; margin-top: .5em; border-radius: 5px; position: relative; } /* \f2d3 below is fontawesome fa-window-close */ .moin-flash:after { content: "\f2d3"; font-family: FontAwesome; color: var(--alert); position: absolute; top: -1px; right: 0; } -.moin-flash-hint:before { content: url("../img/smileys/idea.png"); padding-right: 1em; } -.moin-flash-info:before { content: url("../img/smileys/icon-info.png"); padding-right: 1em; } -.moin-flash-warning:before { content: url("../img/smileys/alert.png"); padding-right: 1em; } -.moin-flash-error:before { content: url("../img/smileys/icon-error.png"); padding-right: 1em; } +.moin-flash-hint:before { content: url("../img/icons/idea.png"); padding-right: 1em; } +.moin-flash-info:before { content: url("../img/icons/icon-info.png"); padding-right: 1em; } +.moin-flash-warning:before { content: url("../img/icons/alert.png"); padding-right: 1em; } +.moin-flash-error:before { content: url("../img/icons/icon-error.png"); padding-right: 1em; } /* +modify template */ #moin-modify dd { width: 100%; float: none; } @@ -671,7 +671,7 @@ figcaption { font-weight: bold; } .moin-fixed-width { font-family: Inconsolata, Consolas, "DejaVu Sans Mono", "Courier New", courier; } .moin-edit-no-help { float: right; border: 1px solid var(--border-button); border-radius: 6px; cursor: pointer; font-size: 0.75em; font-weight: bold; padding: 4px 15px; margin: .3em; } -.moin-edit-no-help:before { content: url("../img/smileys/icon-info.png"); padding-right: 1em; } +.moin-edit-no-help:before { content: url("../img/icons/icon-info.png"); padding-right: 1em; } .moin-autosize { min-height: 10em; } .moin-edit-help { float: right; } .moin-edit-help a { color: var(--primary); } diff --git a/src/moin/static/img/admonitions/caution.png b/src/moin/static/img/admonitions/caution.png deleted file mode 100644 index 750ae97c6..000000000 Binary files a/src/moin/static/img/admonitions/caution.png and /dev/null differ diff --git a/src/moin/static/img/admonitions/important.png b/src/moin/static/img/admonitions/important.png deleted file mode 100644 index c5726d5a0..000000000 Binary files a/src/moin/static/img/admonitions/important.png and /dev/null differ diff --git a/src/moin/static/img/admonitions/note.png b/src/moin/static/img/admonitions/note.png deleted file mode 100644 index d01b8c636..000000000 Binary files a/src/moin/static/img/admonitions/note.png and /dev/null differ diff --git a/src/moin/static/img/admonitions/tip.png b/src/moin/static/img/admonitions/tip.png deleted file mode 100644 index 2ac57475c..000000000 Binary files a/src/moin/static/img/admonitions/tip.png and /dev/null differ diff --git a/src/moin/static/img/admonitions/warning.png b/src/moin/static/img/admonitions/warning.png deleted file mode 100644 index f5c7a6f9b..000000000 Binary files a/src/moin/static/img/admonitions/warning.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-application.png b/src/moin/static/img/icons/moin-application.png similarity index 100% rename from src/moin/static/img/mime-type/moin-application.png rename to src/moin/static/img/icons/moin-application.png diff --git a/src/moin/static/img/mime-type/moin-audio.png b/src/moin/static/img/icons/moin-audio.png similarity index 100% rename from src/moin/static/img/mime-type/moin-audio.png rename to src/moin/static/img/icons/moin-audio.png diff --git a/src/moin/static/img/mime-type/moin-drawing.png b/src/moin/static/img/icons/moin-drawing.png similarity index 100% rename from src/moin/static/img/mime-type/moin-drawing.png rename to src/moin/static/img/icons/moin-drawing.png diff --git a/src/moin/static/img/mime-type/moin-image.png b/src/moin/static/img/icons/moin-image.png similarity index 100% rename from src/moin/static/img/mime-type/moin-image.png rename to src/moin/static/img/icons/moin-image.png diff --git a/src/moin/static/img/mime-type/moin-package.png b/src/moin/static/img/icons/moin-package.png similarity index 100% rename from src/moin/static/img/mime-type/moin-package.png rename to src/moin/static/img/icons/moin-package.png diff --git a/src/moin/static/img/mime-type/moin-text.png b/src/moin/static/img/icons/moin-text.png similarity index 100% rename from src/moin/static/img/mime-type/moin-text.png rename to src/moin/static/img/icons/moin-text.png diff --git a/src/moin/static/img/mime-type/moin-video.png b/src/moin/static/img/icons/moin-video.png similarity index 100% rename from src/moin/static/img/mime-type/moin-video.png rename to src/moin/static/img/icons/moin-video.png diff --git a/src/moin/static/img/mime-type/moin-action.png b/src/moin/static/img/mime-type/moin-action.png deleted file mode 100644 index 46ad8a0d4..000000000 Binary files a/src/moin/static/img/mime-type/moin-action.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-attach.png b/src/moin/static/img/mime-type/moin-attach.png deleted file mode 100644 index e9199b082..000000000 Binary files a/src/moin/static/img/mime-type/moin-attach.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-email.png b/src/moin/static/img/mime-type/moin-email.png deleted file mode 100644 index 9be90c67a..000000000 Binary files a/src/moin/static/img/mime-type/moin-email.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-ftp.png b/src/moin/static/img/mime-type/moin-ftp.png deleted file mode 100644 index 18b7d2419..000000000 Binary files a/src/moin/static/img/mime-type/moin-ftp.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-inter.png b/src/moin/static/img/mime-type/moin-inter.png deleted file mode 100644 index 010a249d1..000000000 Binary files a/src/moin/static/img/mime-type/moin-inter.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-news.png b/src/moin/static/img/mime-type/moin-news.png deleted file mode 100644 index a9850ee2c..000000000 Binary files a/src/moin/static/img/mime-type/moin-news.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-pdf.png b/src/moin/static/img/mime-type/moin-pdf.png deleted file mode 100644 index 251fb8bb8..000000000 Binary files a/src/moin/static/img/mime-type/moin-pdf.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-telnet.png b/src/moin/static/img/mime-type/moin-telnet.png deleted file mode 100644 index 619db112a..000000000 Binary files a/src/moin/static/img/mime-type/moin-telnet.png and /dev/null differ diff --git a/src/moin/static/img/mime-type/moin-www.png b/src/moin/static/img/mime-type/moin-www.png deleted file mode 100644 index ac5957ad6..000000000 Binary files a/src/moin/static/img/mime-type/moin-www.png and /dev/null differ diff --git a/src/moin/static/img/smileys/alert.png b/src/moin/static/img/smileys/alert.png deleted file mode 100644 index 06148e8a9..000000000 Binary files a/src/moin/static/img/smileys/alert.png and /dev/null differ diff --git a/src/moin/static/img/smileys/angry.png b/src/moin/static/img/smileys/angry.png deleted file mode 100644 index 118959821..000000000 Binary files a/src/moin/static/img/smileys/angry.png and /dev/null differ diff --git a/src/moin/static/img/smileys/attention.png b/src/moin/static/img/smileys/attention.png deleted file mode 100644 index b9704e677..000000000 Binary files a/src/moin/static/img/smileys/attention.png and /dev/null differ diff --git a/src/moin/static/img/smileys/biggrin.png b/src/moin/static/img/smileys/biggrin.png deleted file mode 100644 index 8519e02b6..000000000 Binary files a/src/moin/static/img/smileys/biggrin.png and /dev/null differ diff --git a/src/moin/static/img/smileys/checkmark.png b/src/moin/static/img/smileys/checkmark.png deleted file mode 100644 index 2fd38192c..000000000 Binary files a/src/moin/static/img/smileys/checkmark.png and /dev/null differ diff --git a/src/moin/static/img/smileys/devil.png b/src/moin/static/img/smileys/devil.png deleted file mode 100644 index 1fa14faa1..000000000 Binary files a/src/moin/static/img/smileys/devil.png and /dev/null differ diff --git a/src/moin/static/img/smileys/frown.png b/src/moin/static/img/smileys/frown.png deleted file mode 100644 index 0f05f250d..000000000 Binary files a/src/moin/static/img/smileys/frown.png and /dev/null differ diff --git a/src/moin/static/img/smileys/icon-error.png b/src/moin/static/img/smileys/icon-error.png deleted file mode 100644 index ab6808fba..000000000 Binary files a/src/moin/static/img/smileys/icon-error.png and /dev/null differ diff --git a/src/moin/static/img/smileys/icon-info.png b/src/moin/static/img/smileys/icon-info.png deleted file mode 100644 index e8fbc6618..000000000 Binary files a/src/moin/static/img/smileys/icon-info.png and /dev/null differ diff --git a/src/moin/static/img/smileys/idea.png b/src/moin/static/img/smileys/idea.png deleted file mode 100644 index 8eeebdd52..000000000 Binary files a/src/moin/static/img/smileys/idea.png and /dev/null differ diff --git a/src/moin/static/img/smileys/ohwell.png b/src/moin/static/img/smileys/ohwell.png deleted file mode 100644 index e35daf1d5..000000000 Binary files a/src/moin/static/img/smileys/ohwell.png and /dev/null differ diff --git a/src/moin/static/img/smileys/prio1.png b/src/moin/static/img/smileys/prio1.png deleted file mode 100644 index 296fcaa86..000000000 Binary files a/src/moin/static/img/smileys/prio1.png and /dev/null differ diff --git a/src/moin/static/img/smileys/prio2.png b/src/moin/static/img/smileys/prio2.png deleted file mode 100644 index 850965c14..000000000 Binary files a/src/moin/static/img/smileys/prio2.png and /dev/null differ diff --git a/src/moin/static/img/smileys/prio3.png b/src/moin/static/img/smileys/prio3.png deleted file mode 100644 index 0649d2a31..000000000 Binary files a/src/moin/static/img/smileys/prio3.png and /dev/null differ diff --git a/src/moin/static/img/smileys/redface.png b/src/moin/static/img/smileys/redface.png deleted file mode 100644 index 2ea4da9d3..000000000 Binary files a/src/moin/static/img/smileys/redface.png and /dev/null differ diff --git a/src/moin/static/img/smileys/sad.png b/src/moin/static/img/smileys/sad.png deleted file mode 100644 index a86e6f9ba..000000000 Binary files a/src/moin/static/img/smileys/sad.png and /dev/null differ diff --git a/src/moin/static/img/smileys/smile.png b/src/moin/static/img/smileys/smile.png deleted file mode 100644 index 361d70545..000000000 Binary files a/src/moin/static/img/smileys/smile.png and /dev/null differ diff --git a/src/moin/static/img/smileys/smile2.png b/src/moin/static/img/smileys/smile2.png deleted file mode 100644 index cc4bea974..000000000 Binary files a/src/moin/static/img/smileys/smile2.png and /dev/null differ diff --git a/src/moin/static/img/smileys/smile3.png b/src/moin/static/img/smileys/smile3.png deleted file mode 100644 index 4cf923e38..000000000 Binary files a/src/moin/static/img/smileys/smile3.png and /dev/null differ diff --git a/src/moin/static/img/smileys/smile4.png b/src/moin/static/img/smileys/smile4.png deleted file mode 100644 index 96f3af6c7..000000000 Binary files a/src/moin/static/img/smileys/smile4.png and /dev/null differ diff --git a/src/moin/static/img/smileys/star_off.png b/src/moin/static/img/smileys/star_off.png deleted file mode 100644 index 2f99caea5..000000000 Binary files a/src/moin/static/img/smileys/star_off.png and /dev/null differ diff --git a/src/moin/static/img/smileys/star_on.png b/src/moin/static/img/smileys/star_on.png deleted file mode 100644 index 6a64f936c..000000000 Binary files a/src/moin/static/img/smileys/star_on.png and /dev/null differ diff --git a/src/moin/static/img/smileys/thumbs-up.png b/src/moin/static/img/smileys/thumbs-up.png deleted file mode 100644 index ca277c678..000000000 Binary files a/src/moin/static/img/smileys/thumbs-up.png and /dev/null differ diff --git a/src/moin/static/img/smileys/tired.png b/src/moin/static/img/smileys/tired.png deleted file mode 100644 index 077c98df0..000000000 Binary files a/src/moin/static/img/smileys/tired.png and /dev/null differ diff --git a/src/moin/static/img/smileys/tongue.png b/src/moin/static/img/smileys/tongue.png deleted file mode 100644 index 7215ac74d..000000000 Binary files a/src/moin/static/img/smileys/tongue.png and /dev/null differ