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

@ -10,11 +10,11 @@
padding: 1rem 1.8rem .2rem;
> p {
font-size: .83rem;
font-size: @font-size-small;
margin: 0;
* {
font-size: .83rem;
font-size: @font-size-small;
}
.bchead {
@ -38,7 +38,7 @@
transition: @transition border-color;
&:before {
font-size: 1rem;
font-size: @font-size-default + (@font-scale-factor * 2);
margin-top: .17rem;
}
@ -140,11 +140,11 @@
#plugin__qc__out{
h1{
font-size: 1.2rem;
font-size: @font-size-head3;
}
h2{
margin-top: 1.6em;
font-size: .93rem;
font-size: @font-size-head5;
}
> h1, > h2, > p, >dl, >div{
padding-left: 1rem;
@ -172,7 +172,7 @@
.icon-emo-happy();
width: 100%;
font-size: .9rem;
font-size: @font-size-default;
&::before {
width: 100%;