Commit graph

545 commits

Author SHA1 Message Date
Jana Deutschländer
1b45b4fd79 orthographically adjustments in comments 2017-05-11 16:16:27 +02:00
Silke Pisulla
b62da6335e SPR-908: usertools - wrong background + color in noopentasks 2017-04-27 15:11:23 +02:00
Silke Pisulla
de0d7f9d13 SPR-908: width bug in quicksearch (widecontent), hidden quicksearch in mobile show-nav 2017-04-27 15:10:44 +02:00
Silke Pisulla
577d0c1e94 SPR-943: Template: Pixel-Fehler bei Edittable button 2017-04-27 14:33:37 +02:00
Jana Deutschländer
4a0e15e1d3 Merge remote-tracking branch 'origin/title' 2017-04-26 17:48:39 +02:00
Jana Deutschländer
b92c574de6 SPR-893: keyboard access 2017-04-26 17:44:53 +02:00
Jana Deutschländer
96ffde03fc Merge branch 'spis-master' into 'master'
spis-master

See merge request !59
2017-04-26 16:57:50 +02:00
Jana Deutschländer
92a2b4dc7e convention uppercase letters for rgb hex values 2017-04-26 16:56:14 +02:00
Jana Deutschländer
d3e6e376f1 Merge branch 'master' into 'spis-master'
# Conflicts:
#   lang/en/lang.php
2017-04-26 16:42:17 +02:00
Jana Deutschländer
39514a7bd0 Merge branch 'spis_SPR-882' into 'master'
SPR-882: section edit button improvements (spis_SPR-882)

See merge request !61
2017-04-26 16:21:41 +02:00
Jana Deutschländer
5148e0c91a Merge remote-tracking branch 'origin/breadcrumbs'
SPR-972: german translation
2017-04-26 16:20:39 +02:00
Jana Deutschländer
cbf9c4a6f0 fix conf-option 2017-04-26 16:00:43 +02:00
Jana Deutschländer
23f60e56a7 Merge branch 'fixBreadcrumDetection' into 'master'
Check the correct conf-option for hierarchical breadcrumbs

See merge request !58
2017-04-26 15:54:14 +02:00
Jana Deutschländer
a2076f0690 SPR-969: change wording for head_breadcrumb in head_breadcrumb_youarehere to show that it is used for hierarchical breadcrumbs (conf-option youarehere) 2017-04-26 15:53:38 +02:00
Andreas Gohr
84f9464195 SPR-972 add more info to the breadcrumb
* add the current admin plugin to the breadcrumb
* use proper translations for the various modes
* do no longer rely on JavaScript for the enhanced breadcrumb
* add image name in breadcrumb for detail view
2017-04-26 14:57:49 +02:00
Silke Pisulla
4cc1b403ef SPR-908: configmanager responsive 2017-04-26 14:54:00 +02:00
Silke Pisulla
3a5352134f SPR-956: Edit-Button für Data-Plugin 2017-04-26 12:55:33 +02:00
Silke Pisulla
6555d67184 SPR-968: qs 2017-04-26 12:45:05 +02:00
Michael Große
4a1a2863db
Check the correct conf-option for hierarchical breadcrumbs
SPR-969
2017-04-26 12:05:32 +02:00
Andreas Gohr
146503ce08 Merge branch 'master' into title
* master:
  Adjust less vars for compatibility
  Use do-plugin's user task button w/ overlay
  SPR-937: comment
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-950: optimate Headerstyling in Mobile
  SPR-950: mobile - magicmatcher additional class makes wrong padding in usertoolicons
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-950: optimate Headerstyling in Mobile
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-942: sublist less indent; SPR-945: min-width for quicksearch
  SPR-942: sublist alignment in sidebar; SPR-953: nav active
  SPR-942: sublist less indent
  SPR-908: qs old data plugin (edit button for table)
  SPR-908: check fix border-radius
  SPR-937: Alignment Sidebar
2017-04-26 11:54:19 +02:00
Silke Pisulla
0b0d2e0829 SPR-908: changes for new html 2017-04-26 11:47:34 +02:00
Silke Pisulla
508e715945 bug in var name 2017-04-26 10:41:58 +02:00
Silke Pisulla
aa81f447a3 SPR-908: issuelist in metabox summarized 2017-04-26 10:22:05 +02:00
Silke Pisulla
fabd75acdf Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	lang/de/lang.php
2017-04-26 09:37:42 +02:00
Silke Pisulla
63bb23ddb6 SPR-742: configure configmanager 2017-04-26 09:20:14 +02:00
Silke Pisulla
86e59cb304 SPR-908: qs font-size, color, padding 2017-04-26 09:18:31 +02:00
Jana Deutschländer
52ef6e091d Merge branch 'userTasksOverlay' into 'master'
Use do-plugin's user task button w/ overlay

