Commit graph

827 commits

Author SHA1 Message Date
Silke Pisulla
9586dbef7c header: toggle + select for mobile menu, logo added 2017-10-16 14:57:50 +02:00
Silke Pisulla
0dbbf264a9 empty lines addes 2017-10-16 14:52:13 +02:00
Silke Pisulla
5b3e899e4c qs image-detail DL 2017-10-16 14:10:02 +02:00
Silke Pisulla
7e5b31af0f qs mainnav in mediaqueries 2017-10-16 12:05:56 +02:00
Silke Pisulla
ccbf6d932d allgemein: schriften 2017-10-16 11:42:54 +02:00
Jana Deutschländer
4f626e3342 SPR-950 changes for mobile header,
Bugfix edit Mode of document
2017-09-26 12:39:45 +02:00
Jana Deutschländer
98cf1895ef Merge branch 'rememberShowSidebarState' into 'master'
Remember that the content was narrow before

See merge request !77
2017-08-28 11:35:52 +02:00
Jana Deutschländer
29adeef474 Merge branch 'printstyles' into 'master'
Printstyles

See merge request !73
2017-08-28 11:34:03 +02:00
Jana Deutschländer
938e7b6518 print styles detail template und admin templates 2017-08-22 15:54:57 +02:00
Silke Pisulla
a440b55d81 SPR-984: printstyles - acl_manager 2017-08-09 15:58:00 +02:00
Silke Pisulla
51d090aeeb SPR-984: printstyles - medienmanager, forms 2017-08-09 15:29:30 +02:00
Silke Pisulla
1a26e0556e Merge branch 'spis-master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into printstyles
# Conflicts:
#	css/print.less
2017-08-09 13:46:37 +02:00
Silke Pisulla
da0f90a654 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into printstyles 2017-08-09 13:42:11 +02:00
Silke Pisulla
12bef774b7 SPR-984: printstyles 2017-08-09 13:41:24 +02:00
Jana Deutschländer
2d683f4ae6 Merge branch 'noDoubleInclude' into 'master'
Do not include the file header.html twice

See merge request !76
2017-06-12 16:47:06 +02:00
Michael Große
bd04be26c6
Remember that the content was narrow before
Steps to reproduce bug:
----------------------
1. View page with narrow content
2. Edit page --> wide content (this is correct)
3. Cancel/Save
4. Page has now wide content, but should have narrow content

Fix
---
Only remember width of content when we are view a page, i.e. `do=show`

SPR-982
2017-05-29 17:48:34 +02:00
Michael Große
1fdf3177b1
Do not include the file header.html twice
This file is already included in line 90

SPR-994
2017-05-29 17:37:41 +02:00
Jana Deutschländer
3c819177e9 Merge branch 'spis-master' into 'master'
spis-master: SPR-908

See merge request !74
2017-05-24 07:42:42 +02:00
Silke Pisulla
3a51dc94fd SPR-908: QS - usertools - do-task better size and padding 2017-05-19 11:50:28 +02:00
Silke Pisulla
908a272b29 SPR-984: Druckausgabe - hidden csv anchor 2017-05-18 12:25:51 +02:00
Silke Pisulla
686515e66f SPR-869: QC Plugin "soll Metabox überdecken" 2017-05-18 12:13:03 +02:00
Silke Pisulla
fd377dc4b3 SPR-908: QS - toggle-link for content + svg border in navmenu 2017-05-18 11:24:32 +02:00
Silke Pisulla
d0fac3123f Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-05-18 11:24:24 +02:00
Silke Pisulla
7dd86f6093 SPR-742: Template > Konfigurierbarkeit 2017-05-18 10:59:47 +02:00
Silke Pisulla
a1b82bf451 SPR-908: QS - usertools - user (linked/no linked) better size and padding, debug hover color 2017-05-12 10:41:28 +02:00
Silke Pisulla
8a3c9451af SPR-908: QS - magic matcher select box with max-width for none breaking line 2017-05-12 10:40:15 +02:00
Jana Deutschländer
b98452ce4b Merge branch 'spis-master' into 'master'
spis-master: colors in icons, nav subsublist, editbutton hover

