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

@ -12,9 +12,9 @@
/* + + + + + nav main + + + + + */
.nav-main {
> ul {
@icon-size: 2rem;
@icon-size: @margin-default;
margin: 0 0 1.8rem;
margin: 0 0 @margin-default;
padding: 0;
ul {
@ -72,7 +72,7 @@
position: relative;
z-index: 1;
margin-top: -1px;
padding: .5em 0 .5em (@icon-size + 1);
padding: .5em 0 .5em (@margin-big + 1);
&[class="li"] {
border-bottom: solid 1px @color-border;
@ -88,7 +88,7 @@
top: 0;
left: 0;
height: 100%;
width: 2.5rem;
width: @margin-big;
overflow: hidden;
color: @color-nav;
text-align: center;
@ -102,7 +102,7 @@
top: 15%;
bottom: 15%;
width: 1px;
left: (@icon-size + .5);
left: (@margin-big + .5);
background-color: @color-border;
}
@ -121,7 +121,7 @@
border: 1px solid transparent;
border-radius: @fix_border-radius;
margin-bottom: -.3rem;
padding: .6em 0 .6em (@icon-size + 1);
padding: .7em 0 .7em (@margin-big + 1);
transition: @transition color, @transition background-color, @transition border-color;
&::before {
@ -135,7 +135,7 @@
bottom: 1px;
left: 0;
height: 100%;
width: 2.5rem;
width: @margin-big;
overflow: hidden;
color: @color-nav;
text-align: center;
@ -150,7 +150,7 @@
top: 15%;
bottom: 15%;
width: 1px;
left: (@icon-size + .5);
left: @margin-big;
background-color: @color-border;
transition: @transition background-color;
}
@ -236,7 +236,7 @@
#dokuwiki__aside.main-sidebar {
.nav-main {
.li {
font-size: .8rem;
font-size: @font-size-default;
padding: .1em 0;
* {
@ -246,7 +246,7 @@
}
> ul > li > .li {
font-size: .9rem;
font-size: @font-size-default;
* {
font-size: inherit;
@ -264,7 +264,7 @@
#dokuwiki__aside.main-sidebar {
.nav-main {
.li {
font-size: .9rem;
font-size: @font-size-default;
padding: .15em 0 .15em .25rem;
* {
@ -274,7 +274,7 @@
}
> ul > li > .li {
font-size: 1rem;
font-size: @font-size-default;
> * {
font-size: inherit;