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
This commit is contained in:
Silke Pisulla 2017-01-11 15:44:24 +01:00
commit 555efed804
25 changed files with 657 additions and 630 deletions

View file

@ -18,7 +18,7 @@
top: 0;
left: 0;
z-index: -1;
height: 2.45rem;
height: 2.6rem;
width: 100%;
background-color: @background_page-header;
border-bottom: 1px solid @color-border;
@ -39,28 +39,24 @@
}
.structaggregation {
font-size: .88rem;
td, th {
font-size: .88rem;
td,
th {
line-height: 125%;
a {
font-size: .88rem;
line-height: 125%;
}
}
> a.export {
font-size: .88rem;
line-height: 135%;
padding-top: .5em;
}
~ ul li .li {
font-size: .88rem;
}
}
.dokuwiki .structaggregation a.export {
padding-top: .3em;
font-size: .88rem;
}
.main-content > .level2,
@ -69,13 +65,27 @@
.main-content > .level4,
.main-content > .level5,
.main-content > .level6 {
font-size: .88rem;
padding-bottom: 1rem;
> p, > ul > li .li {
font-size: .88rem;
a {
font-size: inherit;
}
}
}
.level1,
.level2,
.level3,
.level4,
.level5,
.level6 {
line-height: 125%;
div, p, th, td, textarea,
h1, h2, h3, h4, h5, h6,
dl, dt, dd, ol, ul, li {
line-height: 125%;
}
}