Commit graph

323 commits

Author SHA1 Message Date
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
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
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
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
Michael Große
1c24bf1989
Merge branch 'master' into toggleConf 2017-04-18 13:10:14 +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
Silke Pisulla
4887064b86 SPR-908: QS - variablennutzung 2017-04-13 13:03:29 +02:00
Jana Deutschländer
a21c6f8785 SPR-869: debug for wiki in root 2017-04-13 12:44:53 +02:00
Michael Große
cb7cc643bf
Make sidebar toggle elements configurable
Current options are h1, h1 and h2, h1-h5, top-level list items

SPR-754
2017-04-12 13:35:33 +02:00
Silke Pisulla
1c73fa5363 SPR-908: QS - code 2017-04-12 12:04:15 +02:00
Silke Pisulla
31abc4ae3d SPR-908: QS - header with magicmatcher 2017-04-12 12:04:06 +02:00
Silke Pisulla
b2e6ef84e9 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-04-12 11:55:46 +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
Jana Deutschländer
2ac13e1431 SPR-814: style linked image 2017-04-11 12:53:03 +02:00
Silke Pisulla
8aca7d1e5b SPR-908: QS - ie11 2017-04-10 13:33:51 +02:00
Silke Pisulla
3002141dc6 SPR-908: QS - better transition in usertool icons 2017-04-10 13:13:11 +02:00
Silke Pisulla
242e80d535 SPR-908: QS - no break in <code> (except linebreak is needed) 2017-04-10 13:12:45 +02:00
Silke Pisulla
c2ab07c119 SPR-908: QS - comment 2017-04-10 13:11:55 +02:00
Silke Pisulla
068280a221 SPR-908: QS - padding in nav (aside) 2017-04-10 13:11:39 +02:00
Silke Pisulla
5e00b7a4e3 SPR-742: Konfigurierbarkeit history colors 2017-04-10 13:11:17 +02:00
Michael Große
9f631ecba1
Remove misplaced css to fix button background
The button should have a transparent background as all the other
buttons.
2017-04-10 11:13:12 +02:00