Commit graph

346 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
97a4fdccb1 Merge branch 'spis_SPR-950' into 'master'
spr-950 - header styling

See merge request !49
2017-04-24 15:55:37 +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
69b92e93cf SPR-937: comment 2017-04-24 15:12:35 +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
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
Michael Große
d29aa0daac
Editbutton should be closely below section
The `margin-top: 0` overwrites DokuWiki's default `margin-top: -1.4em`
and causes the edit button to be far below the section it is supposed to
edit. This causes a visual disconnect between button and section,
especially for small or empty sections. This is even more
apparent when contrasted with the button-placement for tables etc.
2017-04-21 17:59:24 +02:00
Silke Pisulla
de3c42a7e3 SPR-950: mobile - magicmatcher additional class makes wrong padding in usertoolicons 2017-04-21 15:00:44 +02:00
Silke Pisulla
afdd1861fa Merge branch 'spis-master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis_SPR-950 2017-04-21 14:56:29 +02:00
Silke Pisulla
fd02700e79 SPR-945: min-width for quicksearch qs wide-screen 2017-04-21 14:56:03 +02:00
Silke Pisulla
5b90468832 SPR-950: optimate Headerstyling in Mobile 2017-04-21 14:43:56 +02:00
Silke Pisulla
70483b33aa SPR-945: min-width for quicksearch qs wide-screen 2017-04-21 14:42:18 +02:00
Silke Pisulla
d765b290be SPR-945: min-width for quicksearch qs wide-screen 2017-04-21 13:24:28 +02:00
Silke Pisulla
336aca62d7 SPR-945: min-width for quicksearch qs wide-screen 2017-04-21 13:17:36 +02:00
Silke Pisulla
cb7a1be6cf SPR-942: sublist less indent; SPR-945: min-width for quicksearch 2017-04-21 13:14:18 +02:00
Silke Pisulla
18dbbcce7d SPR-942: sublist alignment in sidebar; SPR-953: nav active 2017-04-21 12:35:03 +02:00
Silke Pisulla
cd7d0dbfee SPR-942: sublist less indent 2017-04-21 12:17:53 +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
Silke Pisulla
6b86908949 SPR-937: Alignment Sidebar 2017-04-20 15:35:49 +02:00
Jana Deutschländer
e6acdc2663 Merge branch 'mobileHideMM' into 'master'
Hide MagicMatcher-Header in mobile

See merge request !44
2017-04-20 15:19:29 +02:00
Michael Große
aaf5973db0
Hide MagicMatcher-Header in mobile
SPR-948
2017-04-20 15:02:23 +02:00
Jana Deutschländer
a0a9f24e9d SPR-949: long path in page footer set to overflow auto 2017-04-20 13:43:16 +02:00
Andreas Gohr
1fc95e4da6 integrate the own stared pages into the sidebar 2017-04-20 13:18:08 +02:00
Silke Pisulla
98451cac1c SPR-908: line-height for DL 2017-04-20 12:38:21 +02:00
Silke Pisulla
9d6c0ae999 SPR-814: detail.php "show img " - responsive dl 2017-04-20 12:29:06 +02:00
Andreas Gohr
728071e818 nicer starred styles on hover 2017-04-20 12:06:55 +02:00
Silke Pisulla
ee135d5f6e SPR-814: detail.php "show img " 2017-04-20 11:56:22 +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
Silke Pisulla
41b18cd7b1 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-04-20 08:54:57 +02:00
Jana Deutschländer
9fbd182782 Merge branch 'pageattributes' into 'master'
refactoring der Pageattributes (qc und do)

See merge request !29
2017-04-19 16:16:08 +02:00
Jana Deutschländer
2b368d03e6 SPR-869: headline hierarchies did not match font-sizes 2017-04-19 16:13:20 +02:00
Jana Deutschländer
16a4631324 SPR-814: detail template local merges 2017-04-19 15:51:32 +02:00
Jana Deutschländer
7b09296348 Merge remote-tracking branch 'origin/detailView'
# Conflicts:
#	lang/de/settings.php
#	lang/en/settings.php
2017-04-19 15:44:01 +02:00
Jana Deutschländer
c6f48ce933 SPR-814: remove comment 2017-04-19 15:36:44 +02:00
Jana Deutschländer
76f5706461 SPR-814: detail template bugfix meta data in webkit 2017-04-19 15:24:25 +02:00
Jana Deutschländer
58aee1016a SPR-814: detail template 2017-04-19 15:21:55 +02:00
Silke Pisulla
8a35e69462 SPR-908: footer widescreen 2017-04-19 14:24:11 +02:00
Silke Pisulla
c14dbc7492 SPR-882: section edit button improvements 2017-04-19 14:17:13 +02:00
Silke Pisulla
476022bd24 SPR-926: contrast for CODE 2017-04-19 13:42:18 +02:00
Silke Pisulla
8028368430 SPR-926: contrast for CODE 2017-04-19 13:38:01 +02:00