From 5e00b7a4e35193e1ecc64e6b64338fc25b866c70 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Mon, 10 Apr 2017 13:11:17 +0200
Subject: [PATCH 01/11] SPR-742: Konfigurierbarkeit history colors
---
css/area_forms.less | 50 ++++---------
css/area_recent.less | 163 +++++++++++++++++++++++++++++++++++++++++++
css/base.less | 2 +-
style.ini | 1 +
4 files changed, 179 insertions(+), 37 deletions(-)
create mode 100644 css/area_recent.less
diff --git a/css/area_forms.less b/css/area_forms.less
index 6469546..3d329be 100644
--- a/css/area_forms.less
+++ b/css/area_forms.less
@@ -25,34 +25,6 @@ form {
width: 48.5%;
}
}
-
-
- // older version (history)
- .dokuwiki & > .no > ul > li {
- min-height: 2rem;
- vertical-align: baseline;
-
- a,
- span,
- img {
- vertical-align: baseline;
- }
-
- img {
- margin-left: 4px;
- margin-right: 4px;
- }
-
- input[type="checkbox"] {
- margin-bottom: .2rem;
- }
-
- span.user bdi {
- a {
- vertical-align: baseline;
- }
- }
- }
}
fieldset {
@@ -130,6 +102,20 @@ keygen {
padding-right: .3rem;
}
+input[type="radio"],
+input[type="checkbox"] {
+ min-height: 1rem;
+}
+
+input[type="radio"],
+input[type="checkbox"],
+input[type="image"] {
+ padding: 0;
+ border-style: none;
+ //box-shadow: none; :in ie picture and checkbox disappear
+}
+
+
input:active,
input:focus,
textarea:active,
@@ -141,14 +127,6 @@ keygen:focus {
border-color: #999;
}
-input[type="radio"],
-input[type="checkbox"],
-input[type="image"] {
- padding: 0;
- border-style: none;
- box-shadow: none;
-}
-
input[type="file"] {
padding-top: .1rem;
padding-bottom: .1rem;
diff --git a/css/area_recent.less b/css/area_recent.less
new file mode 100644
index 0000000..a24ca63
--- /dev/null
+++ b/css/area_recent.less
@@ -0,0 +1,163 @@
+/**
+ * This file provides the design styles for page revisions
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
+.dokuwiki {
+
+/* + + + + + list of changes + + + + + */
+ form.changes {
+ li {
+ .sizechange {
+ color: @color-editBox;
+
+ &.positive {
+ background-color: #cfc;
+ }
+
+ &.negative {
+ background-color: #fdd;
+ }
+ }
+ }
+
+ > .no > ul > li {
+ min-height: @formfield_min-height;
+ vertical-align: baseline;
+ margin-bottom: @small-spacing;
+
+ .li {
+ line-height: 150%;
+
+ > * {
+ min-height: 10px;
+ }
+ }
+
+ a,
+ span,
+ img {
+ vertical-align: baseline;
+ }
+
+ img {
+ margin-left: @small-spacing;
+ margin-right: @small-spacing;
+ }
+
+ input[type="checkbox"] {
+ margin: 0 .5rem .2rem -1.5rem;
+ }
+
+ span.user bdi {
+ a {
+ vertical-align: baseline;
+ }
+ }
+ }
+ }
+
+
+/* + + + + + view of differents + + + + + */
+ a.difflink {
+ color: @ini_existing;
+
+ * {
+ color: inherit;
+ }
+ }
+
+ .diffnav {
+ a {
+ background-color: @ini_background;
+ border: solid 1px @ini_background;
+ border-radius: @ini_default_border_radius;
+ color: @ini_nav_menu_color;
+ transition: @transition background-color, @transition color, @transition border-color;
+
+ &::before {
+ background-color: inherit;
+ border: 0 none;
+ color: inherit;
+ }
+
+ &:hover,
+ &:focus,
+ &:active {
+ background-color: @ini_nav_menu_color;
+ border: solid 1px @ini_nav_menu_color;
+ color: @ini_background;
+
+ &::before {
+ background-color: inherit;
+ color: inherit;
+ }
+ }
+ }
+ }
+
+ table.diff {
+ background-color: #fff;
+ border: solid 1px #fff;
+ border-top-width: 10px;
+ border-bottom-width: 10px;
+
+ &.diff_inline {
+ border-top-width: 0;
+
+ .diffnav {
+ padding-top: 10px;
+ padding-bottom: 10px;
+ }
+ }
+
+ th {
+ background-color: @ini_background_content;
+ color: @ini_text;
+ padding-top: 10px;
+ padding-bottom: 10px;
+
+ &.minor {
+ color: #999;
+ }
+ }
+
+ td {
+ &.diff-blockheader {
+ background-color: #cfc;
+ color: @color-editBox;
+ }
+
+ &.diff-context {
+ background-color: #eee;
+ color: @color-editBox;
+ }
+ }
+
+ .diff-addedline {
+ background-color: #cfc;
+ color: @color-editBox;
+
+ strong {
+ background-color: transparent;
+ color: #f00;
+ }
+ }
+
+ .diff-deletedline {
+ background-color: #fdd;
+ color: @color-editBox;
+
+ * {
+ color: inherit;
+ }
+
+ strong {
+ background-color: transparent;
+ color: #f00;
+ }
+ }
+ }
+}
diff --git a/css/base.less b/css/base.less
index 8d8a53f..aa93313 100755
--- a/css/base.less
+++ b/css/base.less
@@ -69,7 +69,7 @@
/* edit mode */
@highlight-odd-ini_text: fade(@ini_background_content, 95%);
@highlight-even-ini_text: fade(@ini_text, 5%);
-@color-editBox: #252525; // editmode for tables
+@color-editBox: #252525; // editmode for tables, revision states
//@nolinkedicon-ini_background: fade(@ini_background, 10%);
diff --git a/style.ini b/style.ini
index 1fd8b20..64a8289 100755
--- a/style.ini
+++ b/style.ini
@@ -79,6 +79,7 @@ css/area_togglelink.less = all
css/area_forms.less = all
css/area_search.less = all
css/area_tabs.less = all
+css/area_recent.less = all
css/template_admin.less = all
From 068280a2210ea5cc3e82602077940e97fb25a74d Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Mon, 10 Apr 2017 13:11:39 +0200
Subject: [PATCH 02/11] SPR-908: QS - padding in nav (aside)
---
css/area_main-sidebar-nav.less | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less
index 681dd4d..b01ce83 100755
--- a/css/area_main-sidebar-nav.less
+++ b/css/area_main-sidebar-nav.less
@@ -111,7 +111,7 @@
flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
- margin-right: @margin-small;
+ margin-right: 4%;
color: inherit;
// simple fake icon
From c2ab07c1193aa25828223e7153a1848b4a396d1d Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Mon, 10 Apr 2017 13:11:55 +0200
Subject: [PATCH 03/11] SPR-908: QS - comment
---
css/area_msg.less | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/css/area_msg.less b/css/area_msg.less
index 1e2ad9e..205b7ab 100644
--- a/css/area_msg.less
+++ b/css/area_msg.less
@@ -1,3 +1,10 @@
+/**
+ * This file provides the design styles for message block
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
.msg-area {
clear: both;
padding-top: 1.6rem;
From 242e80d53557283370047522d7fbef0686c04978 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Mon, 10 Apr 2017 13:12:45 +0200
Subject: [PATCH 04/11] SPR-908: QS - no break in <code> (except linebreak is
needed)
---
css/base_design.less | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/css/base_design.less b/css/base_design.less
index 9d68d7b..d56d117 100755
--- a/css/base_design.less
+++ b/css/base_design.less
@@ -514,6 +514,10 @@ pre {
padding: .7em 1em;
}
+code:not([class]) {
+ display: inline-block;
+}
+
blockquote {
border: solid @ini_border;
border-width: 0 0 0 .25em;
From 3002141dc6cded63a33426f4abd2d5897822eeb5 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Mon, 10 Apr 2017 13:13:11 +0200
Subject: [PATCH 05/11] SPR-908: QS - better transition in usertool icons
---
css/area_nav-usertools.less | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 87959cd..aec94c5 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -141,10 +141,6 @@
bdi,
bdi:first-of-type {
color: @ini_nav_menu_hover_bg;
-
- //&::before {
- // color: inherit;
- //}
}
}
}
@@ -152,7 +148,7 @@
bdi {
display: inline-block;
color: inherit;
- transition: @transition color;
+ //transition: @transition color;
}
bdi:first-of-type {
@@ -168,7 +164,7 @@
left: -2px;
font-size: 1.4rem;
margin: 0;
- transition: @transition color;
+ //transition: @transition color;
@media @screen_min-xxlg {
top: -.25rem;
From 8aca7d1e5b17e27bcc5b558ebb69235fda98eef2 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Mon, 10 Apr 2017 13:33:51 +0200
Subject: [PATCH 06/11] SPR-908: QS - ie11
---
css/area_nav-usertools.less | 5 +++++
css/base.less | 1 +
2 files changed, 6 insertions(+)
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index aec94c5..65e9e7d 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -86,6 +86,7 @@
position: relative;
min-height: 26px;
+ height: 1rem; // for IE11
overflow: visible;
background: @ini_nav_menu_hover_bg; // for removing bg-image
border: 0 none;
@@ -95,6 +96,10 @@
margin-right: -.3rem;
padding: 0 .2em 0 0;
+ @media @screen_only-xlg {
+ padding-bottom: .1em;
+ }
+
@media @screen_min-xxlg {
margin-top: -(@space-min-xxlg);
}
diff --git a/css/base.less b/css/base.less
index aa93313..fa91942 100755
--- a/css/base.less
+++ b/css/base.less
@@ -153,6 +153,7 @@
@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)";
@screen_only-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
+@screen_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)";
@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";
From 485e7ff45a362a51fdfbe9dde90505c39a9f6641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= <grosse@cosmocode.de>
Date: Tue, 11 Apr 2017 14:43:40 +0200
Subject: [PATCH 07/11] Add tplinc locations above and below the sidebar
SPR-921
---
Template.php | 2 ++
main.php | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/Template.php b/Template.php
index e221821..7eae3ae 100644
--- a/Template.php
+++ b/Template.php
@@ -49,6 +49,8 @@ class Template {
*/
public function registerIncludes(\Doku_Event $event) {
$event->data['footer'] = 'Footer below the page content';
+ $event->data['sidebarfooter'] = 'Footer below the sidebar';
+ $event->data['sidebarheader'] = 'Header above the sidebar';
}
/**
diff --git a/main.php b/main.php
index ee84e6e..35bb210 100755
--- a/main.php
+++ b/main.php
@@ -177,12 +177,29 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</div><!-- .search -->
<div id="dokuwiki__aside">
+
+ <?php
+ echo Template::getInstance()->getInclude(
+ 'sidebarheader',
+ '<div class="sidebarheader">',
+ '<div class="clearer"></div></div>'
+ );
+ ?>
+
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* sidebar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/main-sidebar-nav.php');
?>
+
+ <?php
+ echo Template::getInstance()->getInclude(
+ 'sidebarfooter',
+ '<div class="sidebarfooter">',
+ '<div class="clearer"></div></div>'
+ );
+ ?>
</div><!-- .aside -->
</div><!-- .col -->
From 31abc4ae3d69d3e07b4b5378a82d458722fb7efe Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Wed, 12 Apr 2017 12:04:06 +0200
Subject: [PATCH 08/11] SPR-908: QS - header with magicmatcher
---
css/area_header.less | 31 +++++++++++++++++++++++++++++++
main.php | 30 +++++++++++++++++++-----------
2 files changed, 50 insertions(+), 11 deletions(-)
diff --git a/css/area_header.less b/css/area_header.less
index e02bf1a..0225a71 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -150,4 +150,35 @@
}
}
}
+
+
+/* + + + + + with magic matcher + + + + + */
+ &.has-magicmatcher {
+ .logo {
+ @media @screen_min-md {
+ padding-top: 2rem;
+ }
+ }
+
+ .main-title.desktop-only {
+ @media @screen_min-md {
+ vertical-align: bottom;
+ padding-top: @height-context-bar;
+ padding-bottom: 1rem;
+ }
+
+ p.title {
+ @media @screen_min-md {
+ margin-right: 16rem;
+ }
+ }
+
+ p.claim {
+ @media @screen_max-md {
+ display: block;
+ padding-bottom: 1rem;
+ }
+ }
+ }
+ }
}
diff --git a/main.php b/main.php
index d4d546b..7b26a44 100755
--- a/main.php
+++ b/main.php
@@ -82,9 +82,26 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
/* Include Hook: header.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('header.html');
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* User Tools and MagicMatcher Bar */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+ /** @var \helper_plugin_magicmatcher_context $mm */
+ $mm = plugin_load('helper', 'magicmatcher_context');
+ $headerClass = ""; /* for additionial class in #dokuwiki__header */
+ $navClass = ""; /* for additionial class in #dokuwiki__usertools (header.html) */
+
+ if($mm){
+ $matcher = $mm->getIssueContextBar();
+ if($matcher !== ""){
+ $headerClass = "has-magicmatcher";
+ $navClass = "has-bar";
+ }
+ }
?>
- <div id="dokuwiki__header" class="header no-print">
+ <div id="dokuwiki__header" class="header <?php echo $headerClass; ?> no-print">
<div class="container">
<div class="row">
<div class="col-xs-12">
@@ -110,6 +127,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</div><!-- .headings -->
</div><!-- .col -->
+
<div class="col-xs-12">
<div class="main-title desktop-only">
<?php if ($conf['title']):
@@ -196,16 +214,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* User Tools and MagicMatcher Bar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
- /** @var \helper_plugin_magicmatcher_context $mm */
- $mm = plugin_load('helper', 'magicmatcher_context');
- $navClass = "";
- if($mm){
- $matcher = $mm->getIssueContextBar();
- if($matcher !== ""){
- $navClass = "has-bar";
- }
- }
-
include('tpl/nav-usertools-buttons.php');
if($mm && $matcher !== ""){
include('tpl/nav-magicmatcher.php');
From 1c73fa5363118743304ae92bb0a2d5d96d4c1927 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Wed, 12 Apr 2017 12:04:15 +0200
Subject: [PATCH 09/11] SPR-908: QS - code
---
css/area_nav-usertools.less | 3 ---
1 file changed, 3 deletions(-)
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 65e9e7d..d7c942f 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -129,7 +129,6 @@
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: inherit;
transform: none;
- //transition: @transition opacity;
}
&:hover,
@@ -153,7 +152,6 @@
bdi {
display: inline-block;
color: inherit;
- //transition: @transition color;
}
bdi:first-of-type {
@@ -169,7 +167,6 @@
left: -2px;
font-size: 1.4rem;
margin: 0;
- //transition: @transition color;
@media @screen_min-xxlg {
top: -.25rem;
From 4887064b868962f3bc08107a3a438c2d90d35ef4 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Thu, 13 Apr 2017 13:03:29 +0200
Subject: [PATCH 10/11] SPR-908: QS - variablennutzung
---
css/area_forms.less | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/css/area_forms.less b/css/area_forms.less
index 3d329be..996bd68 100644
--- a/css/area_forms.less
+++ b/css/area_forms.less
@@ -183,14 +183,14 @@ button[type=submit],
}
button[type='reset'] {
- min-height: 2rem;
+ min-height: @formfield_min-height;
vertical-align: middle;
padding: .3em 1rem;
}
input[type=submit],
button[type=submit] {
- min-height: 2rem;
+ min-height: @formfield_min-height;
vertical-align: middle;
&[disabled] {
From d3979d9e7a7664d6ed03415524bb192c1924dab3 Mon Sep 17 00:00:00 2001
From: Silke Pisulla <pisulla@cosmocode.de>
Date: Thu, 13 Apr 2017 13:03:59 +0200
Subject: [PATCH 11/11] SPR-899: struct inline-editor styling
---
css/base.less | 8 ++++----
css/plugins/struct.less | 21 +++++++++++++++++++--
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/css/base.less b/css/base.less
index fa91942..4c4352f 100755
--- a/css/base.less
+++ b/css/base.less
@@ -31,11 +31,11 @@
@transition: ease-out .30s;
-@box-shadow-offset: .1em .1em .1em rgba(153,153,153,.5); // pagetools, tabinclude
-@box-shadow: 0 0 .5em rgba(153,153,153,.5);
+@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: 0.1em 0.3rem 0.5em rgba(153,153,153,.5);
-@box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper - breadcrumb
+@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 + + + */
diff --git a/css/plugins/struct.less b/css/plugins/struct.less
index 1f9998b..7bb1df7 100755
--- a/css/plugins/struct.less
+++ b/css/plugins/struct.less
@@ -95,8 +95,25 @@
}
}
-.dokuwiki .struct_inlineditor {
- z-index: 3;
+
+/* + + + + + struct inline-editor + + + + + */
+.dokuwiki {
+ .struct_inlineditor {
+ z-index: 3;
+ box-shadow: @box-shadow-bottom;
+
+ .hint p {
+ color: @color-editBox;
+ margin-top: @small-spacing;
+ margin-bottom: @margin-small;
+ }
+
+ button[type="submit"] + button {
+ min-height: @formfield_min-height;
+ vertical-align: middle;
+ margin-left: @small-spacing;
+ }
+ }
}