diff --git a/css/area_footer.less b/css/area_footer.less
index 86f66d6..a76bb4b 100755
--- a/css/area_footer.less
+++ b/css/area_footer.less
@@ -26,10 +26,11 @@
}
bdi {
- font-weight: bold;
- max-width: 100%;
display: inline-block;
- overflow: auto;
+ max-width: 100%;
+ overflow-x: auto;
+ overflow-y: hidden;
+ font-weight: bold;
vertical-align: bottom;
}
}
@@ -39,7 +40,7 @@
position: relative;
z-index: 2;
box-sizing: border-box;
- background-color: @ini_background;
+ background-color: @ini_background_site;
}
p {
diff --git a/css/area_header.less b/css/area_header.less
index 0225a71..eedc601 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -8,14 +8,13 @@
#dokuwiki__header {
@header-font-opacity: 1;
+ @media @screen_max-xs {
+ min-height: 120px;
+ }
+
+
/* + + + wiki logo + + + */
@media @screen_min-md {
- div.claim {
- display: table-cell;
- height: 100%;
- vertical-align: middle;
- }
-
.logo {
padding: 1rem 0 .3rem;
@@ -48,7 +47,7 @@
}
-/* + + + wiki title + claim + + + */
+/* + + + + + DESKTOP - wiki title + claim + + + + + */
.main-title.desktop-only {
@media @screen_min-md {
display: table-cell;
@@ -70,20 +69,30 @@
display: block;
padding-bottom: 1rem;
}
+
+ @media @screen_max-xs {
+ padding-right: (@toggle-size + @headericons-margin-xxs);
+ }
}
}
+
+/* + + + + + MOBILE - wiki title wrapper + + + + + */
.main-title:not([class*="desktop-only"]) {
@media @screen_max-md {
display: table-cell;
vertical-align: middle;
}
+
+ @media @screen_max-xs {
+ padding-right: (@toggle-size + @headericons-margin-xxs);
+ }
}
/* + + + wiki title + + + */
p.title {
- background-color: @ini_background;
+ background-color: @ini_background_site;
opacity: @header-font-opacity;
color: @ini_text_webframe;
line-height: @line-height-default;
@@ -101,6 +110,16 @@
}
+/* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */
+ @media @screen_min-md {
+ div.claim {
+ display: table-cell;
+ height: 100%;
+ vertical-align: middle;
+ }
+ }
+
+
/* + + + wiki claim + + + */
p.claim {
opacity: @header-font-opacity;
@@ -116,7 +135,9 @@
/* + + + mobile nav togglelink + + + */
.menu-togglelink {
- margin: .45rem -(@very-small-spacing) 0 0;
+ position: relative;
+ z-index: 1;
+ margin: @headericons-margin-xxs -(@very-small-spacing) 0 0;
a {
.fontello();
@@ -156,7 +177,7 @@
&.has-magicmatcher {
.logo {
@media @screen_min-md {
- padding-top: 2rem;
+ padding-top: 3rem;
}
}
diff --git a/css/area_main-content.less b/css/area_main-content.less
index d5db8a5..da0ecd7 100755
--- a/css/area_main-content.less
+++ b/css/area_main-content.less
@@ -9,7 +9,7 @@
.level2 {
p a.media {
img {
- border: 1px dotted @ini_background;
+ border: 1px dotted @ini_background_site;
}
&:hover,
diff --git a/css/area_main-sidebar-content.less b/css/area_main-sidebar-content.less
index fb02fbe..1797837 100644
--- a/css/area_main-sidebar-content.less
+++ b/css/area_main-sidebar-content.less
@@ -4,16 +4,18 @@
#dokuwiki__aside {
-
- // do not indent the first level of lists
- // and use less indention in deeper levels
ul,
ol {
+ margin-left: -.4rem;
padding-left: 0;
ul,
ol {
- padding-left: @margin-small;
+ padding-left: 1.8rem;
+
+ @media @screen_md-lg {
+ padding-left: @menu-margin-lg;
+ }
li {
margin-left: 0;
@@ -51,9 +53,9 @@
right: 0;
width: 100%;
height: 100%;
- background: @ini_background;
- background: -webkit-linear-gradient(left, @ini_background, @ini_background_content);
- background: linear-gradient(left, @ini_background, @ini_background_content);
+ background: @ini_background_site;
+ background: -webkit-linear-gradient(left, @ini_background_site, @ini_background);
+ background: linear-gradient(left, @ini_background_site, @ini_background);
z-index: 0;
}
}
diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less
index 15c850d..44561ca 100755
--- a/css/area_main-sidebar-nav.less
+++ b/css/area_main-sidebar-nav.less
@@ -8,7 +8,7 @@
#dokuwiki__aside {
@icon-size: @font-size-big;
- @menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
+ @menu-margin: @icon-size + @margin-small * 2;
nav > p,
.mmissuelist li,
@@ -37,6 +37,11 @@
margin-left: 0;
}
}
+
+ li:not([class]),
+ .li {
+ padding: .15em 0;
+ }
}
@@ -70,6 +75,10 @@
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
+
+ @media @screen_md-lg {
+ margin-left: @menu-margin-lg;
+ }
}
a {
@@ -96,16 +105,20 @@
.align-items();
cursor: pointer;
- height: @icon-size + @margin-small;
+ min-height: @icon-size + @margin-small;
opacity: 1;
border: 1px solid transparent;
border-radius: @fix_border-radius;
color: @ini_nav_menu_color;
font-size: @font-size-head6;
font-weight: normal;
- margin: -1px 0 (@font-size-head6 / 2) (@menu-margin * -1); // moves the toggles back to the left
+ margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin - .4); // moves the toggles back to the left (.4 from li margin)
transition: @transition color, @transition background-color, @transition border-color;
+ @media @screen_md-lg {
+ margin-left: -(@menu-margin-lg + .8);
+ }
+
span {
display: inline-block;
vertical-align: middle;
@@ -114,12 +127,20 @@
span.lbl {
flex-grow: 1;
+
+ // wordbreak too late in IE 10
+ @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+ width: 100%;
+ box-sizing: border-box;
+ padding-right: 13px;
+ }
}
span.ico {
+ .flex(0 0 auto);
+
width: @menu-margin;
height: @icon-size;
- flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: 4%;
@@ -183,7 +204,23 @@
}
}
- // the panel (hidden by default)
+ // without wrapping UL
+ nav > a.nav {
+ margin-left: -3.5rem;
+
+ @media @screen_md-lg {
+ margin-left: -2.5rem;
+ }
+ }
+
+
+/* + + + + + active + + + + + */
+ span.curid a {
+ font-weight: bold;
+ }
+
+
+/* + + + + + the panel (hidden by default) + + + + + */
div.nav-panel {
display: none;
margin-top: .5rem;
@@ -236,7 +273,6 @@
li:not([class]),
.li {
font-size: @font-size-head6;
- padding: .15em 0;
* {
font-size: inherit;
@@ -304,7 +340,6 @@
li:not([class]),
.li {
font-size: @font-size-default;
- padding: .15em 0 .15em .25rem;
* {
font-size: inherit;
diff --git a/css/area_sidebar-search.less b/css/area_main-sidebar-search.less
old mode 100755
new mode 100644
similarity index 97%
rename from css/area_sidebar-search.less
rename to css/area_main-sidebar-search.less
index dc7eedc..eeef1b3
--- a/css/area_sidebar-search.less
+++ b/css/area_main-sidebar-search.less
@@ -9,6 +9,10 @@
@icon-size: @page-header_height;
@icon-search_font-size: @font-size-big;
+ @media @screen_md-lg {
+ margin-left: -(@menu-margin-lg);
+ }
+
p.toggleSearch a,
button[type="submit"] {
.fontello();
@@ -165,10 +169,13 @@
}
}
+
+/* + + + + + suggestionlist + + + + + */
#qsearch__out {
left: auto;
top: auto;
width: 100%;
+ min-width: 20rem;
}
}
diff --git a/css/area_msg.less b/css/area_msg.less
index 205b7ab..6edc5c7 100644
--- a/css/area_msg.less
+++ b/css/area_msg.less
@@ -19,7 +19,10 @@
}
/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */
-div.success, div.error, div.info, div.notify {
+div.success,
+div.error,
+div.info,
+div.notify {
background-repeat: no-repeat;
background-position: 8px 50%;
border: 1px solid #eeb;
@@ -28,7 +31,7 @@ div.success, div.error, div.info, div.notify {
padding: .4em;
padding-left: 32px;
overflow: hidden;
- border-radius: 5px;
+ border-radius: @fix_border-radius;
* {
color: inherit;
diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less
index bcbce80..1c3818c 100755
--- a/css/area_nav-breadcrumb.less
+++ b/css/area_nav-breadcrumb.less
@@ -9,7 +9,7 @@
position: relative;
min-height: @page-header_height;
box-sizing: border-box;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border-bottom: 1px solid @ini_border_light;
padding: 1rem 1.8rem .2rem;
@@ -23,7 +23,7 @@
}
@media @screen_xs-lg {
- background-color: @ini_background_content;
+ background-color: @ini_background;
}
> p {
diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less
index 165d831..211dea3 100755
--- a/css/area_nav-metabox.less
+++ b/css/area_nav-metabox.less
@@ -102,9 +102,9 @@
transition: @transition background-color, @transition border-color, @transition color;
@media @screen_min-md {
- background-color: @ini_background;
+ background-color: @ini_background_site;
border: 1px solid @noopentasks-border;
- border-bottom-color: @ini_background;
+ border-bottom-color: @ini_background_site;
border-radius: @ini_default_border_radius @ini_default_border_radius 0 0; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_nav_menu_color;
margin-left: 4px;
@@ -137,15 +137,15 @@
text-decoration: none;
@media @screen_min-md {
- background-color: @ini_background_content;
+ background-color: @ini_background;
border-color: @ini_existing;
color: @ini_existing;
}
@media @screen_max-md {
background-color: @ini_existing;
- border-color: @ini_background_content;
- color: @ini_background_content;
+ border-color: @ini_background;
+ color: @ini_background;
}
}
}
@@ -155,16 +155,16 @@
> a {
cursor: default;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border-color: @ini_existing;
- border-bottom-color: @ini_background_content;
+ border-bottom-color: @ini_background;
color: @ini_existing;
@media @screen_max-md {
background-color: @ini_existing;
border-bottom-color: @ini_existing;
border-radius: 0;
- color: @ini_background_content;
+ color: @ini_background;
}
}
}
@@ -187,7 +187,7 @@
right: 0;
display: none;
width: 100%;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border: 1px solid @ini_existing;
@media @screen_min-xs {
diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less
index 40d2b06..d86af60 100755
--- a/css/area_nav-pagetools.less
+++ b/css/area_nav-pagetools.less
@@ -116,7 +116,7 @@ nav#dokuwiki__pagetools {
&:hover {
ul {
box-shadow: @box-shadow; // @box-shadow-offset;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border-color: @wikiicons-border;
li {
@@ -142,7 +142,7 @@ nav#dokuwiki__pagetools {
svg {
background-color: @ini_existing;
border-color: @ini_existing;
- fill: @ini_background_content;
+ fill: @ini_background;
}
}
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index d7c942f..26f5a1a 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -5,10 +5,25 @@
*/
-.nav-usertools {
+#dokuwiki__usertools.nav-usertools {
+ @media @screen_min-md {
+ right: 1.25rem;
+ }
+
+ @media @screen_max-md {
+ position: absolute;
+ top: 0;
+ left: (@toggle-size + 1.25); // margin-left content
+ right: @headericons-margin-xxs;
+ margin-top: 0;
+ margin-right: 0;
+ }
+
&.has-bar {
- margin-top: @height-context-bar;
- padding-top: .5em;
+ @media @screen_min-md {
+ margin-top: @height-context-bar;
+ padding-top: .5em;
+ }
}
@@ -25,7 +40,13 @@
float: right;
min-height: 28px;
- > strong,
+ @media @screen_max-xs {
+ display: block;
+ float: none;
+ margin-bottom: @headericons-margin-xxs;
+ }
+
+ > span,
> a {
display: block;
width: auto;
@@ -36,7 +57,7 @@
text-align: center;
margin: 0;
- @media @screen_only-lg {
+ @media @screen_md-xlg {
padding-top: .14rem;
}
@@ -47,6 +68,10 @@
@media @screen_max-md {
min-height: @toggle-size;
}
+
+ @media @screen_only-lg {
+ min-width: 2rem;
+ }
}
&.user {
@@ -57,8 +82,8 @@
position: relative;
display: table-cell;
- background-color: @ini_background;
- border: solid 1px @noopentasks-border;//@ini_border_light;
+ background-color: @ini_background_site;
+ border: solid 1px @wikiicons-border; // @ini_border_light;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe;
padding-right: .3rem;
@@ -80,6 +105,20 @@
padding-top: @space-max-md;
}
+ @media @screen_max-xs {
+ position: absolute;
+ top: @headericons-margin-xxs;
+ right: (@toggle-size + @headericons-margin-xxs);
+ overflow: hidden;
+ white-space: nowrap;
+ margin: -1px 0 0;
+ }
+
+ @media @screen_max-xxs {
+ left: -10px;
+ width: auto;
+ }
+
> a {
.display-flex();
.align-items();
@@ -117,6 +156,10 @@
margin-top: -(@space-max-md);
}
+ @media @screen_max-xxs {
+ min-height: (@toggle-size - .15);
+ }
+
&::before {
content: '';
top: -1px;
@@ -176,53 +219,13 @@
top: -.2rem;
}
- @media @screen_max-xxs {
+ @media @screen_max-xs {
top: -.25rem;
}
}
}
} // user
-
- &.user-task {
- position: relative;
-
- a {
- position: relative;
- overflow: visible;
- white-space: normal;
- text-indent: 0;
-
- &::before {
- content: '';
- position: absolute;
- }
- }
-
- .prefix {
- .btn-prefix();
- .icon-clipboard();
-
- display: block;
- font-size: 1.2rem;
- text-align: center;
- margin-bottom: -1px;
- }
- } // user-task
-
- &.noopentasks {
- strong {
- background-color: @ini_background;
- border-color: @noopentasks-border;
- color: @ini_text_webframe;
- }
-
- .num {
- background-color: @noopentasks-border; // fix
- color: @noopentasks-color; // fix
- margin-top: 1px;
- }
- }
} // li
@@ -237,7 +240,7 @@
line-height: 1;
text-decoration: none;
- @media @screen_only-lg {
+ @media @screen_md-xlg {
min-width: 2rem;
}
@@ -278,4 +281,4 @@
}
} // a
} // ul
-} // nav-usertools
+} // nav-usertools
\ No newline at end of file
diff --git a/css/area_recent.less b/css/area_recent.less
index a24ca63..0722639 100644
--- a/css/area_recent.less
+++ b/css/area_recent.less
@@ -71,8 +71,8 @@
.diffnav {
a {
- background-color: @ini_background;
- border: solid 1px @ini_background;
+ background-color: @ini_background_site;
+ border: solid 1px @ini_background_site;
border-radius: @ini_default_border_radius;
color: @ini_nav_menu_color;
transition: @transition background-color, @transition color, @transition border-color;
@@ -88,7 +88,7 @@
&:active {
background-color: @ini_nav_menu_color;
border: solid 1px @ini_nav_menu_color;
- color: @ini_background;
+ color: @ini_background_site;
&::before {
background-color: inherit;
@@ -114,7 +114,7 @@
}
th {
- background-color: @ini_background_content;
+ background-color: @ini_background;
color: @ini_text;
padding-top: 10px;
padding-bottom: 10px;
diff --git a/css/base.less b/css/base.less
index 54d6f25..e757f62 100755
--- a/css/base.less
+++ b/css/base.less
@@ -12,7 +12,7 @@
@font_family_screen: arial, sans-serif;
@font_family_print: "Times New Roman", serif;
-@nav_direct_background: @ini_background_content;
+@nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing;
@ini_sidebar_width: (100 - @ini_site_width) - 4;
@@ -40,10 +40,12 @@
/* + + + for programmers customizing + + + */
-@fix_border-radius: 3px;
+@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
@toggle-showsidebar_width: 3.07rem; // 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);
@@ -61,18 +63,21 @@
@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_content, 95%);
+@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, 10%);
+//@nolinkedicon-ini_background: fade(@ini_background_site, 10%);
//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%);
@@ -152,8 +157,9 @@
@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-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_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)";
diff --git a/css/base_design.less b/css/base_design.less
index 314d8d4..28155df 100755
--- a/css/base_design.less
+++ b/css/base_design.less
@@ -7,7 +7,7 @@
html, body {
- background-color: @ini_background;
+ background-color: @ini_background_site;
}
@@ -45,7 +45,7 @@ html, body {
font-size: @font-size-small;
border: solid @ini_background_alt;
border-width: 1px 1px 0;
- background-color: @ini_background;
+ background-color: @ini_background_site;
color: @ini_text_alt;
padding: .1em .35em;
border-top-left-radius: 2px;
@@ -59,7 +59,7 @@ html, body {
clear: both;
overflow: hidden;
word-wrap: break-word;
- background: @ini_background_content;
+ background: @ini_background;
color: inherit;
padding: @page_padding-top @margin-default @margin-default;
@@ -520,7 +520,7 @@ button img {
hr {
border-top: solid @ini_border;
- border-bottom: solid @ini_background;
+ border-bottom: solid @ini_background_site;
border-width: 1px 0;
height: 0;
text-align: center;
diff --git a/css/base_structure.less b/css/base_structure.less
index 5a588b7..f9ba184 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -161,20 +161,23 @@
}
}
+
+@media @screen_md-lg {
+ .wide-content.showSidebar {
+ .content {
+ .row > .col-xs-12 {
+ margin-left: 2.1rem;
+ }
+ }
+ }
+}
+
+
@media @screen_max-md {
.container {
margin: 0 1.25rem;
}
- #dokuwiki__usertools {
- margin-top: 0;
- max-width: 75%;
- position: absolute;
- top: 0;
- margin-right: 0;
- right: 1.25rem;
- }
-
.content {
position: relative;
@@ -205,10 +208,6 @@
left: @mobileMargin;
}
- #dokuwiki__usertools {
- right: @mobileMargin;
- }
-
#dokuwiki__footer {
.main-footer {
> * {
diff --git a/css/plugins/data.less b/css/plugins/data.less
new file mode 100644
index 0000000..56b264a
--- /dev/null
+++ b/css/plugins/data.less
@@ -0,0 +1,50 @@
+/**
+ * This file provides styles for old data plugin
+ * after importing struct data this can be deleted
+ */
+
+
+/* + + + + + global + + + + + */
+
+#dokuwiki__content {
+ .dataplugin_entry.mitarbeiter.sectionedit2 {
+ dl {
+ margin-left: 0;
+ margin-right: 0;
+ }
+
+ + .secedit.editbutton_plugin_data {
+ position: relative;
+ top: -1em; // as margin after DL
+ float: left;
+ font-size: @font-size-small; // for right position
+ margin-top: 0;
+
+ form {
+ button {
+ min-height: 1rem;
+ height: 1.8em;
+ background-color: @ini_background;
+ border-top: solid 1px @ini_button_background;
+ border-color: @ini_border;
+ border-radius: 0 0 @fix_border-radius @fix_border-radius;
+ color: @ini_existing;
+ font-size: @font-size-small;
+ line-height: 1.8em;
+ margin-top: -1px; // for right position
+ margin-left: .6em;
+ padding: 0 .3em;
+ transition: @transition background-color, @transition border-color, @transition color;
+
+ &:hover,
+ &:focus,
+ &:active {
+ background-color: @ini_existing;
+ border-color: @ini_existing;
+ color: @ini_background;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less
index b3aea69..f9fbe34 100755
--- a/css/plugins/do_tasks.less
+++ b/css/plugins/do_tasks.less
@@ -11,7 +11,7 @@ ul.page-attributes {
strong {
overflow: hidden;
- background-color: @ini_background;
+ background-color: @ini_background_site;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
@@ -24,3 +24,60 @@ ul.page-attributes {
}
}
}
+
+#dokuwiki__usertools.nav-usertools {
+ ul {
+ li {
+ &.user-task {
+ position: relative;
+
+ a {
+ overflow: visible;
+ white-space: normal; // Is this still needed?
+ text-indent: 0;
+
+ &::before {
+ content: ''; // remove when fontello is removed from usertools
+ }
+ }
+
+ svg {
+ width: 20px;
+ margin-top: 2px;
+
+ @media @screen_max-md {
+ margin-top: 4px;
+ }
+ }
+
+ &:hover {
+ :not(.noopentasks) {
+ svg path {
+ fill: @ini_background;
+ }
+ }
+ }
+
+ .noopentasks {
+ background-color: @ini_background;
+ border-color: @noopentasks-border;
+ color: @ini_text_webframe;
+
+ .num {
+ background-color: @noopentasks-border; // fix
+ color: @noopentasks-color; // fix
+ margin-top: 1px;
+ }
+ }
+
+ @media @screen_max-sm {
+ display: none;
+ }
+ } // user-task
+ } // li
+ } // ul
+}
+
+.plugin__do_usertasks_list {
+ z-index: 5;
+}
diff --git a/css/plugins/edit.less b/css/plugins/edit.less
index c4ff8b2..a07fe4a 100644
--- a/css/plugins/edit.less
+++ b/css/plugins/edit.less
@@ -22,7 +22,6 @@
div.editBox {
background-color: #FFF;
border: solid 2px #FFF;
- border-radius: @ini_default_border_radius;
.editButtons {
display: inline-block;
diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less
index 21cad08..ea979c7 100644
--- a/css/plugins/edittable.less
+++ b/css/plugins/edittable.less
@@ -16,9 +16,10 @@
button,
input.button {
min-height: 1rem;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
+ border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
margin-top: 0;
@@ -30,7 +31,7 @@
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
- color: @ini_background_content;
+ color: @ini_background;
}
}
}
diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less
index 9df6b82..3b1687e 100755
--- a/css/plugins/magic-matcher.less
+++ b/css/plugins/magic-matcher.less
@@ -12,6 +12,12 @@
left: 0;
width: 100%;
+ .container {
+ @media @screen_md-lg {
+ margin-left: 1.8rem;
+ }
+ }
+
#mm__issueselect_chosen {
max-width: 50%;
}
@@ -43,7 +49,7 @@
min-height: @height-context-bar;
box-sizing: border-box;
box-shadow: @box-shadow;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
font-size: @font-size-default;
padding: .8em 1em .5em;
diff --git a/css/plugins/struct.less b/css/plugins/struct.less
index 7bb1df7..e6df066 100755
--- a/css/plugins/struct.less
+++ b/css/plugins/struct.less
@@ -47,9 +47,11 @@
&.export {
bottom: 1px;
+ overflow-x: hidden;
background: transparent url("svg.php?svg=file-export.svg&f=existing") left center no-repeat;
background-size: auto 20px;
border: solid 1px @ini_border;
+ border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1;
@@ -63,7 +65,7 @@
background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content");
border-color: @ini_existing;
- color: @ini_background_content;
+ color: @ini_background;
text-decoration: none;
}
}
diff --git a/css/plugins/structstatus.less b/css/plugins/structstatus.less
new file mode 100644
index 0000000..4dfb2cb
--- /dev/null
+++ b/css/plugins/structstatus.less
@@ -0,0 +1,14 @@
+/**
+ * This file provides styles for structstatus plugin
+ */
+
+
+/* + + + + + global + + + + + */
+
+#dokuwiki__content {
+ .struct_status {
+ border-color: @ini_border;
+ border-radius: @fix_border-radius;
+ font-size: @font-size-small;
+ }
+}
diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less
index 8737ed4..c1f3b12 100644
--- a/css/plugins/tabinclude.less
+++ b/css/plugins/tabinclude.less
@@ -35,7 +35,7 @@ div#dwpl-ti-container {
&.selected {
position: relative;
z-index: 1;
- background-color: @ini_background_content;
+ background-color: @ini_background;
color: @ini_text;
}
}
@@ -48,7 +48,7 @@ div#dwpl-ti-container {
z-index: 0;
overflow: auto;
box-shadow: @box-shadow;
- background-color: @ini_background_content;
+ background-color: @ini_background;
border: solid 1px @ini_border;
border-radius: 0;
margin-top: -1px;
diff --git a/css/template_admin.less b/css/template_admin.less
index 285962a..6f4659d 100644
--- a/css/template_admin.less
+++ b/css/template_admin.less
@@ -52,7 +52,7 @@
svg {
width: 26px;
height: 26px;
- border: solid 1px @ini_background_content;
+ border: solid 1px @ini_background;
border-radius: @ini_default_border_radius;
fill: @ini_existing;
transition: @transition background-color, @transition border-color, @transition fill;
@@ -71,10 +71,10 @@
svg {
background-color: @ini_existing;
border-color: @ini_existing;
- fill: @ini_background_content;
+ fill: @ini_background;
path {
- fill: @ini_background_content;
+ fill: @ini_background;
}
}
}
diff --git a/css/template_detail.less b/css/template_detail.less
index ee9af44..d73eb28 100644
--- a/css/template_detail.less
+++ b/css/template_detail.less
@@ -36,7 +36,7 @@
img {
margin: 0;
display: block;
- border: 1px dotted @ini_background;
+ border: 1px dotted @ini_background_site;
position: relative;
z-index: 1;
}
diff --git a/lang/de/lang.php b/lang/de/lang.php
index 723c3fe..62db31d 100755
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -35,7 +35,6 @@ $lang['tab_tags'] = 'Tags';
$lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden';
$lang['prefix_tasks'] = 'offene Aufgaben: ';
-$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: ';
$lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: ';
$lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite';
@@ -55,14 +54,14 @@ $lang['image_detail'] = 'Detailinformationen zum Bild';
$lang['__site_width__'] = 'Content - Breite (in %)';
-$lang['__background__'] = 'Website - Hintergrundfarbe';
+$lang['__background_site__'] = 'Website - Hintergrundfarbe';
$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe';
$lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe';
$lang['__nav_menu_hover_color__'] = 'verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
$lang['__nav_menu_hover_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
-$lang['__background_content__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
+$lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__text__'] = 'Content: Text - Schriftfarbe';
$lang['__background_neu__'] = 'Content neutral (nicht zu unterschiedlich zum Content-Hintergrund) - Hintergrundfarbe';
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 679c2ba..9c7d137 100755
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -37,13 +37,10 @@ $lang['tab_issues'] = 'Issues';
$lang['quality_trigger'] = 'toggle page analysis';
$lang['prefix_tasks'] = 'open tasks: ';
-$lang['prefix_tasks_user'] = 'your open tasks: ';
$lang['prefix_tasks_page'] = 'open tasks for this page: ';
$lang['tasks_page_none'] = 'There are no open tasks for this page.';
$lang['tasks_page_intime'] = 'There are %1$d open tasks on this page.';
$lang['tasks_page_late'] = 'There are %1$d open tasks on this page, %2$d are late.';
-$lang['tasks_user_none'] = 'You have no open tasks.';
-$lang['tasks_user_intime'] = 'You have %1$d open tasks.';
$lang['discussion'] = 'Discussion';
$lang['back_to_article'] = 'Back to article';
diff --git a/style.ini b/style.ini
index 1cba47d..f18bae7 100755
--- a/style.ini
+++ b/style.ini
@@ -68,10 +68,10 @@ css/area_nav-direct.less = all
css/area_nav-breadcrumb.less = all
css/area_nav-page-attributes.less = all
css/area_nav-usertools.less = all
-css/area_sidebar-search.less = all
css/area_nav-pagetools.less = all
css/area_nav-metabox.less = all
css/area_main-sidebar-nav.less = all
+css/area_main-sidebar-search.less = all
css/area_main-sidebar-content.less = all
css/area_main-content.less = all
css/area_main-content-secedit.less = all
@@ -94,6 +94,7 @@ css/plugins/magic-matcher.less = all
css/plugins/do_tasks.less = all
css/plugins/qc.less = all
css/plugins/struct.less = all
+css/plugins/structstatus.less = all
css/plugins/bureaucracy.less = all
css/plugins/highlight_parent.less = all
css/plugins/edit.less = all
@@ -107,6 +108,8 @@ css/plugins/folded.less = all
css/plugins/configmanager.less = all
css/plugins/starred.less = all
+css/plugins/data.less = all
+
; _____________ print styles _____________
@@ -132,7 +135,7 @@ __site_width__ = "73%" ; @ini_site_width
; alternative text and background colors
-__background__ = "#ECECEC" ; @ini_background (guaranteed for every plugin)
+__background_site__ = "#ECECEC" ; @ini_background_site
__text_webframe__ = "#696969" ; @ini_text_webframe
@@ -142,7 +145,7 @@ __nav_menu_color__ = "#696969" ; @ini_nav_menu_color
__nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color
__nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg
-__background_content__ = "#FFF" ; @ini_background_content
+__background __ = "#FFF" ; @ini_background (guaranteed for every plugin)
__text__ = "#252525" ; @ini_text (guaranteed for every plugin)
__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin)
diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php
index 278d3f4..c321a85 100755
--- a/tpl/nav-usertools-buttons.php
+++ b/tpl/nav-usertools-buttons.php
@@ -23,25 +23,12 @@
/** @var \helper_plugin_do $doplugin */
$doplugin = plugin_load('helper','do');
if ($doplugin !== null && isset($_SERVER['REMOTE_USER'])) {
- $tasks = $doplugin->loadTasks(array('status' => array('undone'),'user' => $_SERVER['REMOTE_USER']));
- $num = count($tasks);
- if ($num === 0) {
- $title = tpl_getLang('tasks_user_none');
- } else {
- $title = sprintf(tpl_getLang('tasks_user_intime'), $num);
+ $icon = $doplugin->tpl_getUserTasksIconHTML();
+ if ($icon) {
+ echo '' . $icon . '';
}
-
- $doInner = "".tpl_getLang('prefix_tasks_user')." ".count($tasks)."";
-
- $userpage = $doplugin->getConf('userpage');
- if ($userpage && $_SERVER['REMOTE_USER'] && $num > 0) {
- $linktarget = sprintf($userpage, $_SERVER['REMOTE_USER']) . ':' . 'dashboard';
- $linktarget = str_replace('::', ':', $linktarget);
- echo ''.$doInner.'';
- } else {
- echo ''.$doInner.'';
- }
- } ?>
+ }
+ ?>