See merge request !70
2017-05-11 16:32:56 +02:00
Jana Deutschländer
c0ecc7ec5b comments corrections 2017-05-11 16:30:07 +02:00
Jana Deutschländer
0a63fc83ec Merge branch 'spis-master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	css/plugins/edittable.less
2017-05-11 16:23:30 +02:00
Jana Deutschländer
1b45b4fd79 orthographically adjustments in comments 2017-05-11 16:16:27 +02:00
Silke Pisulla
6724d69130 after Merge branch 'master': do_tasks.less ohne z-index 2017-05-11 15:22:30 +02:00
Silke Pisulla
4a2396d1fd Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	css/plugins/do_tasks.less
2017-05-11 15:18:51 +02:00
Silke Pisulla
2217bea00d SPR-908: QS - do plugin mit angezeigter table 2017-05-11 15:17:01 +02:00
Jana Deutschländer
abe4240909 Merge branch 'printstyles' into 'master'
SPR-984: print styles

See merge request !72
2017-05-10 15:58:12 +02:00
Jana Deutschländer
44e8d55ca0 SPR-984: print style basics,
SPR-984: print styles for admin view #1
2017-05-10 15:53:34 +02:00
Jana Deutschländer
97f8bdf715 Merge branch 'zIndexReview' into 'master'
Clean up z-indexes

See merge request !71
2017-05-10 15:46:49 +02:00
Jana Deutschländer
3389cd60ad SPR-908: all z-indices are found in base_structure.less,
SPR-908: Bugfix Direct-nav in Tableview should be above toggle button
2017-05-10 15:43:01 +02:00
Silke Pisulla
8e5fef321f SPR-950: Headerstyling in Mobile optimieren 2017-05-08 15:38:25 +02:00
Michael Große
01b34ddbf2
Put the suggestions-page above the metabox-tabs
The tabs of the meta-box and the meta-box itself have z-indexes of 1,
hence we need a z-index of 2 to ensure that the suggestions-page is
above them.

SPR-981
2017-05-05 14:31:11 +02:00
Silke Pisulla
be44ad7221 SPR-908: QS - content boxshadow 2017-05-05 14:23:47 +02:00
Silke Pisulla
852015903c SPR-908: QS - starred, do margin + ie: height 2017-05-05 14:14:52 +02:00
Michael Große
80aedcc551
Clean up z-indexes
There have been some z-indexes that were removed and then reintroduced
through strange merges. This is an attempt to remove all z-indexes that
are unnecessary and to clearly state the purpose of the remaining
z-indexes in a comment to each index.

SPR-981
2017-05-05 13:53:45 +02:00
Silke Pisulla
eb3c04ae9f SPR-908: QS - nav margin 2017-05-05 13:30:32 +02:00
Silke Pisulla
cabcae22c1 SPR-882: section edit button improvements 2017-05-05 11:41:34 +02:00
Silke Pisulla
e3228cadf6 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master 2017-05-05 10:28:30 +02:00
Silke Pisulla
96ba5aa0ba SPR-742: wrong colors (for configure) 2017-05-05 10:25:33 +02:00
Silke Pisulla
af3d99dd76 SPR-942: subsublist alignment in sidebar 2017-05-05 10:24:20 +02:00
Jana Deutschländer
c6a2583846 SPR-980: close meta box after click on TOC anchor 2017-05-03 16:53:42 +02:00
Jana Deutschländer
c5e825b2e3 bugfix breadcrumb not clickable in wide content view 2017-05-03 16:47:52 +02:00
Jana Deutschländer
60443fd414 more spacing between nav main nav tools and starred 2017-05-03 16:46:58 +02:00