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

@ -6,13 +6,13 @@
.side-tools.main-sidebar {
@icon-size: 2rem;
@icon-size: @margin-default;
counter-increment: bar-counter;
ul,
.trace {
padding-left: (@icon-size + .5);
padding-left: (@margin-big + .5);
}
ul {
@ -45,7 +45,7 @@
> nav {
> ul {
margin: 0;
padding: 0 0 0 (@icon-size + .5);
padding: 0 0 0 (@margin-big + .5);
li {
list-style-type: none;
@ -66,7 +66,7 @@
height: auto;
color: @color-nav;
font-weight: normal;
padding: .5em 0 .5em (@icon-size + 1.1);
padding: .7em 0 .7em (@margin-big + 1.1);
&[class="sr-only"] {
border-bottom: solid 1px @color-border;
@ -88,7 +88,7 @@
top: 0;
left: 0;
height: 100%;
width: 2.5rem;
width: @margin-big;
overflow: hidden;
text-align: center;
margin-top: auto;
@ -103,7 +103,7 @@
top: 15%;
bottom: 15%;
width: 1px;
left: (@icon-size + .6);
left: (@margin-big + .6);
background-color: @color-border;
transition: @transition background-color;
}
@ -144,7 +144,7 @@
bottom: 1px;
left: 0;
height: 100%;
width: 2.5rem;
width: @margin-big;
overflow: hidden;
color: @color-nav;
text-align: center;
@ -159,7 +159,7 @@
top: 15%;
bottom: 15%;
width: 1px;
left: (@icon-size + .5);
left: @margin-big;
background-color: @color-border;
transition: @transition background-color;
}
@ -245,7 +245,7 @@
background-color: @color-content-bg;
border: 1px solid @button_background;
border-radius: @fix_border-radius;
font-size: .8rem;
font-size: @font-size-small;
margin-top: .1rem;
padding: .3rem .6em;
@ -295,7 +295,7 @@
@media @screen_min-xlg {
.side-tools.main-sidebar {
h6 {
font-size: .9rem;
font-size: @font-size-default;
* {
font-size: inherit;
@ -303,7 +303,7 @@
}
li {
font-size: .8rem;
font-size: @font-size-small;
padding: .1em 0 .1em .1rem;
> * {
@ -320,11 +320,11 @@
@media @screen_max-xlg {
.side-tools.main-sidebar {
h6 {
font-size: 1rem;
font-size: @font-size-default;
}
li {
font-size: .9rem;
font-size: @font-size-small;
padding: .15em 0 .15em .23rem;
> * {
@ -333,7 +333,7 @@
}
p {
font-size: .9rem;
font-size: @font-size-small;
}
}
}