Commit graph

88 commits

Author SHA1 Message Date
Jana Deutschländer
446069796c Merge branch 'master' into 'userTasksOverlay'
# Conflicts:
#   css/area_nav-usertools.less
2017-04-25 16:26:02 +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
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
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
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
Silke Pisulla
fd02700e79 SPR-945: min-width for quicksearch qs wide-screen 2017-04-21 14:56:03 +02:00
Silke Pisulla
2a9c15f60e SPR-908: qs old data plugin (edit button for table) 2017-04-21 10:44:23 +02:00
Silke Pisulla
1dc51a98fd SPR-908: check fix border-radius 2017-04-21 10:43:13 +02:00
Michael Große
aaf5973db0
Hide MagicMatcher-Header in mobile
SPR-948
2017-04-20 15:02:23 +02:00
Andreas Gohr
1fc95e4da6 integrate the own stared pages into the sidebar 2017-04-20 13:18:08 +02:00
Andreas Gohr
728071e818 nicer starred styles on hover 2017-04-20 12:06:55 +02:00
Andreas Gohr
d4c5a4240d integrate star toggle for starred plugin 2017-04-20 11:52:12 +02:00
Silke Pisulla
1741a375bc SPR-908: stop floating after msg-box 2017-04-20 10:49:24 +02:00
Jana Deutschländer
2b368d03e6 SPR-869: headline hierarchies did not match font-sizes 2017-04-19 16:13:20 +02:00
Silke Pisulla
401950068f SPR-869: QC Plugin output responsive 2017-04-19 13:04:37 +02:00
Silke Pisulla
f078e012ce SPR-869: QC Plugin output responsive 2017-04-19 12:59:06 +02:00
Silke Pisulla
e8d58fb55b SPR-869: QC Plugin output + icon in breadcrumb 2017-04-19 11:52:59 +02:00
Silke Pisulla
b457c328a9 SPR-908: QS - wiki-icons 2017-04-13 15:35:03 +02:00
Silke Pisulla
9161dde646 SPR-869: QC Plugin icon qs 2017-04-13 15:29:36 +02:00
Silke Pisulla
d160b7e7bb Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into pageattributes 2017-04-13 13:37:09 +02:00
Silke Pisulla
d3979d9e7a SPR-899: struct inline-editor styling 2017-04-13 13:03:59 +02:00
Michael Große
3f9d4d521a
Merge branch 'master' into pageattributes
Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
2017-04-11 16:13:02 +02:00
Silke Pisulla
321533cad2 prepared 2017-04-07 15:23:02 +02:00
Silke Pisulla
7cc53208e5 SPR-908: QS - comments 2017-04-07 15:22:54 +02:00
Silke Pisulla
3554750745 SPR-908: QS - code aufteilung 2017-04-07 15:21:27 +02:00
Silke Pisulla
602eeed5c0 SPR-908: QS - form in Struct Schema Editor 2017-04-07 13:44:43 +02:00
Silke Pisulla
8644ba9a98 SPR-908: QS - config manager 2017-04-07 13:42:00 +02:00
Silke Pisulla
32f9e6bba2 SPR-742: editmode contentblock 2017-04-03 13:42:41 +02:00
Silke Pisulla
575c6e7eaa SPR-742: help toggle in content 2017-04-03 13:32:21 +02:00
Silke Pisulla
89a4c45d5c SPR-742: edit buttons 2017-04-03 13:31:35 +02:00
Silke Pisulla
146c8265e6 SPR-742: wiki icons, table in content, edit button, tabinclude 2017-04-03 13:30:34 +02:00
Silke Pisulla
e0f14d54bb SPR-908: struct code qs 2017-04-03 13:28:00 +02:00
Silke Pisulla
93c8a202bd Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-03-30 10:41:53 +02:00
Silke Pisulla
eeaa70e6b8 SPR-908: QS - margin, padding, font-size 2017-03-30 10:39:12 +02:00
Jana Deutschländer
6f017a0f1c Merge branch 'showStructInlineEditors' into 'master'
Raise struct inline editors above content

See merge request !22
2017-03-30 05:41:33 +02:00
Silke Pisulla
2d623f4b2e SPR-742: Konfigurierbarkeit check, neuzuordnung 2017-03-28 15:10:27 +02:00
Silke Pisulla
202ac8de1e SPR-910: var rename - background (site, page, header, footer) button (bg, color), link (existing) + box-shadow as fix var 2017-03-23 15:38:44 +01:00
Silke Pisulla
c5ddaf094e SPR-742: Konfigurierbarkeit link, nav-dirct 2017-03-23 12:59:06 +01:00
Silke Pisulla
3cdc9fcb67 SPR-910: var rename - nav_menu_color, nav_menu_hover_color, nav_menu_hover_bg 2017-03-23 12:55:46 +01:00
Silke Pisulla
38bfc8bb62 SPR-910: var rename - border-color 2017-03-22 15:20:49 +01:00
Silke Pisulla
ef4640f4d7 SPR-910: var rename - border-radius 2017-03-22 15:02:45 +01:00
Silke Pisulla
ceb9783597 SPR-905: Plug-In TabInclude Styling - following elements 2017-03-20 15:29:43 +01:00
Silke Pisulla
06e7f9edeb SPR-896: Plug-In TabInclude Styling Editbutton 2017-03-20 14:26:25 +01:00
Silke Pisulla
5b65a7c080 SPR-904: forms - cursor for "search button" in table search 2017-03-20 13:16:59 +01:00
Silke Pisulla
4162126bdc SPR-882: section edit button no wiggle at hover 2017-03-20 13:05:51 +01:00
Michael Große
d14ffc9215
Raise struct inline editors again above content
The alternative would be to give the content etc. a z-index of 0.

SPR-899
2017-03-17 11:46:12 +01:00
Michael Große
1f3641a828
Add MagicMatcher Issue list to meta box
This adds the issue list to the meta-box.

SPR-881
2017-03-16 13:23:18 +01:00
Andreas Gohr
fbf9e9d682 integrate QC plugin (ajax branch)
This refactors the page-attribute area a bit and intergrates the new
ajax branch of the QC plugin. I'm not really happy about the included
file - it should probably be moved to our Template class instead.
2017-03-09 16:15:10 +01:00