Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master

This commit is contained in:
Silke Pisulla 2017-01-05 14:01:27 +01:00
commit 990dda13aa
12 changed files with 191 additions and 38 deletions

View file

@ -5,9 +5,16 @@
*/
#dokuwiki__sitetools.nav-sitetools {
.side-tools.main-sidebar {
@icon-size: 2rem;
> nav{
margin-top: 1rem;
> ul{
margin-bottom: 0;
}
}
h6 { //background-color: pink;// hier activ !!!
position: relative;
width: auto;
@ -15,7 +22,6 @@
color: @color-nav;
font-size: .88rem;
font-weight: normal;
margin: 0;
padding: .5rem 0 .5rem (@icon-size + 1);
&::before {
@ -85,7 +91,7 @@
/* min-width: 1440px */
@media @screen_min-xlg {
#dokuwiki__sitetools.nav-sitetools {
.side-tools.main-sidebar {
li {
font-size: 100%;
padding-top: .1rem;
@ -103,7 +109,7 @@
/* max-width: 1199px */
@media @screen_max-xlg {
#dokuwiki__sitetools.nav-sitetools {
.site-tools.main-sidebar {
h6 {
font-size: 1rem;
}

View file

@ -126,14 +126,28 @@ h4 {
margin: 0 0 1.0em;
}
h5 {
font-size: .82rem;
font-size: .88rem;
margin: 0 0 1.1428em;
}
h6 {
font-size: .75rem;
font-size: .83rem;
margin: 0 0 1.333em;
}
p{
font-size: .83rem;
line-height: 135%;
a, span, strong{
font-size: inherit;
}
}
label, legend{
font-size: .83rem;
a, span, strong{
font-size: inherit;
}
}
p,
ul,

View file

@ -154,6 +154,16 @@
.logo img {
height: 60px;
width: auto;
border-style: solid;
border-color: transparent;
border-width: 0 3px;
}
.logo {
a:hover, a:focus, a:active{
img {
border: 0 none;
}
}
}
}