Commit graph

11 commits

Author SHA1 Message Date
Jana Deutschländer
863ddc8263 Merge remote-tracking branch 'origin/spis-master' into bar_search
# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
2017-01-11 15:59:24 +01:00
Silke Pisulla
555efed804 Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
#	css/area_nav-metabox.less
#	css/area_sidetools.less
#	css/base_design.less
2017-01-11 15:44:24 +01:00
Silke Pisulla
527e72e79a SPR-768: Anpassungen - SprintMeeting 10.1.2017 - tabbox 2017-01-11 15:18:39 +01:00
Jana Deutschländer
fda6466f1a font-size des root reduziert, damit default font size 1rem entspricht 2017-01-11 14:40:43 +01:00
Jana Deutschländer
ccf1b0eac9 message area + admin part 1 2017-01-10 16:04:58 +01:00
Jana Deutschländer
54bed87c4e clear content 2017-01-10 14:43:13 +01:00
Silke Pisulla
a1671cb1d0 num in metabox 2017-01-10 09:38:13 +01:00
Jana Deutschländer
1b899691a7 Vorbereitung sprint meeting 2017-01-10 09:18:01 +01:00
Jana Deutschländer
92c91ef8b0 metabox part 3 2017-01-09 17:08:44 +01:00
Jana Deutschländer
d62df8bdbf metabox part 2 2017-01-09 16:31:32 +01:00
Jana Deutschländer
38297711ab metabox part 1 2017-01-09 14:32:43 +01:00