From 09dd0a60f884baad73f4a886073f20c16e494520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Tue, 12 Mar 2019 16:03:30 +0100 Subject: [PATCH 001/142] remove author from comment block of less files --- css/area_content.less | 1 - css/area_footer.less | 1 - css/area_forms.less | 1 - css/area_header.less | 3 +-- css/area_main-content-secedit.less | 1 + css/area_main-content.less | 1 - css/area_main-sidebar-nav.less | 2 -- css/area_main-sidebar-search.less | 1 - css/area_msg.less | 1 - css/area_nav-breadcrumb.less | 1 - css/area_nav-direct.less | 1 - css/area_nav-metabox.less | 2 -- css/area_nav-page-attributes.less | 1 + css/area_nav-pagetools.less | 1 - css/area_nav-usertools.less | 1 - css/area_recent.less | 1 - css/area_search.less | 1 - css/area_tabs.less | 1 + css/area_togglelink.less | 1 - css/base.less | 1 - css/base_design.less | 1 - css/base_fontello-icons.less | 1 - css/base_mixins.less | 1 - css/base_structure.less | 1 - css/plugins/include.less | 2 -- css/plugins/magic-matcher.less | 3 --- css/print.less | 2 -- css/template_admin.less | 1 - css/template_detail.less | 1 - 29 files changed, 4 insertions(+), 33 deletions(-) diff --git a/css/area_content.less b/css/area_content.less index 6aa15ba..4b0ba92 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the page content. * - * @author Jana Deutschlaender */ .content .row { diff --git a/css/area_footer.less b/css/area_footer.less index 57114e3..0751871 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the page footer * - * @author Jana Deutschlaender */ diff --git a/css/area_forms.less b/css/area_forms.less index 996bd68..f954225 100644 --- a/css/area_forms.less +++ b/css/area_forms.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for forms. * - * @author Jana Deutschlaender */ diff --git a/css/area_header.less b/css/area_header.less index 97029be..63afdb5 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the page header. * - * @author Jana Deutschlaender */ @@ -268,7 +267,7 @@ font-size: 1rem; } } - + @media @screen_max-xxs { min-height: 70px; // needed for menu select toolbar diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 6101952..0fdc693 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -1,5 +1,6 @@ /** * This styles the "section editing button" (if not added by data-plugin) + * */ diff --git a/css/area_main-content.less b/css/area_main-content.less index c851248..d413174 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the main-content. * - * @author Jana Deutschlaender */ diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index d25b720..4b78df8 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -1,8 +1,6 @@ /** * This file provides the design styles the navigational elements in the sidebar * - * @author Jana Deutschlaender - * @author Andreas Gohr */ diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index a217291..760744c 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the quick search. * - * @author Jana Deutschlaender */ diff --git a/css/area_msg.less b/css/area_msg.less index 6edc5c7..fe3673a 100644 --- a/css/area_msg.less +++ b/css/area_msg.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for message block * - * @author Jana Deutschlaender */ diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 1c3818c..e0246ca 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the breadcrumb * - * @author Jana Deutschlaender */ diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less index 5defc3b..497b3bb 100755 --- a/css/area_nav-direct.less +++ b/css/area_nav-direct.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the direct / menu jump links. * - * @author Jana Deutschlaender */ diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 684fce5..97864b4 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -1,8 +1,6 @@ /** * This file provides the design styles for the metatabbox * - * @author Jana Deutschlaender - * @author Silke Pisulla */ diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index 9074226..1be952a 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -1,5 +1,6 @@ /** * Page Attribute Icons in the breadcrumb bar + * */ diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 49c2dff..93cff98 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the page specific tool bar. * - * @author Jana Deutschlaender */ /* diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index c3e382b..986c6eb 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the direct / menu jump links. * - * @author Jana Deutschlaender */ diff --git a/css/area_recent.less b/css/area_recent.less index 0722639..5507cb0 100644 --- a/css/area_recent.less +++ b/css/area_recent.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for page revisions * - * @author Jana Deutschlaender */ diff --git a/css/area_search.less b/css/area_search.less index 9fddb00..b0acd17 100644 --- a/css/area_search.less +++ b/css/area_search.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the search results * - * @author Jana Deutschlaender */ diff --git a/css/area_tabs.less b/css/area_tabs.less index 6574645..c5d3d88 100644 --- a/css/area_tabs.less +++ b/css/area_tabs.less @@ -1,5 +1,6 @@ /** * This file provides styles for tab boxes + * */ diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 5b09625..9f7b8c3 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the sidebar (navmain). * - * @author Jana Deutschlaender */ diff --git a/css/base.less b/css/base.less index ba4e2f0..a9a43d4 100755 --- a/css/base.less +++ b/css/base.less @@ -1,7 +1,6 @@ /** * This file provides the basic vars and reset styles. * - * @author Jana Deutschlaender */ diff --git a/css/base_design.less b/css/base_design.less index 97c8f84..7a54034 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -2,7 +2,6 @@ * This file provides the main design styles * across all template elements (typo, colors etc.) * - * @author Jana Deutschlaender */ diff --git a/css/base_fontello-icons.less b/css/base_fontello-icons.less index bb31646..13c9d80 100644 --- a/css/base_fontello-icons.less +++ b/css/base_fontello-icons.less @@ -1,7 +1,6 @@ /** * This file provides styles for web fonts and icon fonts * - * @author Jana Deutschlaender */ diff --git a/css/base_mixins.less b/css/base_mixins.less index 1e9af0a..023a907 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -1,7 +1,6 @@ /** * This file provides less mixins for all other style modules * - * @author Jana Deutschlaender */ diff --git a/css/base_structure.less b/css/base_structure.less index 1ef944e..988e530 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -1,7 +1,6 @@ /** * This file provides styles for the general layout structure. * - * @author Jana Deutschlaender */ diff --git a/css/plugins/include.less b/css/plugins/include.less index f793a80..d9381ab 100644 --- a/css/plugins/include.less +++ b/css/plugins/include.less @@ -1,8 +1,6 @@ /** * This file provides the main design styles * across all template elements (typo, colors etc.) - * - * @author Jana Deutschlaender */ #dokuwiki__content .plugin_include_content { diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 0652529..8d6adc0 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -1,8 +1,5 @@ /** * This file provides styles for magic matcher plugin - * - * @author Jana Deutschlaender - * @author Silke Pisulla */ diff --git a/css/print.less b/css/print.less index 2b02270..3a50e19 100755 --- a/css/print.less +++ b/css/print.less @@ -1,8 +1,6 @@ /** * This file provides the styles for printing. * - * @author Jana Deutschlaender , - Silke Pisulla */ diff --git a/css/template_admin.less b/css/template_admin.less index 6f4659d..d678a8a 100644 --- a/css/template_admin.less +++ b/css/template_admin.less @@ -1,7 +1,6 @@ /** * This file provides the design styles for the admin tools * - * @author Jana Deutschlaender */ diff --git a/css/template_detail.less b/css/template_detail.less index 97ef1ce..d368713 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -2,7 +2,6 @@ * This file provides the design styles for the the detail template * (media details) * - * @author Jana Deutschlaender */ From f9439eee4d1a9826259fbf844e413cd55be70aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 13 Mar 2019 14:23:30 +0100 Subject: [PATCH 002/142] #4: fix footnotes styling --- css/area_footnotes.less | 65 +++++++++++++++++++++++++++++++++++++++++ style.ini | 1 + 2 files changed, 66 insertions(+) create mode 100644 css/area_footnotes.less diff --git a/css/area_footnotes.less b/css/area_footnotes.less new file mode 100644 index 0000000..7639f0c --- /dev/null +++ b/css/area_footnotes.less @@ -0,0 +1,65 @@ +/** + * This file provides the design styles for the footnotes. + * + */ + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* footnotes section */ +.dokuwiki div.footnotes { + div.fn { + margin-bottom: .2rem; + display: table;// + vertical-align: top;// + + sup, // + .content { + display: table-cell; + } + + sup { // + vertical-align: top; + + // footnote anchor + a.fn_bot { + font-size: .86em; + padding-right: .2em; + } + } + + .content { // + vertical-align: top; + line-height: 135%; + } + + > sup { + + } + + // footnote text + div.content { + line-height: 135%; + } + } +} + + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* footnotes in content */ +sup, +.main-content sup, +.main-content > div > p sup, +.main-content > div > ul > li .li sup + { + a.fn_top { + font-size: .7rem; + font-weight: bold; + padding-right: .2em; + } +} + +.insitu-footnote { + line-height: 130%; +} + + diff --git a/style.ini b/style.ini index 519d234..35dae3b 100755 --- a/style.ini +++ b/style.ini @@ -62,6 +62,7 @@ css/base_design.less = all css/area_content.less = all css/area_header.less = all css/area_footer.less = all +css/area_footnotes.less = all css/area_msg.less = all css/area_nav-direct.less = all css/area_nav-breadcrumb.less = all From 634eb790ea982d0dc8b285b55f5561b234b13e7c Mon Sep 17 00:00:00 2001 From: Roberto Bellingeri Date: Mon, 18 Mar 2019 11:27:37 +0100 Subject: [PATCH 003/142] Create style.txt --- lang/it/style.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 lang/it/style.txt diff --git a/lang/it/style.txt b/lang/it/style.txt new file mode 100644 index 0000000..07f41e3 --- /dev/null +++ b/lang/it/style.txt @@ -0,0 +1 @@ +Se vuoi cambiare la favicon, usa semplicemente il Gestore Media per caricare un ''favicon.ico'' nel ''wiki'' o nel namespace di root e verrà automaticamente usato. Se si utilizza un wiki chiuso, si consiglia di rendere leggibile per chiunque lo spazio dei nomi ''wiki'' (o root) nelle impostazioni ACL o il proprio favicon non verrà mostrato agli utenti che hanno effettuato il logout. From 902592407d19f2d8517fddccd49033c9b8ee3433 Mon Sep 17 00:00:00 2001 From: Roberto Bellingeri Date: Mon, 18 Mar 2019 11:28:01 +0100 Subject: [PATCH 004/142] Create lang.php --- lang/it/lang.php | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 lang/it/lang.php diff --git a/lang/it/lang.php b/lang/it/lang.php new file mode 100644 index 0000000..f6287f8 --- /dev/null +++ b/lang/it/lang.php @@ -0,0 +1,104 @@ + Date: Mon, 18 Mar 2019 11:29:20 +0100 Subject: [PATCH 005/142] Create settings.php --- lang/it/settings.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 lang/it/settings.php diff --git a/lang/it/settings.php b/lang/it/settings.php new file mode 100644 index 0000000..5c88524 --- /dev/null +++ b/lang/it/settings.php @@ -0,0 +1,17 @@ + .li'] = 'Primo livello degli elementi di elenco'; + +$lang['header_layout'] = 'Regola il layout dell\'intestazione:'; +$lang['header_layout_o_header-default'] = 'layout di intestazione generoso per un lungo titolo e una tagline'; +$lang['header_layout_o_header-compact'] = 'layout di intestazione compatto per un breve titolo e tagline nascosta'; + From 8eaf45e447563d00389d2a36d9e18b8ee9335833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Mon, 18 Mar 2019 13:58:16 +0100 Subject: [PATCH 006/142] revert commit 'remove author from comment block of less files' which is completely unrelated to feature branch --- css/area_content.less | 1 + css/area_footer.less | 1 + css/area_forms.less | 1 + css/area_header.less | 3 ++- css/area_main-content-secedit.less | 1 - css/area_main-content.less | 1 + css/area_main-sidebar-nav.less | 2 ++ css/area_main-sidebar-search.less | 1 + css/area_msg.less | 1 + css/area_nav-breadcrumb.less | 1 + css/area_nav-direct.less | 1 + css/area_nav-metabox.less | 2 ++ css/area_nav-page-attributes.less | 1 - css/area_nav-pagetools.less | 1 + css/area_nav-usertools.less | 1 + css/area_recent.less | 1 + css/area_search.less | 1 + css/area_tabs.less | 1 - css/area_togglelink.less | 1 + css/base.less | 1 + css/base_design.less | 1 + css/base_fontello-icons.less | 1 + css/base_mixins.less | 1 + css/base_structure.less | 1 + css/plugins/include.less | 2 ++ css/plugins/magic-matcher.less | 3 +++ css/print.less | 2 ++ css/template_admin.less | 1 + css/template_detail.less | 1 + 29 files changed, 33 insertions(+), 4 deletions(-) diff --git a/css/area_content.less b/css/area_content.less index 4b0ba92..6aa15ba 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the page content. * + * @author Jana Deutschlaender */ .content .row { diff --git a/css/area_footer.less b/css/area_footer.less index 0751871..57114e3 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the page footer * + * @author Jana Deutschlaender */ diff --git a/css/area_forms.less b/css/area_forms.less index f954225..996bd68 100644 --- a/css/area_forms.less +++ b/css/area_forms.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for forms. * + * @author Jana Deutschlaender */ diff --git a/css/area_header.less b/css/area_header.less index 63afdb5..97029be 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the page header. * + * @author Jana Deutschlaender */ @@ -267,7 +268,7 @@ font-size: 1rem; } } - + @media @screen_max-xxs { min-height: 70px; // needed for menu select toolbar diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 0fdc693..6101952 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -1,6 +1,5 @@ /** * This styles the "section editing button" (if not added by data-plugin) - * */ diff --git a/css/area_main-content.less b/css/area_main-content.less index d413174..c851248 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the main-content. * + * @author Jana Deutschlaender */ diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 4b78df8..d25b720 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -1,6 +1,8 @@ /** * This file provides the design styles the navigational elements in the sidebar * + * @author Jana Deutschlaender + * @author Andreas Gohr */ diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index 760744c..a217291 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the quick search. * + * @author Jana Deutschlaender */ diff --git a/css/area_msg.less b/css/area_msg.less index fe3673a..6edc5c7 100644 --- a/css/area_msg.less +++ b/css/area_msg.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for message block * + * @author Jana Deutschlaender */ diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index e0246ca..1c3818c 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the breadcrumb * + * @author Jana Deutschlaender */ diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less index 497b3bb..5defc3b 100755 --- a/css/area_nav-direct.less +++ b/css/area_nav-direct.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the direct / menu jump links. * + * @author Jana Deutschlaender */ diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 97864b4..684fce5 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -1,6 +1,8 @@ /** * This file provides the design styles for the metatabbox * + * @author Jana Deutschlaender + * @author Silke Pisulla */ diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index 1be952a..9074226 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -1,6 +1,5 @@ /** * Page Attribute Icons in the breadcrumb bar - * */ diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 93cff98..49c2dff 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the page specific tool bar. * + * @author Jana Deutschlaender */ /* diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 986c6eb..c3e382b 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the direct / menu jump links. * + * @author Jana Deutschlaender */ diff --git a/css/area_recent.less b/css/area_recent.less index 5507cb0..0722639 100644 --- a/css/area_recent.less +++ b/css/area_recent.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for page revisions * + * @author Jana Deutschlaender */ diff --git a/css/area_search.less b/css/area_search.less index b0acd17..9fddb00 100644 --- a/css/area_search.less +++ b/css/area_search.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the search results * + * @author Jana Deutschlaender */ diff --git a/css/area_tabs.less b/css/area_tabs.less index c5d3d88..6574645 100644 --- a/css/area_tabs.less +++ b/css/area_tabs.less @@ -1,6 +1,5 @@ /** * This file provides styles for tab boxes - * */ diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 9f7b8c3..5b09625 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the sidebar (navmain). * + * @author Jana Deutschlaender */ diff --git a/css/base.less b/css/base.less index a9a43d4..ba4e2f0 100755 --- a/css/base.less +++ b/css/base.less @@ -1,6 +1,7 @@ /** * This file provides the basic vars and reset styles. * + * @author Jana Deutschlaender */ diff --git a/css/base_design.less b/css/base_design.less index 7a54034..97c8f84 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -2,6 +2,7 @@ * This file provides the main design styles * across all template elements (typo, colors etc.) * + * @author Jana Deutschlaender */ diff --git a/css/base_fontello-icons.less b/css/base_fontello-icons.less index 13c9d80..bb31646 100644 --- a/css/base_fontello-icons.less +++ b/css/base_fontello-icons.less @@ -1,6 +1,7 @@ /** * This file provides styles for web fonts and icon fonts * + * @author Jana Deutschlaender */ diff --git a/css/base_mixins.less b/css/base_mixins.less index 023a907..1e9af0a 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -1,6 +1,7 @@ /** * This file provides less mixins for all other style modules * + * @author Jana Deutschlaender */ diff --git a/css/base_structure.less b/css/base_structure.less index 988e530..1ef944e 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -1,6 +1,7 @@ /** * This file provides styles for the general layout structure. * + * @author Jana Deutschlaender */ diff --git a/css/plugins/include.less b/css/plugins/include.less index d9381ab..f793a80 100644 --- a/css/plugins/include.less +++ b/css/plugins/include.less @@ -1,6 +1,8 @@ /** * This file provides the main design styles * across all template elements (typo, colors etc.) + * + * @author Jana Deutschlaender */ #dokuwiki__content .plugin_include_content { diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 8d6adc0..0652529 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -1,5 +1,8 @@ /** * This file provides styles for magic matcher plugin + * + * @author Jana Deutschlaender + * @author Silke Pisulla */ diff --git a/css/print.less b/css/print.less index 3a50e19..2b02270 100755 --- a/css/print.less +++ b/css/print.less @@ -1,6 +1,8 @@ /** * This file provides the styles for printing. * + * @author Jana Deutschlaender , + Silke Pisulla */ diff --git a/css/template_admin.less b/css/template_admin.less index d678a8a..6f4659d 100644 --- a/css/template_admin.less +++ b/css/template_admin.less @@ -1,6 +1,7 @@ /** * This file provides the design styles for the admin tools * + * @author Jana Deutschlaender */ diff --git a/css/template_detail.less b/css/template_detail.less index d368713..97ef1ce 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -2,6 +2,7 @@ * This file provides the design styles for the the detail template * (media details) * + * @author Jana Deutschlaender */ From 950f35bedb47577e2d0628d040eb8baecf90a96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Mon, 18 Mar 2019 16:09:53 +0100 Subject: [PATCH 007/142] prevent that regular s in the footnote content inherit those of footnote sups remove obsolete comments --- css/area_footnotes.less | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/css/area_footnotes.less b/css/area_footnotes.less index 7639f0c..ee01717 100644 --- a/css/area_footnotes.less +++ b/css/area_footnotes.less @@ -8,15 +8,15 @@ .dokuwiki div.footnotes { div.fn { margin-bottom: .2rem; - display: table;// - vertical-align: top;// + display: table; + vertical-align: top; - sup, // + > sup, .content { display: table-cell; } - sup { // + > sup { vertical-align: top; // footnote anchor @@ -26,15 +26,11 @@ } } - .content { // + .content { vertical-align: top; line-height: 135%; } - > sup { - - } - // footnote text div.content { line-height: 135%; @@ -49,8 +45,7 @@ sup, .main-content sup, .main-content > div > p sup, -.main-content > div > ul > li .li sup - { +.main-content > div > ul > li .li sup { a.fn_top { font-size: .7rem; font-weight: bold; From 0e28800ba70eeb6f91c69220de97660890d19b43 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 19 Mar 2019 23:53:05 +0100 Subject: [PATCH 008/142] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index a96091b..7199849 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-13 +date 2019-03-18 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 4ac10cf3be8e2e469f501800b9e04453d6737427 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 11:35:34 +0100 Subject: [PATCH 009/142] use a smooth animation to fade in the navigation This avoids the flash of unstyled/unprocessed content --- Template.php | 5 +++++ js/sidebar.js | 3 +++ 2 files changed, 8 insertions(+) diff --git a/Template.php b/Template.php index 544a7d8..32f4920 100644 --- a/Template.php +++ b/Template.php @@ -135,6 +135,11 @@ class Template { } else { // main navigation, loaded from standard sidebar, fixed up by javascript $nav = ''; } diff --git a/js/sidebar.js b/js/sidebar.js index 09f9206..a5193c4 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -144,6 +144,9 @@ jQuery(function () { } }); + + // fade in the navigation (was hidden until now + $main.css({opacity: 0, visibility: "visible"}).animate({opacity: 1}, 200); }, /** From 3b8715b10b97ef97ff3ffed9148c7e80a15af156 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 13:29:55 +0100 Subject: [PATCH 010/142] hide sitemapnavi on wide content --- css/area_main-sidebar-tabs.less | 5 +++++ css/plugins/sitemapnavi.less | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less index 9674def..e980e1d 100644 --- a/css/area_main-sidebar-tabs.less +++ b/css/area_main-sidebar-tabs.less @@ -14,6 +14,11 @@ &.active { border-bottom: 1px solid @ini_background_site; + font-weight: bold; } } } + +.wide-content #dokuwiki__aside ul.sidebar-tabs { + visibility: hidden; +} diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less index 14677eb..cd6026d 100644 --- a/css/plugins/sitemapnavi.less +++ b/css/plugins/sitemapnavi.less @@ -1,5 +1,4 @@ #plugin__sitemapnavi { - padding-left: @nav-margin*2.5; padding-bottom: @nav-margin; margin-bottom: @nav-margin; border-bottom: 1px solid @ini_nav_menu_color; @@ -12,3 +11,7 @@ line-height: @line-height-bigger; } } + +.wide-content #plugin__sitemapnavi { + display: none; +} From bc5c44532e443f5db9288f951a3c10354692fbcb Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 14:28:18 +0100 Subject: [PATCH 011/142] smaller logo in compact mode --- css/area_header.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/css/area_header.less b/css/area_header.less index 97029be..60293a3 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -213,6 +213,7 @@ .header-compact { #dokuwiki__header { min-height: 2.7rem; + margin-bottom: 0.5rem; .main-title.desktop-only p.claim, p.claim { @@ -234,7 +235,11 @@ .main-title.desktop-only, .logo { - padding-top: 0.4rem + padding-top: 0.4rem; + } + + .logo img { + height: 3.6rem; } } From e526c775348fe946faac56b0cc28bab9e971c0ed Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 14:46:07 +0100 Subject: [PATCH 012/142] style adjustments for sidebar tabs use less spacing and avoid wrapping (for smaller sidebars) --- css/area_main-sidebar-tabs.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less index e980e1d..0dc889d 100644 --- a/css/area_main-sidebar-tabs.less +++ b/css/area_main-sidebar-tabs.less @@ -4,11 +4,14 @@ border-bottom: 1px solid @ini_nav_menu_color; + white-space: nowrap; + li { display: inline-block; border: 1px solid @ini_nav_menu_color; padding: 0.25em 0.5em; margin-bottom: -1px; + margin-left: 0.5em; border-top-right-radius: @fix_border-radius; border-top-left-radius: @fix_border-radius; From 92e3938f34f34d09a9b575d167feec87336ad8f7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 21 Mar 2019 23:53:26 +0100 Subject: [PATCH 013/142] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 7199849..0f10eae 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-18 +date 2019-03-21 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 2e572684f845ad110a178abea62803df5a806208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Tue, 9 Apr 2019 14:43:37 +0200 Subject: [PATCH 014/142] #4: Do not style sup element outside of main-content --- css/area_footnotes.less | 1 - 1 file changed, 1 deletion(-) diff --git a/css/area_footnotes.less b/css/area_footnotes.less index ee01717..c669420 100644 --- a/css/area_footnotes.less +++ b/css/area_footnotes.less @@ -42,7 +42,6 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* footnotes in content */ -sup, .main-content sup, .main-content > div > p sup, .main-content > div > ul > li .li sup { From 2a1910a3bcc883b2cab5868bb07ad49cec2ea895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Tue, 9 Apr 2019 15:22:05 +0200 Subject: [PATCH 015/142] #30: Make logo clickable in Compact Mode --- css/base_structure.less | 1 + 1 file changed, 1 insertion(+) diff --git a/css/base_structure.less b/css/base_structure.less index 1ef944e..7b11de4 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -172,6 +172,7 @@ .row > .col-xs-12 { height: auto; min-height: fit-content; + z-index: 3; } } } From 55adf5238bd28dc2026709075c6a3d18ae856855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Tue, 9 Apr 2019 15:53:46 +0200 Subject: [PATCH 016/142] #29: Bugfix for IE11 in Compact Mode use auto instead of fit-content for min-height --- css/base_structure.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/base_structure.less b/css/base_structure.less index 1ef944e..74037e5 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -171,7 +171,7 @@ .header { .row > .col-xs-12 { height: auto; - min-height: fit-content; + min-height: auto; } } } From f508ca444e2c9ddc9b23ebfe7695b25bc509d2b9 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 3 Apr 2019 15:30:11 +0200 Subject: [PATCH 017/142] smaller indentations for sitemapnavi --- css/plugins/sitemapnavi.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less index cd6026d..863a571 100644 --- a/css/plugins/sitemapnavi.less +++ b/css/plugins/sitemapnavi.less @@ -10,6 +10,10 @@ li { line-height: @line-height-bigger; } + + li li { + margin-left: 0.75em; + } } .wide-content #plugin__sitemapnavi { From cbc7dfe5f00f665ca9e98708393f60acb09465c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 10 Apr 2019 16:00:53 +0200 Subject: [PATCH 018/142] improve less formating - part 1 (plugin modules) - remove @author from comments - adjust the spacing --- css/plugins/bureaucracy.less | 7 ------- css/plugins/configmanager.less | 6 ------ css/plugins/data.less | 2 -- css/plugins/do_tasks.less | 2 -- css/plugins/edit.less | 5 ----- css/plugins/edittable.less | 2 -- css/plugins/extension__manager.less | 2 -- css/plugins/folded.less | 2 -- css/plugins/highlight_parent.less | 2 -- css/plugins/include.less | 2 -- css/plugins/magic-matcher.less | 11 ----------- css/plugins/mediamanager.less | 4 ---- css/plugins/move.less | 2 -- css/plugins/popupviewer.less | 4 +--- css/plugins/qc.less | 12 ++++++------ css/plugins/sitemapnavi.less | 10 +++++++--- css/plugins/struct.less | 3 --- css/plugins/structstatus.less | 2 -- css/plugins/tabinclude.less | 5 ----- css/plugins/tagging.less | 14 ++++++++++---- 20 files changed, 24 insertions(+), 75 deletions(-) diff --git a/css/plugins/bureaucracy.less b/css/plugins/bureaucracy.less index 80f6012..678e902 100755 --- a/css/plugins/bureaucracy.less +++ b/css/plugins/bureaucracy.less @@ -2,9 +2,7 @@ * This file provides styles for bureaucracy plugin */ - /* + + + + + global + + + + + */ - .dokuwiki form.bureaucracy__plugin { fieldset { width: 100%; @@ -95,10 +93,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ - @media @screen_min-xlg { .dokuwiki form.bureaucracy__plugin { p { @@ -107,10 +103,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1439px */ - @media @screen_max-xlg { .dokuwiki form.bureaucracy__plugin { p, @@ -120,4 +114,3 @@ } } } - diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less index a699ffe..903e7ca 100644 --- a/css/plugins/configmanager.less +++ b/css/plugins/configmanager.less @@ -2,9 +2,7 @@ * This file provides styles for config manager */ - /* + + + + + config__manager + + + + + */ - #dokuwiki__content { #config__manager { fieldset { @@ -62,10 +60,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1024px */ - @media @screen_max-md { #dokuwiki__content { #config__manager { @@ -100,10 +96,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 768px */ - @media @screen_max-sm { #dokuwiki__content { #config__manager { diff --git a/css/plugins/data.less b/css/plugins/data.less index 6a6cf57..28d238c 100644 --- a/css/plugins/data.less +++ b/css/plugins/data.less @@ -3,9 +3,7 @@ * after importing struct data this can be deleted */ - /* + + + + + global + + + + + */ - #dokuwiki__content { .dataplugin_entry { dl { diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index a17e873..8a43015 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -3,7 +3,6 @@ */ /* + + + + + global + + + + + */ - ul.page-attributes { .plugin_do_pagetasks { position: relative; @@ -25,7 +24,6 @@ ul.page-attributes { } } - /* + + + + + usertool icon in header + + + + + */ #dokuwiki__usertools.nav-usertools { ul { diff --git a/css/plugins/edit.less b/css/plugins/edit.less index 2f0288a..2ed6f52 100644 --- a/css/plugins/edit.less +++ b/css/plugins/edit.less @@ -3,9 +3,7 @@ * and "section edit button" and "editbutton_table edit button". */ - /* + + + + + edit view + + + + + */ - #dokuwiki__content { div.section_highlight { clear: right; @@ -54,12 +52,9 @@ } } } - - } } - .mode_edit { .content { .msg-area { diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less index bba123d..f67dfe6 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -2,9 +2,7 @@ * This file provides styles for "edittable plugin" */ - /* + + + + + global + + + + + */ - #dokuwiki__content.main-content { div.editbutton_table { position: relative; // for IE diff --git a/css/plugins/extension__manager.less b/css/plugins/extension__manager.less index 3d3b80d..eae01b4 100644 --- a/css/plugins/extension__manager.less +++ b/css/plugins/extension__manager.less @@ -2,9 +2,7 @@ * This file provides styles for extension manager */ - /* + + + + + global + + + + + */ - .dokuwiki #extension__manager { .actions { font-size: 0; diff --git a/css/plugins/folded.less b/css/plugins/folded.less index 0402618..660d4a5 100644 --- a/css/plugins/folded.less +++ b/css/plugins/folded.less @@ -2,9 +2,7 @@ * This file provides styles for the toggle "folded" */ - /* + + + + + global + + + + + */ - #dokuwiki__content { a.folder { background: transparent url("svg.php?svg=down.svg&f=existing") right center no-repeat; diff --git a/css/plugins/highlight_parent.less b/css/plugins/highlight_parent.less index ac61e29..73822fb 100644 --- a/css/plugins/highlight_parent.less +++ b/css/plugins/highlight_parent.less @@ -2,9 +2,7 @@ * This file provides styles for highlight plugin */ - /* + + + + + global + + + + + */ - #plugin__highlightparent { clear: none; display: block; diff --git a/css/plugins/include.less b/css/plugins/include.less index f793a80..d9381ab 100644 --- a/css/plugins/include.less +++ b/css/plugins/include.less @@ -1,8 +1,6 @@ /** * This file provides the main design styles * across all template elements (typo, colors etc.) - * - * @author Jana Deutschlaender */ #dokuwiki__content .plugin_include_content { diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 0652529..fee9b2e 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -1,14 +1,9 @@ /** * This file provides styles for magic matcher plugin - * - * @author Jana Deutschlaender - * @author Silke Pisulla */ - /* + + + + + + + + + + + + + + + + + + + + + + + */ /* magic matcher bar with form on top of page */ - #spr__magic-matcher { position: fixed; top: 0; @@ -88,7 +83,6 @@ } } - /* + + + + + in content + + + + + */ a.jiralink { font-size: @font-size-default; @@ -108,7 +102,6 @@ a.jiralink { } } - /* + + + + + tooltip in metabox + + + + + */ .dokuwiki { .serverToolTip { @@ -190,10 +183,8 @@ a.jiralink { } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-lg { #spr__magic-matcher { #magicmatcher__context { @@ -214,11 +205,9 @@ a.jiralink { } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* print */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - @media print { #spr__magic-matcher { display: none; diff --git a/css/plugins/mediamanager.less b/css/plugins/mediamanager.less index 33515fb..346309e 100644 --- a/css/plugins/mediamanager.less +++ b/css/plugins/mediamanager.less @@ -2,9 +2,7 @@ * This file provides styles for mediamanager */ - /* + + + + + global + + + + + */ - #mediamanager__page { .namespaces h2 { bottom: 0; @@ -21,10 +19,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries */ - @media @screen_max-md { #mediamanager__page { min-width: 100%; diff --git a/css/plugins/move.less b/css/plugins/move.less index 3863e28..c512c54 100644 --- a/css/plugins/move.less +++ b/css/plugins/move.less @@ -2,9 +2,7 @@ * This file provides styles for move plugin */ - /* + + + + + global + + + + + */ - #dokuwiki__site > .plugin_move_dialog { font-size: @font-size-default; diff --git a/css/plugins/popupviewer.less b/css/plugins/popupviewer.less index afa3119..a9c32d8 100755 --- a/css/plugins/popupviewer.less +++ b/css/plugins/popupviewer.less @@ -2,12 +2,9 @@ * This file provides styles for popupviewer plugin */ - /* + + + + + global + + + + + */ - #popupviewer { > .controls > .content { - padding: 1.5rem 1rem 1rem; td, @@ -19,6 +16,7 @@ line-height: @line-height-default; } } + .li, li { font-size: @font-size-default; diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 3c486f1..b08d756 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -2,9 +2,7 @@ * Styles for the QC plugin */ - /* + + + + + icon in breadcrumb + + + + + */ - .page-attributes .plugin_qc { .qc_icon { margin: 0; @@ -28,7 +26,6 @@ } } - /* + + + + + slideout output + + + + + */ .qc-output { position: relative; @@ -71,13 +68,18 @@ padding-top: 0; } } + h2 { font-size: 1.3rem; } + h3 { font-size: 1.1rem; } - h4, h5, h6 { + + h4, + h5, + h6 { font-size: 1rem; } @@ -110,7 +112,6 @@ } } - /* + + + + + admin settings + + + + + */ .do-admin #dokuwiki__content { #plugin__qc_admin { @@ -120,7 +121,6 @@ padding-left: .2em; text-align: left; display: inline-block; - } } } diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less index 863a571..23978f4 100644 --- a/css/plugins/sitemapnavi.less +++ b/css/plugins/sitemapnavi.less @@ -1,3 +1,7 @@ +/** + * This file provides styles for the sitemapnavi plugin + */ + #plugin__sitemapnavi { padding-bottom: @nav-margin; margin-bottom: @nav-margin; @@ -9,10 +13,10 @@ li { line-height: @line-height-bigger; - } - li li { - margin-left: 0.75em; + li { + margin-left: 0.75em; + } } } diff --git a/css/plugins/struct.less b/css/plugins/struct.less index a7f32b8..f6b62ad 100755 --- a/css/plugins/struct.less +++ b/css/plugins/struct.less @@ -2,9 +2,7 @@ * This file provides styles for struct plugin */ - /* + + + + + global + + + + + */ - #dokuwiki__content { .structaggregation { @link-height: 1.5rem; @@ -107,7 +105,6 @@ } } - /* + + + + + struct inline-editor + + + + + */ .dokuwiki { .struct_inlineditor { diff --git a/css/plugins/structstatus.less b/css/plugins/structstatus.less index 4dfb2cb..0bfd143 100644 --- a/css/plugins/structstatus.less +++ b/css/plugins/structstatus.less @@ -2,9 +2,7 @@ * This file provides styles for structstatus plugin */ - /* + + + + + global + + + + + */ - #dokuwiki__content { .struct_status { border-color: @ini_border; diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less index 39cef9c..42994f5 100644 --- a/css/plugins/tabinclude.less +++ b/css/plugins/tabinclude.less @@ -2,9 +2,7 @@ * This file provides styles for the tabinclude */ - /* + + + + + plugin tabinclude + + + + + */ - div#dwpl-ti-container { li.dwpl-ti-tab { box-shadow: none; @@ -40,7 +38,6 @@ div#dwpl-ti-container { } } - /* + + + content box + + + */ div.dwpl-ti-content-box { position: relative; @@ -53,10 +50,8 @@ div#dwpl-ti-container { } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries */ - @media @screen_max-md { div#dwpl-ti-container { } } diff --git a/css/plugins/tagging.less b/css/plugins/tagging.less index 280448f..d20a77f 100644 --- a/css/plugins/tagging.less +++ b/css/plugins/tagging.less @@ -2,9 +2,7 @@ * This file provides styles for the form in tagcloud */ - /* + + + + + plugin tagging + + + + + */ - #spr__meta-box { ul.tagging_cloud { width: 100%; @@ -14,33 +12,43 @@ &.t0 a { font-size: .88rem; } + &.t1 a { font-size: 1rem; } + &.t2 a { font-size: 1.1rem; } + &.t3 a { font-size: 1.2rem; } + &.t4 a { font-size: 1.3rem; } + &.t5 a { font-size: 1.4rem; } + &.t6 a { font-size: 1.5rem; } + &.t7 a { font-size: 1.6rem; } + &.t8 a { font-size: 1.7rem; } + &.t9 a { font-size: 1.8rem; } + &.t10 a { font-size: 1.9rem; } @@ -61,10 +69,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries */ - @media @screen_max-md { #spr__meta-box { form { From 5e017504585d9b7084ab5b5d8049e4f3d23aaedd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 10 Apr 2019 17:04:57 +0200 Subject: [PATCH 019/142] improve less formating - part 2 (template area and base modules) - remove @author from comments - adjust the spacing --- css/area_content.less | 9 +--- css/area_footer.less | 12 ----- css/area_footnotes.less | 5 -- css/area_forms.less | 12 ----- css/area_header.less | 31 ++++-------- css/area_main-content-secedit.less | 1 - css/area_main-content.less | 15 ++---- css/area_main-sidebar-nav.less | 27 ++--------- css/area_main-sidebar-search.less | 13 +----- css/area_main-sidebar-tabs.less | 6 +++ css/area_msg.less | 5 +- css/area_nav-breadcrumb.less | 3 -- css/area_nav-direct.less | 3 -- css/area_nav-metabox.less | 17 ++----- css/area_nav-page-attributes.less | 2 - css/area_nav-pagetools.less | 3 -- css/area_nav-usertools.less | 17 ++----- css/area_recent.less | 8 +--- css/area_search.less | 3 -- css/area_tabs.less | 2 - css/area_togglelink.less | 5 +- css/base.less | 40 ++++------------ css/base_design.less | 12 +---- css/base_fontello-icons.less | 10 +--- css/base_mixins.less | 12 ----- css/base_structure.less | 7 --- css/print.less | 20 -------- css/template_admin.less | 7 --- css/template_detail.less | 75 ++++++++++++++---------------- css/toollist.less | 5 +- 30 files changed, 90 insertions(+), 297 deletions(-) diff --git a/css/area_content.less b/css/area_content.less index 6aa15ba..2ec99a3 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -1,7 +1,5 @@ /** * This file provides the design styles for the page content. - * - * @author Jana Deutschlaender */ .content .row { @@ -31,23 +29,20 @@ } } - .main-content > .level2, .main-content > .level1, .main-content > .level3, .main-content > .level4, .main-content > .level5, .main-content > .level6 { - //padding-bottom: 1rem; - - > p, > ul > li .li { + > p, + > ul > li .li { a { font-size: inherit; } } } - .level1, .level2, .level3, diff --git a/css/area_footer.less b/css/area_footer.less index 57114e3..62dafe5 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -1,13 +1,9 @@ /** * This file provides the design styles for the page footer - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* no print */ - @media screen { .page-footer { min-height: @page-header_height; @@ -55,10 +51,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1024px */ - @media @screen_min-md { #dokuwiki__footer { .col-xs-12 { @@ -91,10 +85,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-md { #dokuwiki__footer { .main-footer { @@ -104,10 +96,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 768px */ - @media @screen_max-xs { .page-footer { padding-left: @margin-small; @@ -124,10 +114,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 480px */ - @media @screen_max-xxs { #dokuwiki__footer { .main-footer { diff --git a/css/area_footnotes.less b/css/area_footnotes.less index c669420..db8fb85 100644 --- a/css/area_footnotes.less +++ b/css/area_footnotes.less @@ -1,6 +1,5 @@ /** * This file provides the design styles for the footnotes. - * */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ @@ -38,8 +37,6 @@ } } - - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* footnotes in content */ .main-content sup, @@ -55,5 +52,3 @@ .insitu-footnote { line-height: 130%; } - - diff --git a/css/area_forms.less b/css/area_forms.less index 996bd68..9efaee0 100644 --- a/css/area_forms.less +++ b/css/area_forms.less @@ -1,18 +1,13 @@ /** * This file provides the design styles for forms. - * - * @author Jana Deutschlaender */ - /* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ - form { display: inline; margin: 0; padding: 0; - // multiline label fieldset > label.block > span:first-child { display: inline-block; @@ -115,7 +110,6 @@ input[type="image"] { //box-shadow: none; :in ie picture and checkbox disappear } - input:active, input:focus, textarea:active, @@ -132,7 +126,6 @@ input[type="file"] { padding-bottom: .1rem; } - /* + + + + + buttons + + + + + */ button { background-color: #eee; @@ -155,7 +148,6 @@ button { } } - /* + + + all types of submit-buttons + + + */ form input[type=submit], // heredity 'adnewpage' a.button, @@ -213,7 +205,6 @@ button[type=submit] { } } - /* + + + all types of buttons not being submit-buttons + + + */ input.button, input[type=button] { @@ -237,7 +228,6 @@ input[type=button] { } } - /* + + + all disabled buttons + + + */ input[disabled], button[disabled], @@ -277,10 +267,8 @@ button::-moz-focus-inner { padding: 0; } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries - Styles for auth forms */ - @media @screen_max-xs { .tpl_sprintdoc { #dw__login, diff --git a/css/area_header.less b/css/area_header.less index 60293a3..50588a8 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the page header. - * - * @author Jana Deutschlaender */ - #dokuwiki__header { @header-font-opacity: 1; @@ -12,8 +9,7 @@ min-height: 120px; } - -/* + + + wiki logo + + + */ + /* + + + wiki logo + + + */ @media @screen_min-md { .logo { padding: 1rem 0 .3rem; @@ -46,8 +42,7 @@ } } - -/* + + + + + DESKTOP - wiki title + claim + + + + + */ + /* + + + + + DESKTOP - wiki title + claim + + + + + */ .main-title.desktop-only { @media @screen_min-md { display: table-cell; @@ -76,8 +71,7 @@ } } - -/* + + + + + MOBILE - wiki title wrapper + + + + + */ + /* + + + + + MOBILE - wiki title wrapper + + + + + */ .main-title:not([class*="desktop-only"]) { @media @screen_max-md { display: table-cell; @@ -89,8 +83,7 @@ } } - -/* + + + wiki title + + + */ + /* + + + wiki title + + + */ p.title { background-color: @ini_background_site; opacity: @header-font-opacity; @@ -109,8 +102,7 @@ } } - -/* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */ + /* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */ @media @screen_min-md { div.claim { display: table-cell; @@ -119,8 +111,7 @@ } } - -/* + + + wiki claim + + + */ + /* + + + wiki claim + + + */ p.claim { opacity: @header-font-opacity; color: @ini_text_webframe; @@ -132,8 +123,7 @@ } } - -/* + + + mobile nav togglelink + + + */ + /* + + + mobile nav togglelink + + + */ .menu-togglelink { position: relative; margin: @headericons-margin-xxs -(@very-small-spacing) 0 0; @@ -176,8 +166,7 @@ } } - -/* + + + + + with magic matcher + + + + + */ + /* + + + + + with magic matcher + + + + + */ &.has-magicmatcher { .logo { @media @screen_min-md { @@ -208,7 +197,6 @@ } } - /* + + + + + layout option compact + + + + + */ .header-compact { #dokuwiki__header { @@ -284,9 +272,6 @@ .menu-tool-select { padding-top: .3rem; } - } - - } } diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 6101952..f341f80 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -2,7 +2,6 @@ * This styles the "section editing button" (if not added by data-plugin) */ - #dokuwiki__content.main-content { .secedit:not([class*="plugin"]):not([class*="table"]) { position: relative; diff --git a/css/area_main-content.less b/css/area_main-content.less index c851248..738ff65 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the main-content. - * - * @author Jana Deutschlaender */ - #dokuwiki__content.main-content { div[class^="level"] { p a.media { @@ -43,16 +40,12 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ - -@media @screen_min-xlg { -} - +// @media @screen_min-xlg { +// } /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1199px */ - -@media @screen_max-xlg { -} +// @media @screen_max-xlg { +// } diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index d25b720..37e1602 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -1,11 +1,7 @@ /** * This file provides the design styles the navigational elements in the sidebar - * - * @author Jana Deutschlaender - * @author Andreas Gohr */ - #dokuwiki__aside { @icon-size: @font-size-big; @menu-margin: @icon-size + @margin-small * 2; @@ -62,7 +58,7 @@ padding: .15em 0; -/* + + + + + active + + + + + */ + /* + + + + + active + + + + + */ span.curid { font-weight: bold; } @@ -81,8 +77,7 @@ } } - -/* + + + the wrapper around the toggle to reserve space + + + */ + /* + + + the wrapper around the toggle to reserve space + + + */ div.nav { min-height: @icon-size + @margin-small; border: 1px solid transparent; @@ -137,13 +132,12 @@ } } -/* + + + submenu entry is active + + + */ + /* + + + submenu entry is active + + + */ &.is-active { font-weight: bold; } - -/* + + + toggle: open + + + */ + /* + + + toggle: open + + + */ &.is-open { background-color: @ini_nav_menu_hover_color; border-color: @ini_nav_menu_hover_color; @@ -259,8 +253,7 @@ } } - -/* + + + + + the panel (hidden by default) + + + + + */ + /* + + + + + the panel (hidden by default) + + + + + */ div.nav-panel { display: none; margin-top: .5rem; @@ -277,10 +270,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ - @media @screen_min-xlg { #dokuwiki__aside { nav { @@ -301,10 +292,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1440px */ - @media @screen_max-xlg { #dokuwiki__aside { div.nav { @@ -315,10 +304,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-md { #dokuwiki__aside { div.nav { @@ -366,10 +353,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 768px */ - @media @screen_max-xs { body.show-mobile-sidebar { .page-wrapper > .tools { @@ -386,10 +371,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 480px */ - @media @screen_max-xxs { body.show-mobile-sidebar { #dokuwiki__aside { diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index a217291..f2a4c03 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the quick search. - * - * @author Jana Deutschlaender */ - .search.main-sidebar { @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav @icon-size: @page-header_height; @@ -108,8 +105,7 @@ } } - -/* + + + form + + + */ + /* + + + form + + + */ form { position: relative; display: block; @@ -177,8 +173,7 @@ } } - -/* + + + + + suggestionlist + + + + + */ + /* + + + + + suggestionlist + + + + + */ #qsearch__out { left: auto; top: auto; @@ -187,10 +182,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1024px */ - @media @screen_min-md { // wide page content @@ -224,10 +217,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-md { // show when toggled diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less index 0dc889d..399e601 100644 --- a/css/area_main-sidebar-tabs.less +++ b/css/area_main-sidebar-tabs.less @@ -1,3 +1,8 @@ +/** + * This file provides the design styles for tab list in sidebar + */ + +/* default view */ #dokuwiki__aside ul.sidebar-tabs { margin-top: 0; margin-bottom: @nav-margin; @@ -22,6 +27,7 @@ } } +/* wide content view */ .wide-content #dokuwiki__aside ul.sidebar-tabs { visibility: hidden; } diff --git a/css/area_msg.less b/css/area_msg.less index 6edc5c7..41fe08b 100644 --- a/css/area_msg.less +++ b/css/area_msg.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for message block - * - * @author Jana Deutschlaender */ - .msg-area { clear: both; padding-top: 1.6rem; @@ -18,7 +15,7 @@ } } -/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */ +/* short fix: SPR-891 - icons for notifications in message area are repeated */ div.success, div.error, div.info, diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 1c3818c..7c7ac0c 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the breadcrumb - * - * @author Jana Deutschlaender */ - .breadcrumbs { position: relative; min-height: @page-header_height; diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less index 5defc3b..62bbe63 100755 --- a/css/area_nav-direct.less +++ b/css/area_nav-direct.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the direct / menu jump links. - * - * @author Jana Deutschlaender */ - .nav-direct { background-color: @nav_direct_background; margin-top: -1px; diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 684fce5..6d4af22 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -1,11 +1,7 @@ /** * This file provides the design styles for the metatabbox - * - * @author Jana Deutschlaender - * @author Silke Pisulla */ - #spr__meta-box { .display-flex(); .flex-direction(); @@ -57,7 +53,7 @@ } -/* + + + + + tab controlls + + + + + */ + /* + + + + + tab controls + + + + + */ ul.meta-tabs { list-style: none; line-height: 160%; @@ -175,8 +171,7 @@ } } - -/* + + + + + toggle content + + + + + */ + /* + + + + + toggle content + + + + + */ .meta-content { margin-top: -1px; @@ -297,8 +292,7 @@ } } - -/* + + + + + tab issues + + + + + */ + /* + + + + + tab issues + + + + + */ #spr__tab-issues { ul.mmissuelist { padding-left: 0; @@ -337,9 +331,8 @@ } } - -/* + + + + + tab issues + + + + + */ -/* see plugins/magic-matcher.less */ + /* + + + + + tab issues + + + + + */ + /* see plugins/magic-matcher.less */ #spr__tab-issues { ul.mmissuelist { padding-left: 0; diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index 9074226..4484f4f 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -2,9 +2,7 @@ * Page Attribute Icons in the breadcrumb bar */ - /* + + + + + icons in breadcrumb area + + + + + */ - .page-attributes { list-style: none; float: right; diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 49c2dff..58df991 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -1,7 +1,5 @@ /** * This file provides the design styles for the page specific tool bar. - * - * @author Jana Deutschlaender */ /* @@ -21,7 +19,6 @@ .pagetools-item(img_backto, 12); */ - #dokuwiki__aside { @media @screen_max-md { display: none !important; diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index c3e382b..fdba9c3 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the direct / menu jump links. - * - * @author Jana Deutschlaender */ - #dokuwiki__usertools.nav-usertools { @media @screen_min-md { right: 1.25rem; @@ -26,8 +23,7 @@ } } - -/* + + + + + icon list + + + + + */ + /* + + + + + icon list + + + + + */ ul { float: right; padding: 0; @@ -76,8 +72,7 @@ } } -/* !!! &.user-task FIND in plugins/do_tasks.less !!! */ - + /* !!! &.user-task FIND in plugins/do_tasks.less !!! */ &.user { position: relative; display: table-cell; @@ -221,11 +216,9 @@ } } } // user - } // li - -/* + + + icons + + + */ + /* + + + icons + + + */ .menuitem, button { padding: 2px 0 0 2px; min-height: @toggle-size; // overrides button[type="submit"] styles @@ -245,10 +238,8 @@ span { display: none; } - } - a { // Pre-Greebo backwards compatibility, remove after transitioning to Greebo .fontello(); .hide-text-show-before(); @@ -298,7 +289,6 @@ } // ul } // nav-usertools - /* + + + + + layout option compact + + + + + */ .header-compact { #dokuwiki__usertools.nav-usertools { @@ -366,4 +356,3 @@ } } } - diff --git a/css/area_recent.less b/css/area_recent.less index 0722639..78e97dd 100644 --- a/css/area_recent.less +++ b/css/area_recent.less @@ -1,13 +1,10 @@ /** * This file provides the design styles for page revisions - * - * @author Jana Deutschlaender */ - .dokuwiki { -/* + + + + + list of changes + + + + + */ + /* + + + + + list of changes + + + + + */ form.changes { li { .sizechange { @@ -59,8 +56,7 @@ } } - -/* + + + + + view of differents + + + + + */ + /* + + + + + view of differents + + + + + */ a.difflink { color: @ini_existing; diff --git a/css/area_search.less b/css/area_search.less index 9fddb00..503570e 100644 --- a/css/area_search.less +++ b/css/area_search.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the search results - * - * @author Jana Deutschlaender */ - /* search hit in normal text */ .dokuwiki .search_hit { background-color: @ini_highlight; diff --git a/css/area_tabs.less b/css/area_tabs.less index 6574645..0912399 100644 --- a/css/area_tabs.less +++ b/css/area_tabs.less @@ -2,9 +2,7 @@ * This file provides styles for tab boxes */ - /* + + + + + tabs + + + + + */ - #dokuwiki__content { ul.tabs { li:not([class~="active"]) { diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 5b09625..10a47bc 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the sidebar (navmain). - * - * @author Jana Deutschlaender */ - .togglelink { &.page_main-content { position: absolute; @@ -70,7 +67,7 @@ } } -/* + + + toggle out + + + */ + /* + + + toggle out + + + */ .wide-content & { left: 0; diff --git a/css/base.less b/css/base.less index ba4e2f0..898e813 100755 --- a/css/base.less +++ b/css/base.less @@ -1,14 +1,10 @@ /** * This file provides the basic vars and reset styles. - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* global vars */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - @font_family_screen: arial, sans-serif; @font_family_print: "Times New Roman", serif; @@ -39,9 +35,7 @@ @box-shadow-right-bottom: .1em .3rem .5em rgba(153,153,153,.5); @box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor - /* + + + for programmers customizing + + + */ - @fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg @toggle-showsidebar_width: 3.47rem; // shown sidebar after toggle @@ -57,35 +51,29 @@ @code-background: #F6F6F6; /* code, pre, samp, kbd */ - /* icons */ @noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude */ @noopentasks-border: #BBB; /* metabox tabs + num in icons + code, pre, samp, kbd */ @noopentasks-color: #666; /* metabox tabs + num in icons + code, pre, samp, kbd */ @wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */ - - /* navigation left */ @menu-margin-lg: 1.3rem; @quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */ @suggestion-zebra: #EEE; - /* edit mode */ @highlight-odd-ini_text: fade(@ini_background, 95%); @highlight-even-ini_text: fade(@ini_text, 5%); @color-editBox: #252525; // editmode for tables, revision states - //@nolinkedicon-ini_background: fade(@ini_background_site, 10%); //@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%); - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* fonts */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @font-size-very-small: .73rem; @font-size-small: .88rem; @font-size-default: 1rem; @@ -108,10 +96,9 @@ @font-size-head2: @font-size-default + (@font-scale-factor * 7); @font-size-head1: @font-size-default + (@font-scale-factor * 9); - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* breakpoints */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @break-min-xxs: 480; @break-max-xxs: (@break-min-xxs - 1); @@ -133,10 +120,9 @@ @break-min-xxlg: 1600; @break-max-xxlg: (@break-min-xxlg - 1); - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries for breakpoints */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)"; @screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)"; @@ -164,10 +150,9 @@ @screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)"; @screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)"; - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* col width */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @c12: 100%; @c11: 91.66666667%; @c10: 83.33333333%; @@ -187,7 +172,6 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* all media */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - html, body { .reset(); @@ -259,10 +243,9 @@ nav > ul { } } - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* css behaviour */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ .sr-out { .sr-out(); } @@ -304,7 +287,6 @@ nav > ul { } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* screen only */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @@ -441,11 +423,9 @@ nav > ul { } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* print only */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - @media print { body { font-size: 12pt; diff --git a/css/base_design.less b/css/base_design.less index 97c8f84..a04049a 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -1,8 +1,6 @@ /** * This file provides the main design styles * across all template elements (typo, colors etc.) - * - * @author Jana Deutschlaender */ @@ -10,9 +8,7 @@ html, body { background-color: @ini_background_site; } - /* highlight selected tool */ - .mode_admin a.action.admin, .mode_login a.action.login, .mode_register a.action.register, @@ -346,9 +342,7 @@ small, } } - -/*____________ lists ____________*/ - +/* + + + lists + + + */ ul, ol { font-size: @font-size-default; @@ -426,9 +420,7 @@ ol ol ol ol ol { list-style-type: lower-roman; } - -/*____________ tables ____________*/ - +/* + + + tables + + + */ .dokuwiki { table.inline tr:hover { th { diff --git a/css/base_fontello-icons.less b/css/base_fontello-icons.less index bb31646..2bd1a37 100644 --- a/css/base_fontello-icons.less +++ b/css/base_fontello-icons.less @@ -1,10 +1,8 @@ /** * This file provides styles for web fonts and icon fonts - * - * @author Jana Deutschlaender + * (If you add new icons in the fontello set you have to add the icon class and associated character encoding here) */ - /* icon font */ .setIconFontFace('fontello','fontello'); @@ -12,12 +10,7 @@ .fontello(); } - /* + + + + + fontello codes + + + + + */ -/** - * If in the Fontello-Packet an icon is added, the code should be supplemented here: -*/ - .icon-emo-happy { &::before { content: '\e804'; } } /* '' */ .icon-emo-wink { &::before { content: '\e805'; } } /* '' */ .icon-emo-unhappy { &::before { content: '\e806'; } } /* '' */ @@ -94,7 +87,6 @@ /* + + + + + additional "after" for nav-pagetools + + + + + */ - .icon-pencil { &::before, &::after { content: '\e840'; } diff --git a/css/base_mixins.less b/css/base_mixins.less index 1e9af0a..6d3b840 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -1,14 +1,10 @@ /** * This file provides less mixins for all other style modules - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Fonts */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename) { @font-face { font-family: @fontFamily; @@ -102,11 +98,9 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Screenreader / Hide */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .sr-out() { display: block; width: 1px; @@ -140,7 +134,6 @@ } } - /* + + + + + small icon-buttons (breadcrumb, page-header) + + + + + */ .btn-hover { background-color: @ini_nav_menu_hover_bg; @@ -288,10 +281,8 @@ -ms-flex-wrap: wrap; } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* positioning */ - .center-middle() { position: absolute; top: 50%; @@ -301,11 +292,9 @@ -webkit-transform: translateX(-50%) translateY(-50%); } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Screenreader / Hide */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .reset() { background: transparent; border: none 0; outline: 0; vertical-align: baseline; @@ -329,7 +318,6 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Col Grid */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .make-grid(@class) { .float-grid-columns(@class); .grid-columns(1, @class, width); diff --git a/css/base_structure.less b/css/base_structure.less index db637bd..bf8a96b 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -1,14 +1,10 @@ /** * This file provides styles for the general layout structure. - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Col Grid */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .make-grid(xs); @media screen { @@ -125,7 +121,6 @@ } } /* + + + + + end of z-indices + + + + + */ - @media @screen_min-md { .content .row > .col-xs-12 { @@ -227,7 +222,6 @@ } } - @media @screen_md-lg { .wide-content.showSidebar { .content { @@ -238,7 +232,6 @@ } } - @media @screen_max-md { .container { margin: 0 1.25rem; diff --git a/css/print.less b/css/print.less index 2b02270..96d0157 100755 --- a/css/print.less +++ b/css/print.less @@ -1,21 +1,14 @@ /** * This file provides the styles for printing. - * - * @author Jana Deutschlaender , - Silke Pisulla */ - /* + + + + + variables + + + + + */ - @color-print: #000; @background-print: transparent; @border-color-print: #ccc; @border-dark-print: #777; - /* + + + + + print styles + + + + + */ - html, body { background: @background-print; @@ -55,7 +48,6 @@ a:visited { padding: 20pt 20pt 0; } - /* + + + + + + + + + + + + + + */ /* + + + + + admin + + + + + */ @@ -73,7 +65,6 @@ a:visited { } } - /* + + + Extension Manager + + + */ #extension__manager { form.search { @@ -224,8 +215,6 @@ a:visited { } } - - /* + + + Configuration Settings + + + */ #dokuwiki__content #config__manager { fieldset { @@ -347,12 +336,8 @@ a:visited { } } - /* + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + Template Style Settings + + + + + */ - - - .page-footer { border-top: 1pt solid @border-color-print; margin-top: 13pt; @@ -369,7 +354,6 @@ a:visited { } } - /* + + + data plugin + + + */ .dataplugin_entry dl { border: 1pt solid @border-color-print; @@ -386,7 +370,6 @@ a:visited { } } - #dokuwiki__detail { div.img_detail dl { dt { @@ -401,7 +384,6 @@ a:visited { } } - /* + + + tabbox + + + */ div#dwpl-ti-container .dwpl-ti, .dwpl-ti-permalink-header, @@ -414,7 +396,6 @@ div#dwpl-ti-container div.dwpl-ti-content-box { border: 0 none; } - /* + + + media nmanager + + + */ #mediamanager__page { .namespaces, @@ -470,7 +451,6 @@ div#dwpl-ti-container div.dwpl-ti-content-box { } } - /* + + + forms + + + */ form { button { diff --git a/css/template_admin.less b/css/template_admin.less index 6f4659d..b912bc2 100644 --- a/css/template_admin.less +++ b/css/template_admin.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the admin tools - * - * @author Jana Deutschlaender */ - .do-admin { #admin__version { font-size: @font-size-default; @@ -85,10 +82,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* 1024px */ - @media @screen_max-md { .do-admin { div.ui-admin { @@ -113,10 +108,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* 768px */ - @media @screen_max-xs { .do-admin { div.ui-admin { diff --git a/css/template_detail.less b/css/template_detail.less index 97ef1ce..f425221 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -1,64 +1,61 @@ /** * This file provides the design styles for the the detail template * (media details) - * - * @author Jana Deutschlaender */ - #dokuwiki__detail { -/* + + + + + linked image + + + + + */ + /* + + + + + linked image + + + + + */ @media screen { .img-link { - text-align: center; + text-align: center; - a { - position: relative; - left: 0; - display: inline-block; - max-width: 100%; - color: @ini_button_color; - margin: 0 auto 1.4em; - - &::before { - position: absolute; - top: 0; - left: 0; - display: block; - width: 100%; - box-sizing: border-box; - background: @ini_button_background; - line-height: @line-height-default; - padding: @margin-small; - } - - img { - margin: 0; - display: block; - border: 1px dotted @ini_background_site; + a { position: relative; - } - - &:hover, - &:focus, - &:active { - text-decoration: none; + left: 0; + display: inline-block; + max-width: 100%; + color: @ini_button_color; + margin: 0 auto 1.4em; &::before { - content: attr(title); + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + box-sizing: border-box; + background: @ini_button_background; + line-height: @line-height-default; + padding: @margin-small; } img { - border: 1px solid @ini_button_background; + margin: 0; + display: block; + border: 1px dotted @ini_background_site; + position: relative; + } + + &:hover, + &:focus, + &:active { + text-decoration: none; + + &::before { + content: attr(title); + } + + img { + border: 1px solid @ini_button_background; + } } } } } - } -/* + + + + + meta data + + + + + */ + /* + + + + + meta data + + + + + */ div.img_detail { @media screen { /* vertical minus margin of .img-detail corresponds to the padding of .page */ diff --git a/css/toollist.less b/css/toollist.less index 1cd2459..c2f69d5 100644 --- a/css/toollist.less +++ b/css/toollist.less @@ -1,11 +1,10 @@ /** * Styles for site tools and user tools in sidebar - * * Using BEM methodology as far as possible */ -.toollist { -} +//.toollist { +//} .toollist__listitem { list-style: none; From 1ebf485ec51876cce55f8efd942a43eb2d1be030 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 10 Apr 2019 23:53:22 +0200 Subject: [PATCH 020/142] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 0f10eae..cb9b1c7 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-03-21 +date 2019-04-03 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 8606ceef9fc2b70f02266daa51e2b2a29b5d8bf4 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 11 Apr 2019 12:15:15 +0200 Subject: [PATCH 021/142] split variables and base styles This makes it possible to separately load the variables if needed --- css/base.less | 182 +-------------------------------------------- css/base_vars.less | 179 ++++++++++++++++++++++++++++++++++++++++++++ style.ini | 1 + 3 files changed, 181 insertions(+), 181 deletions(-) create mode 100644 css/base_vars.less diff --git a/css/base.less b/css/base.less index ba4e2f0..028c895 100755 --- a/css/base.less +++ b/css/base.less @@ -1,189 +1,9 @@ /** - * This file provides the basic vars and reset styles. + * This file provides the basic/reset styles. * * @author Jana Deutschlaender */ - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* global vars */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - -@font_family_screen: arial, sans-serif; -@font_family_print: "Times New Roman", serif; - -@nav_direct_background: @ini_background; -@nav_direct_color: @ini_existing; - -@background_darker: rgba(230,230,230, .2); -@ini_sidebar_width: (100 - @ini_site_width) - 4; - -@height-context-bar: 50px; - -@margin-small: 1rem; -@margin-default: 2rem; -@margin-big: 3.07rem; -@nav-margin: 1.3rem; - -@small-spacing: .3rem; -@very-small-spacing: .2rem; - -@grid: @margin-small; -@toggle-size: 1.75rem; - -@transition: ease-out .30s; - -@box-shadow-offset: .1em .1em .1em rgba(153,153,153,.5); // tabinclude -@box-shadow: 0 0 .5em rgba(153,153,153,.5); // pagetoolbox hover -@box-shadow-colored: 0 0 .5em fade(@ini_existing, 50%); -@box-shadow-right-bottom: .1em .3rem .5em rgba(153,153,153,.5); -@box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor - - -/* + + + for programmers customizing + + + */ - -@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg - -@toggle-showsidebar_width: 3.47rem; // shown sidebar after toggle - -@headericons-margin-xxs: .45rem; // screen xxs margin-top for header icons - -@page_padding-top: @margin-small; // padding-top for 'dokuwiki__content' -@page-header_height: 2.8rem; // minimum: 2.8rem (height for breadcrumb, page-header, page-footer) -@meta-box_height: (@page-header_height - @page_padding-top); -@breadcrumb_height: @page-header_height; - -@formfield_min-height: 2rem; // min-height for input, textarea, select, keygen - -@code-background: #F6F6F6; /* code, pre, samp, kbd */ - - -/* icons */ -@noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude */ -@noopentasks-border: #BBB; /* metabox tabs + num in icons + code, pre, samp, kbd */ -@noopentasks-color: #666; /* metabox tabs + num in icons + code, pre, samp, kbd */ -@wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */ - - - -/* navigation left */ -@menu-margin-lg: 1.3rem; - -@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */ -@suggestion-zebra: #EEE; - - -/* edit mode */ -@highlight-odd-ini_text: fade(@ini_background, 95%); -@highlight-even-ini_text: fade(@ini_text, 5%); -@color-editBox: #252525; // editmode for tables, revision states - - -//@nolinkedicon-ini_background: fade(@ini_background_site, 10%); -//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%); - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* fonts */ - -@font-size-very-small: .73rem; -@font-size-small: .88rem; -@font-size-default: 1rem; -@font-size-big: 1.5rem; -@font-size-bigger: 1.75rem; - -@line-height-default: 125%; -@line-height-big: 135%; -@line-height-bigger: 140%; - -@font-weight-bold: 800; -@font-weight-normal: 400; - -@font-scale-factor: .0769; - -@font-size-head6: @font-size-default; -@font-size-head5: @font-size-default + @font-scale-factor; -@font-size-head4: @font-size-default + (@font-scale-factor * 3); -@font-size-head3: @font-size-default + (@font-scale-factor * 5); -@font-size-head2: @font-size-default + (@font-scale-factor * 7); -@font-size-head1: @font-size-default + (@font-scale-factor * 9); - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* breakpoints */ - -@break-min-xxs: 480; -@break-max-xxs: (@break-min-xxs - 1); - -@break-min-xs: 768; -@break-max-xs: (@break-min-xs - 1); - -@break-min-sm: 992; -@break-max-sm: (@break-min-sm - 1); - -@break-min-md: 1024; -@break-max-md: (@break-min-md - 1); - -@break-min-lg: 1200; -@break-max-lg: (@break-min-lg - 1); - -@break-min-xlg: 1440; -@break-max-xlg: (@break-min-xlg - 1); - -@break-min-xxlg: 1600; -@break-max-xxlg: (@break-min-xxlg - 1); - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* media queries for breakpoints */ - -@screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)"; -@screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)"; - -@screen_min-xs: ~"only screen and (min-width: " ~"@{break-min-xs}px)"; -@screen_max-xs: ~"only screen and (max-width: " ~"@{break-max-xs}px)"; - -@screen_min-sm: ~"only screen and (min-width: " ~"@{break-min-sm}px)"; -@screen_max-sm: ~"only screen and (max-width: " ~"@{break-max-sm}px)"; - -@screen_min-md: ~"only screen and (min-width: " ~"@{break-min-md}px)"; -@screen_max-md: ~"only screen and (max-width: " ~"@{break-max-md}px)"; - -@screen_min-lg: ~"only screen and (min-width: " ~"@{break-min-lg}px)"; -@screen_max-lg: ~"only screen and (max-width: " ~"@{break-max-lg}px)"; - -@screen_min-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px)"; -@screen_max-xlg: ~"only screen and (max-width: " ~"@{break-max-xlg}px)"; - -@screen_min-xxlg: ~"only screen and (min-width: " ~"@{break-min-xxlg}px)"; -@screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-xxlg}px)"; - -@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)"; -@screen_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)"; -@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)"; -@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)"; -@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)"; - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* col width */ - -@c12: 100%; -@c11: 91.66666667%; -@c10: 83.33333333%; -@c9: 75%; -@c8: 66.66666667%; -@c7: 58.33333333%; -@c6: 50%; -@c5: 41.66666667%; -@c4: 33.33333333%; -@c3: 25%; -@c2: 16.66666667%; -@c1: 8.33333333%; - -@grid-columns: 12; - - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* all media */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ diff --git a/css/base_vars.less b/css/base_vars.less new file mode 100644 index 0000000..4dc633e --- /dev/null +++ b/css/base_vars.less @@ -0,0 +1,179 @@ +/** + * This file provides the basic vars + * + * @author Jana Deutschlaender + */ + +@font_family_screen: arial, sans-serif; +@font_family_print: "Times New Roman", serif; + +@nav_direct_background: @ini_background; +@nav_direct_color: @ini_existing; + +@background_darker: rgba(230,230,230, .2); +@ini_sidebar_width: (100 - @ini_site_width) - 4; + +@height-context-bar: 50px; + +@margin-small: 1rem; +@margin-default: 2rem; +@margin-big: 3.07rem; +@nav-margin: 1.3rem; + +@small-spacing: .3rem; +@very-small-spacing: .2rem; + +@grid: @margin-small; +@toggle-size: 1.75rem; + +@transition: ease-out .30s; + +@box-shadow-offset: .1em .1em .1em rgba(153,153,153,.5); // tabinclude +@box-shadow: 0 0 .5em rgba(153,153,153,.5); // pagetoolbox hover +@box-shadow-colored: 0 0 .5em fade(@ini_existing, 50%); +@box-shadow-right-bottom: .1em .3rem .5em rgba(153,153,153,.5); +@box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor + + +/* + + + for programmers customizing + + + */ + +@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg + +@toggle-showsidebar_width: 3.47rem; // shown sidebar after toggle + +@headericons-margin-xxs: .45rem; // screen xxs margin-top for header icons + +@page_padding-top: @margin-small; // padding-top for 'dokuwiki__content' +@page-header_height: 2.8rem; // minimum: 2.8rem (height for breadcrumb, page-header, page-footer) +@meta-box_height: (@page-header_height - @page_padding-top); +@breadcrumb_height: @page-header_height; + +@formfield_min-height: 2rem; // min-height for input, textarea, select, keygen + +@code-background: #F6F6F6; /* code, pre, samp, kbd */ + + +/* icons */ +@noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude */ +@noopentasks-border: #BBB; /* metabox tabs + num in icons + code, pre, samp, kbd */ +@noopentasks-color: #666; /* metabox tabs + num in icons + code, pre, samp, kbd */ +@wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */ + + + +/* navigation left */ +@menu-margin-lg: 1.3rem; + +@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */ +@suggestion-zebra: #EEE; + + +/* edit mode */ +@highlight-odd-ini_text: fade(@ini_background, 95%); +@highlight-even-ini_text: fade(@ini_text, 5%); +@color-editBox: #252525; // editmode for tables, revision states + + +//@nolinkedicon-ini_background: fade(@ini_background_site, 10%); +//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%); + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* fonts */ + +@font-size-very-small: .73rem; +@font-size-small: .88rem; +@font-size-default: 1rem; +@font-size-big: 1.5rem; +@font-size-bigger: 1.75rem; + +@line-height-default: 125%; +@line-height-big: 135%; +@line-height-bigger: 140%; + +@font-weight-bold: 800; +@font-weight-normal: 400; + +@font-scale-factor: .0769; + +@font-size-head6: @font-size-default; +@font-size-head5: @font-size-default + @font-scale-factor; +@font-size-head4: @font-size-default + (@font-scale-factor * 3); +@font-size-head3: @font-size-default + (@font-scale-factor * 5); +@font-size-head2: @font-size-default + (@font-scale-factor * 7); +@font-size-head1: @font-size-default + (@font-scale-factor * 9); + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* breakpoints */ + +@break-min-xxs: 480; +@break-max-xxs: (@break-min-xxs - 1); + +@break-min-xs: 768; +@break-max-xs: (@break-min-xs - 1); + +@break-min-sm: 992; +@break-max-sm: (@break-min-sm - 1); + +@break-min-md: 1024; +@break-max-md: (@break-min-md - 1); + +@break-min-lg: 1200; +@break-max-lg: (@break-min-lg - 1); + +@break-min-xlg: 1440; +@break-max-xlg: (@break-min-xlg - 1); + +@break-min-xxlg: 1600; +@break-max-xxlg: (@break-min-xxlg - 1); + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* media queries for breakpoints */ + +@screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)"; +@screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)"; + +@screen_min-xs: ~"only screen and (min-width: " ~"@{break-min-xs}px)"; +@screen_max-xs: ~"only screen and (max-width: " ~"@{break-max-xs}px)"; + +@screen_min-sm: ~"only screen and (min-width: " ~"@{break-min-sm}px)"; +@screen_max-sm: ~"only screen and (max-width: " ~"@{break-max-sm}px)"; + +@screen_min-md: ~"only screen and (min-width: " ~"@{break-min-md}px)"; +@screen_max-md: ~"only screen and (max-width: " ~"@{break-max-md}px)"; + +@screen_min-lg: ~"only screen and (min-width: " ~"@{break-min-lg}px)"; +@screen_max-lg: ~"only screen and (max-width: " ~"@{break-max-lg}px)"; + +@screen_min-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px)"; +@screen_max-xlg: ~"only screen and (max-width: " ~"@{break-max-xlg}px)"; + +@screen_min-xxlg: ~"only screen and (min-width: " ~"@{break-min-xxlg}px)"; +@screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-xxlg}px)"; + +@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)"; +@screen_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)"; +@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)"; +@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)"; +@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)"; + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* col width */ + +@c12: 100%; +@c11: 91.66666667%; +@c10: 83.33333333%; +@c9: 75%; +@c8: 66.66666667%; +@c7: 58.33333333%; +@c6: 50%; +@c5: 41.66666667%; +@c4: 33.33333333%; +@c3: 25%; +@c2: 16.66666667%; +@c1: 8.33333333%; + +@grid-columns: 12; diff --git a/style.ini b/style.ini index 35dae3b..1fc6abc 100755 --- a/style.ini +++ b/style.ini @@ -50,6 +50,7 @@ ; _____________ basic styles _____________ +css/base_vars.less = all css/base.less = all css/base_mixins.less = all css/base_fontello-icons.less = all From b026e6a8fdfa38bd10aebd0712309938cbd0bde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Thu, 11 Apr 2019 15:31:39 +0200 Subject: [PATCH 022/142] #30: Make both logo and login clickable in Compact Mode --- css/base_structure.less | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/css/base_structure.less b/css/base_structure.less index db637bd..04229e6 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -135,8 +135,8 @@ .top-header { position: absolute; top: 0; - left: 0; - width: 100%; + right: 0; + width: 50%; } .header, @@ -172,7 +172,6 @@ .row > .col-xs-12 { height: auto; min-height: auto; - z-index: 3; } } } From 60176978c49539edeaa60966d50dc4b164402f17 Mon Sep 17 00:00:00 2001 From: Anna Dabrowska Date: Thu, 11 Apr 2019 16:10:47 +0200 Subject: [PATCH 023/142] Add CSS for plugin tablelayout --- css/plugins/tablelayout.less | 19 +++++++++++++++++++ style.ini | 1 + 2 files changed, 20 insertions(+) create mode 100644 css/plugins/tablelayout.less diff --git a/css/plugins/tablelayout.less b/css/plugins/tablelayout.less new file mode 100644 index 0000000..9aa6149 --- /dev/null +++ b/css/plugins/tablelayout.less @@ -0,0 +1,19 @@ +/** + * This file provides styles for "tablelayout plugin" + */ + + +/* + + + + + global + + + + + */ + +#dokuwiki__content.main-content .secedit.editbutton_table{ + a.button.print { + min-height: 1rem; + background-color: @ini_background; + border-radius: 0 @ini_default_border_radius; + border-top: solid 1px; + border-color: @ini_border; + font-size: .88rem; + margin-top: -1px; + padding-right: .3em; + } +} diff --git a/style.ini b/style.ini index 1fc6abc..290b764 100755 --- a/style.ini +++ b/style.ini @@ -107,6 +107,7 @@ css/plugins/tabinclude.less = all css/plugins/tagging.less = all css/plugins/include.less = all css/plugins/edittable.less = all +css/plugins/tablelayout.less = all css/plugins/extension__manager.less = all css/plugins/folded.less = all css/plugins/configmanager.less = all From 90a2bd4c991c6809481fa7e53a5e6689135f060d Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Thu, 11 Apr 2019 23:53:14 +0200 Subject: [PATCH 024/142] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index cb9b1c7..9f94c45 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-04-03 +date 2019-04-11 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From 0b9678aaf3dcc006dac0ba171130c123181b0e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 17 Apr 2019 16:26:19 +0200 Subject: [PATCH 025/142] #39: Bugfix for missing checkbox in media revisions --- css/plugins/mediamanager.less | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/css/plugins/mediamanager.less b/css/plugins/mediamanager.less index 346309e..d7384d6 100644 --- a/css/plugins/mediamanager.less +++ b/css/plugins/mediamanager.less @@ -17,6 +17,12 @@ ul.tabs li a { border-bottom-color: transparent; } + + #page__revisions { + > .no > ul > li input[type="checkbox"] { + margin-left: 0; + } + } } /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ From 14894a20c76bd65c29d5b14eee7dc89ddaa35c35 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Wed, 17 Apr 2019 23:53:12 +0200 Subject: [PATCH 026/142] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index 9f94c45..cd2d771 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-04-11 +date 2019-04-17 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From c1ed1dae53eb95ae0decd30f39704799ec96f104 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 23 Apr 2019 16:49:54 +0200 Subject: [PATCH 027/142] added github autoreply --- .github/auto-comment.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/auto-comment.yml diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml new file mode 100644 index 0000000..f6a72e3 --- /dev/null +++ b/.github/auto-comment.yml @@ -0,0 +1,9 @@ +# auto replies used by probot/auto-comment + +issuesOpened: > + Thank you for opening this issue. + + [CosmoCode](https://www.cosmocode.de) is a software company in Berlin providing services for wiki, app and web development. As such we can't guarantee quick responses for issues opened on our Open Source projects. + + If you require certain features or bugs fixed, you can always hire us. Feel free to contact us at dokuwiki@cosmocode.de for an offer. + From ef9362aae45cff9ce2b28b225c6543d422a904c7 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Tue, 23 Apr 2019 23:53:17 +0200 Subject: [PATCH 028/142] Version upped --- template.info.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.info.txt b/template.info.txt index cd2d771..b713beb 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender email dokuwiki@cosmocode.de -date 2019-04-17 +date 2019-04-23 name sprintDoc Template desc modern, responsive template that integrates multiple plugins url https://www.dokuwiki.org/template:sprintdoc From e78ffc6c795d20035c6384a96b80f1b7249a7578 Mon Sep 17 00:00:00 2001 From: Anna Dabrowska Date: Mon, 13 May 2019 18:19:31 +0200 Subject: [PATCH 029/142] Separate states of different sidebars --- Template.php | 5 +++-- js/sidebar.js | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Template.php b/Template.php index 32f4920..7f93528 100644 --- a/Template.php +++ b/Template.php @@ -115,10 +115,11 @@ class Template { global $ID; global $conf; + // id of the current sidebar, each sidebar must have its own state + $header = sprintf('
', page_findnearest($conf['sidebar'])); // add tabs if multiple navigation types available - $header = ''; if ($this->plugins['sitemapnavi'] !== null) { - $header = '