See merge request !55
2017-04-25 16:26:13 +02:00
Jana Deutschländer
446069796c Merge branch 'master' into 'userTasksOverlay'
# Conflicts:
#   css/area_nav-usertools.less
2017-04-25 16:26:02 +02:00
Jana Deutschländer
8de09e583d Merge branch 'fixLessBeackgroundVars' into 'master'
Adjust less variables for compatibility

See merge request !56
2017-04-25 16:11:39 +02:00
Silke Pisulla
c2023c17f6 SPR-908: quicksearch immer ausgeklappt 2017-04-25 09:05:45 +02:00
Michael Große
8221fa277b
Adjust less vars for compatibility
In the dokuwiki standard template __background__ is the variable
defining the background-color of the content. It is one of the
guaranteed placeholder that every template must provide. Hence we should
use it with the way it is used in the default template, so other plugins
can rely on it and look consistently.

Also some other base-dokuwiki styles still use it accordingly, for
example the footnotes.

SPR-954
2017-04-24 19:52:20 +02:00
Michael Große
211de8a54a
Use do-plugin's user task button w/ overlay
Motivation
----------
Since we do not have a dashboard it would be useful to directly see
one's task on click upon the respective icon. Also this is most likely
the dominating reason of the dashboard-usage.

Implementation Decisions
------------------------
* Use SVG: Since we move towards using SVG everywhere in DokuWiki, I
decided to use a SVG icon here as well. This makes it compatible with
other templates too, without introducing an icon-font there.
* Using a `<span>` instead of a `<strong>`: I do not see the semantic reason
behind using a `<strong>` here.

Other Changes
-------------
* The styles related to the do-plugin have been moved from
css/area_nav-usertools.less to css/plugins/do_tasks.less

This needs the respective pull request merged from the do-plugin:
https://github.com/cosmocode/do/pull/31

SPR-962
2017-04-24 19:23:48 +02:00
Jana Deutschländer
97a4fdccb1 Merge branch 'spis_SPR-950' into 'master'
spr-950 - header styling

See merge request !49
2017-04-24 15:55:37 +02:00
Andreas Gohr
9e264cdc04 show sidebar label on collapsed sidebar SPR-957
This removes the base z-indexes as they seem not to be needed (source
order defines initial heights) and interfered with the sidbar functionality.

Removing it was suggested in SPR-899 as well
2017-04-24 15:53:27 +02:00
Jana Deutschländer
78020606c9 Merge branch 'spis-master' into 'master'
SPR-937: Alignment Sidebar (spis-master)

See merge request !45
2017-04-24 15:26:56 +02:00
Silke Pisulla
c98cbfb79a SPR-882: section edit button improvements 2017-04-24 15:21:37 +02:00
Silke Pisulla
e69a241a71 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis_SPR-882 2017-04-24 15:14:18 +02:00
Silke Pisulla
1d0a170f6e SPR-882: section edit button improvements 2017-04-24 15:13:56 +02:00
Silke Pisulla
69b92e93cf SPR-937: comment 2017-04-24 15:12:35 +02:00
Jana Deutschländer
86abd75a0d Merge branch 'spis_SPR-958' into 'master'
SPR-958: Scrollbars im meta-footer

See merge request !53
2017-04-24 14:54:11 +02:00
Silke Pisulla
17e63de827 SPR-958: Scrollbars im meta-footer (bdi) 2017-04-24 14:40:00 +02:00
Silke Pisulla
42c20240d5 SPR-958: Scrollbars im meta-footer (bdi) 2017-04-24 14:35:18 +02:00
Jana Deutschländer
d80bb21849 Merge branch 'starred' into 'master'
SPR-940 Starred Plugin Integration

See merge request !41
2017-04-24 14:06:04 +02:00
Silke Pisulla
a57e8bf6df Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-04-24 13:03:38 +02:00
Silke Pisulla
80134fae3c SPR-950: optimate Headerstyling in Mobile 2017-04-24 13:03:01 +02:00
Silke Pisulla
8f9af64d4e Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis_SPR-950 2017-04-24 12:47:39 +02:00
Jana Deutschländer
0ddfd51e0d Merge branch 'fixDoButton' into 'master'
Prevent interaction between do-js and our page-tasks-icon

See merge request !52
2017-04-24 12:08:06 +02:00
Jana Deutschländer
f0798ec8f1 Merge branch 'showTagCount' into 'master'
Show number of tags in metabox label

See merge request !50
2017-04-24 11:41:48 +02:00
Jana Deutschländer
927c20ea4f Merge branch 'fixSidebarToggling' into 'master'
Fix sidebar toggling

See merge request !46
2017-04-24 11:37:02 +02:00
Michael Große
81a9f400e7
Prevent interaction between do-js and our page-tasks-icon
The javascript of the do-plugin tries to update the container with the
plugin__do_pagetasks class. However, since our container has a different
structure than the icon produced by the do-plugin, this attempt fails
and leaves the icon in a broken state.

This commit changes the class of the container and thus ceases to be
affected by the do-plugin's javascript.

SPR-946
2017-04-24 11:21:26 +02:00