diff --git a/CHANGELOG.md b/CHANGELOG.md index baf8d8d..873e6a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 FR : - Plugin "childpage" mis à jour, finition de sa cosmétique - Amélioration de l'intégration du plugin "translation". +- Homogénéisation des couleurs. Toutes les couleurs css sont des variables dans le fichier ini. + +Bug +- Correction d'un bug sur les onglets lorsque les polices chargées ne sont pas les bonnes ## [2.0.0] - 2020-04-09 diff --git a/css/_diff.css b/css/_diff.css index bc56a37..8ef2edd 100644 --- a/css/_diff.css +++ b/css/_diff.css @@ -12,9 +12,8 @@ vertical-align: top; padding: 0; border-width: 0; - /* no style.ini colours because deleted and added lines have a fixed background colour */ - background-color: #fff; - color: #333; + background-color: @ini_neutrallight; + color: @ini_neutraldark; } /* table header */ @@ -34,7 +33,7 @@ font-weight: bold; } .dokuwiki table.diff th.minor { - color: #999; + color: @ini_neutral2; } .dokuwiki table.diff_sidebyside th { width: 50%; @@ -56,15 +55,15 @@ font-weight: bold; } .dokuwiki table.diff .diff-addedline { - background-color: #cfc; + background-color: @ini_diff_add; color: inherit; } .dokuwiki table.diff .diff-deletedline { - background-color: #fdd; + background-color: @ini_diff_del; color: inherit; } .dokuwiki table.diff td.diff-context { - background-color: #eee; + background-color: @ini_neutral4; color: inherit; } .dokuwiki table.diff td.diff-addedline strong, diff --git a/css/_fileuploader.css b/css/_fileuploader.css index f300396..5934609 100644 --- a/css/_fileuploader.css +++ b/css/_fileuploader.css @@ -10,7 +10,7 @@ .qq-uploader .error { color: #f00; - background-color: #fff; + background-color: @ini_neutrallight; } /* select file button */ diff --git a/css/_media_fullscreen.css b/css/_media_fullscreen.css index 9a00d4d..63eefc0 100644 --- a/css/_media_fullscreen.css +++ b/css/_media_fullscreen.css @@ -170,7 +170,6 @@ } #mediamanager__page .namespaces ul .selected { - background-color: __highlight__; font-weight: bold; } @@ -496,7 +495,7 @@ } #mediamanager__diff dl dd strong{ - background-color: __highlight__; + background-color: @ini_highlight; color: @ini_text; font-weight: normal; } diff --git a/css/_media_popup.css b/css/_media_popup.css index 1c1f443..5bc1da2 100644 --- a/css/_media_popup.css +++ b/css/_media_popup.css @@ -21,7 +21,7 @@ html.popup { position: absolute; left: 0; border-right: 1px solid @ini_border; - background-color: @ini_background_alt2; + background-color: @ini_color7; } [dir=rtl] #mediamgr__sidebar { left: auto; @@ -39,7 +39,7 @@ html.popup { overflow: auto; position: absolute; right: 0; - background-color: @ini_background_alt2; + background-color: @ini_color7; } [dir=rtl] #mediamgr__content { right: auto; diff --git a/css/_recent.css b/css/_recent.css index f1be15f..9ddff26 100644 --- a/css/_recent.css +++ b/css/_recent.css @@ -51,15 +51,14 @@ font-size: 80%; border-radius: .2em; padding: .1em .2em; - /* cannot use non-guaranteed style.ini colour placeholders, dark templates need to overwrite */ - background-color: #ddd; + background-color: @ini_neutral4; } .dokuwiki form.changes li .sizechange.positive { - background-color: #cfc;; + background-color: @ini_diff_add;; } .dokuwiki form.changes li .sizechange.negative { - background-color: #fdd; + background-color: @ini_diff_del; } /*____________ page navigator ____________*/ diff --git a/css/_search.css b/css/_search.css index a8972ae..987d32d 100644 --- a/css/_search.css +++ b/css/_search.css @@ -52,7 +52,7 @@ /* search hit in normal text */ .dokuwiki .search_hit { color: @ini_text; - background-color: __highlight__; + background-color: @ini_highlight; } /* search hit in search results */ .dokuwiki .search_results strong.search_hit { diff --git a/css/article.less b/css/article.less index 3f9c09b..8b504de 100644 --- a/css/article.less +++ b/css/article.less @@ -16,7 +16,7 @@ /*____________ TOC ____________*/ #dw__toc { - border-color: @ini_border1; + border-color: @ini_neutral3; border-style: solid; border-width: thin; padding-bottom: .5em; @@ -67,9 +67,9 @@ .kharticle h1 { font-size: 2.2em; margin: 0 0 0.444em; - border-bottom: 1px solid rgb(170, 170, 170); + border-bottom: 1px solid @ini_neutral2; counter-reset: sectionh2 sectionh3 sectionh4; - + color: @ini_title_color; } .kharticle h2:before { content: counter(sectionh2) ". "; @@ -77,9 +77,10 @@ .kharticle h2 { font-size: 1.9em; margin: 0 0 0.666em; - border-bottom: 1px solid rgb(170, 170, 170); + border-bottom: 1px solid @ini_neutral2; counter-increment: sectionh2; counter-reset: sectionh3; + color: @ini_title_color; } .kharticle h3:before { content: counter(sectionh2) "." counter(sectionh3) ". " ; @@ -89,6 +90,7 @@ margin: 0 0 0.888em; counter-increment: sectionh3; counter-reset: sectionh4; + color: @ini_title_color; } .kharticle h4:before { @@ -99,6 +101,7 @@ margin: 0 0 1.0em; counter-increment: sectionh4; counter-reset: sectionh5; + color: @ini_title_color; } .kharticle h5:before { @@ -110,24 +113,26 @@ margin: 0 0 1.1428em; counter-increment: sectionh5; counter-reset: sectionh6; + color: @ini_title_color; } .kharticle h6 { font-size: .75em; margin: 0 0 1.333em; + color: @ini_title_color; } /*____________ Footer and DocInfo ____________*/ .article_footer { display:flex; justify-content: space-between; - margin:0 1em; + margin:0 1.5em; } .dokuwiki .docInfo { font-size: 0.875em; text-align: right; - padding: .1em .5em; + padding: .1em 0em; border-radius: 5px; /* contrast for accessibility */ - color: @ini_color7; + color: @ini_neutraldark; } diff --git a/css/basic.less b/css/basic.less index 1c496b3..2efcde1 100644 --- a/css/basic.less +++ b/css/basic.less @@ -34,7 +34,7 @@ html,body { body { background-size: contain, contain, auto; /* version standardisée */ background: url("images/curve2.png") repeat-y fixed left bottom, url("images/curve.png") repeat-y fixed right bottom; - background-color: @ini_background_alt2 ; + background-color: @ini_color7 ; color: @ini_text; /*font: normal 87.5%/1.4 Arial, sans-serif;*/ font-family: BlinkMacSystemFont,-apple-system,"Segoe UI","Roboto","Oxygen","Ubuntu","Cantarell","Fira Sans","Droid Sans","Helvetica Neue","Helvetica","Arial",sans-serif; @@ -150,40 +150,6 @@ ol ol ol ol { list-style-type: upper-alpha; } ol ol ol ol ol { list-style-type: lower-roman; } -/*____________ tables ____________*/ - -table { - border-collapse: collapse; - empty-cells: show; - border-spacing: 0; - border: 1px solid @ini_border; -} - -caption { - caption-side: top; - text-align: left; -} -[dir=rtl] caption { - text-align: right; -} - -th, -td { - padding: .3em .5em; - margin: 0; - vertical-align: top; - border: 1px solid @ini_background_neu; -} -th { - font-weight: bold; - background-color: @ini_background_alt; - text-align: left; -} -[dir=rtl] th { - text-align: right; -} - - /*____________ links ____________*/ a { @@ -208,7 +174,7 @@ a:visited:active { img { border-width: 0; vertical-align: middle; - color: #666; + color: @ini_neutral1; background-color: transparent; font-style: italic; height: auto; @@ -229,7 +195,7 @@ button img { } hr { - border: 1px solid @ini_border3; + border: 1px solid @ini_neutral2; text-align: center; clear: both; } @@ -342,8 +308,8 @@ meter, progress { font: inherit; font-weight: normal; - color: #333; - background-color: #fff; + color: @ini_neutraldark; + background-color: @ini_neutrallight; line-height: normal; margin: 0; vertical-align: middle; @@ -366,8 +332,8 @@ input, textarea, select, keygen { - border: 1px solid #ccc; - box-shadow: inset 0 0 1px #eee; + border: 1px solid @ini_neutral3; + box-shadow: inset 0 0 1px @ini_neutral4; border-radius: 2px; } input:active, @@ -378,7 +344,7 @@ select:active, select:focus, keygen:active, keygen:focus { - border-color: #999; + border-color: @ini_neutral2; } input[type=radio], input[type=checkbox], @@ -389,47 +355,7 @@ input[type=image] { } /* all types of buttons */ -input[type=submit], -input[type=button], -input[type=reset], -input.button, -a.button, -button, -.qq-upload-button { -/* color: #333; - background-color: #eee; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - border: 1px solid #ccc; - border-radius: 2px; - padding: .1em .5em; - cursor: pointer;*/ -} -input[type=submit]:hover, -input[type=submit]:active, -input[type=submit]:focus, -input[type=button]:hover, -input[type=button]:active, -input[type=button]:hover, -input[type=reset]:hover, -input[type=reset]:active, -input[type=reset]:hover, -input.button:hover, -input.button:active, -input.button:focus, -a.button:hover, -a.button:active, -a.button:focus, -button:hover, -button:active, -button:focus, -.qq-upload-button:hover { -/* border-color: #999; - background-color: #ddd; - background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+); - background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);*/ -} input::-moz-focus-inner, button::-moz-focus-inner { @@ -448,5 +374,5 @@ select[readonly], textarea[readonly] { cursor: auto; opacity: .5; - background-color: #eee; + background-color: @ini_neutral4; } diff --git a/css/biseau.less b/css/biseau.less index 17a0e97..6471b7d 100644 --- a/css/biseau.less +++ b/css/biseau.less @@ -56,8 +56,8 @@ span { padding:0.1em; margin-top: -1.7em; - border-bottom: 1px solid @ini_border3; - /* pour span actif : passer à -1.6em.*/ + /*border-bottom: 1px solid @ini_neutral2; + pour span actif : passer à -1.6em.*/ } } } diff --git a/css/misc.less b/css/misc.less index 59590ee..3e99a6f 100644 --- a/css/misc.less +++ b/css/misc.less @@ -45,13 +45,13 @@ /* existing wikipage */ .dokuwiki a.wikilink1 { - color: @ini_existing; + color: @ini_link; background-color: inherit; } /* not existing wikipage */ .dokuwiki a.wikilink2 { - color: @ini_missing; + color: @ini_link2; background-color: inherit; } @@ -79,7 +79,7 @@ .dokuwiki .page, .dokuwiki .sidebar { ul li { - color: @ini_color1; + color: @ini_link; } ol li { @@ -94,6 +94,37 @@ /*____________ tables ____________*/ +table { + border-collapse: collapse; + empty-cells: show; + border-spacing: 0; + border: 1px solid @ini_border; +} + +caption { + caption-side: top; + text-align: left; +} +[dir=rtl] caption { + text-align: right; +} + +th, +td { + padding: .3em .5em; + margin: 0; + vertical-align: top; + border: 1px solid @ini_border; +} +th { + font-weight: bold; + background-color: @ini_color7; + text-align: left; +} +[dir=rtl] th { + text-align: right; +} + /* div around each table */ .dokuwiki div.table { overflow-x: auto; @@ -109,7 +140,7 @@ } .dokuwiki table.inline tr:hover td { - background-color: @ini_background_alt; + background-color: @ini_neutral4; } .dokuwiki table.inline tr:hover th { diff --git a/css/mobile.less b/css/mobile.less index 25bd582..afb6554 100644 --- a/css/mobile.less +++ b/css/mobile.less @@ -74,6 +74,7 @@ width: 100%; margin:0; max-width: calc (@ini_article_width + 10); + min-width: inherit; > .pad { margin-left: 0; @@ -228,6 +229,12 @@ padding: .5em; } +/* to top */ +.to_top { + display:block; + right:1em; +} + /* plugin */ .dokuwiki div.plugin_translation { display: block !important; diff --git a/css/plugin.less b/css/plugin.less index 53d09f7..4c1e612 100644 --- a/css/plugin.less +++ b/css/plugin.less @@ -25,13 +25,18 @@ .dokuwiki div.plugin_translation ul li a.wikilink2:link, .dokuwiki div.plugin_translation ul li a.wikilink2:hover, .dokuwiki div.plugin_translation ul li a.wikilink2:active, .dokuwiki div.plugin_translation ul li a.wikilink2:visited { text-decoration: none; border-bottom: 1px dashed !important; - color: @ini_missing; + color: @ini_link2; background-color: inherit; } -/*____________ Config ____________*/ -/* because config is a plugin and use placeholder */ -/*même gris que @ini_border -#config__manager fieldset { - background-color:#eee; */ +.dokuwiki div.plugin_translation select.wikilink1, .dokuwiki div.plugin_translation option.wikilink1 { + color: @ini_link; +} +.dokuwiki div.plugin_translation select, .dokuwiki div.plugin_translation input { + background-color: @ini_neutral4; +} +/*____________ Config manager ____________*/ +#config__manager fieldset { + background-color: @ini_background; +} diff --git a/css/print.css b/css/print.css index 568464d..a46f749 100644 --- a/css/print.css +++ b/css/print.css @@ -6,8 +6,8 @@ body { font: normal 87.5%/1.3 Garamond, Baskerville, "Hoefler Text", "Nimbus Roman No9 L", serif; - background-color: #fff; - color: #000; + background-color: white; + color: black; } /* hide certain sections */ @@ -58,7 +58,7 @@ a:link, a:visited { text-decoration: none; border-bottom: 1pt dotted; - color: #333; + color: @ini_neutraldark; background-color: inherit; } @@ -104,7 +104,7 @@ img.mediacenter { blockquote { padding: 0 10pt; margin: 0; - border: solid #ccc; + border: solid @ini_neutral3; border-width: 0 0 0 2pt; } [dir=rtl] blockquote { @@ -119,14 +119,14 @@ table { border-collapse: collapse; empty-cells: show; border-spacing: 0; - border: 1pt solid #ccc; + border: 1pt solid @ini_neutral3; } th, td { padding: 3pt 5pt; margin: 0; vertical-align: top; - border: 1pt solid #666; + border: 1pt solid @ini_neutral1; } th { font-weight: bold; @@ -140,7 +140,7 @@ th { /*____________ a bit of layout ____________*/ #dokuwiki__header { - border-bottom: 2pt solid #ccc; + border-bottom: 2pt solid @ini_neutral3; } #dokuwiki__header h1 { font-size: 1.5em; @@ -161,7 +161,7 @@ th { .dokuwiki div.footnotes { clear: both; - border-top: 1pt dotted #999; + border-top: 1pt dotted @ini_neutral2; margin-top: 10pt; } @@ -170,7 +170,7 @@ th { text-align: right; clear: both; padding-top: 2pt; - border-top: 1pt solid #999; + border-top: 1pt solid @ini_neutral2; margin-top: 10pt; } [dir=rtl] .dokuwiki div.docInfo { diff --git a/css/structure.less b/css/structure.less index 30928b1..e64bcd9 100644 --- a/css/structure.less +++ b/css/structure.less @@ -54,7 +54,6 @@ #dokuwiki__site { margin: 0 auto; - /*max-width: @ini_site_width;*/ } #dokuwiki__site > .site { @@ -77,7 +76,6 @@ /* If sidebar or not sidebar, content make same width */ .showSidebar #dokuwiki__content { - /*max-width: calc(@ini_site_width - @ini_sidebar_width);*/ max-width: @ini_article_width; min-width:30em; } diff --git a/css/tools.less b/css/tools.less index 360a760..5b16b50 100644 --- a/css/tools.less +++ b/css/tools.less @@ -11,14 +11,6 @@ So, navbar too, and breadcrumbs. flex-direction: column; margin-top: 3.5em; font-size: .875em; - -/* position:fixed; - bottom:0; - - */ - /*margin-left: 1em;*/ - - /*right: calc(@ini_sidebar_width * 2 + @ini_site_width);*/ } .bartool { @@ -37,7 +29,7 @@ So, navbar too, and breadcrumbs. .dokuwiki__tools ul, { margin: 0 auto; padding: 0; - color: @ini_color1; + color: @ini_link; } @@ -100,15 +92,11 @@ form.search { /* Menu tools to edit, history, etc */ .to_top { - /*position:fixed; - bottom:0; - background-color: bisque;*/ - position: fixed; z-index: 101; - right: 10px; - bottom: 10px; + /*right: 10px;*/ + bottom: 1em; background-color: @ini_background; padding: 0.3em; -} \ No newline at end of file +} diff --git a/main.php b/main.php index 0f68640..434bb68 100644 --- a/main.php +++ b/main.php @@ -161,6 +161,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');