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

This commit is contained in:
Silke Pisulla 2017-01-05 08:15:04 +01:00
commit a4152dcdb3
17 changed files with 290 additions and 21 deletions

View file

@ -8,5 +8,29 @@
.content .row {
> .col-xs-12 {
box-shadow: @box-shadow;
#dokuwiki__content{
position: relative;
z-index: 10;
&::before{
content: "";
background-color: @background_page-header;
border-bottom: 1px solid @color-border;
position: absolute;
top: 0; left: 0;
height: 3rem; width: 100%;
z-index: -1;
}
#meta-box{
display: inline-block;
height: 3rem;
max-width: 40%;
float: right;
border: 1px solid transparent;
}
#plugin__highlightparent{
display: block;
}
}
}
}

View file

@ -42,13 +42,23 @@
#dokuwiki__footer {
.col-xs-12 {
float: right;
width: 73%;
width: 100%;
}
.main-footer {
padding: @margin-default 0;
}
}
.showSidebar {
#dokuwiki__footer {
.col-xs-12 {
width: 73%;
}
}
}
}

View file

@ -6,10 +6,11 @@
#dokuwiki__aside.main-sidebar {
counter-reset: nav-counter;
/* + + + + + nav main + + + + + */
.nav-main {
> ul {
@icon-size: 2rem;
margin: 0;
@ -42,13 +43,16 @@
border-bottom: solid 1px @color-border;
margin: 0;
padding: 0 0 .3rem 0;
counter-increment: nav-counter;
> .li { //background-color: pink;// hier activ !!!
position: relative;
padding: .5rem 0 .5rem (@icon-size + 1);
&::before { background-color: gold;// test
content: '?';
&::before {
//background-color: @color-link;
color: @color-nav;
content: counter(nav-counter);
position: absolute;
top: 0;
left: 0;
@ -76,7 +80,89 @@
background-color: @color-border;
transition: @transition background-color;
}
&.opened, &.closed{
padding: 0;
&::before, &::after{
display: none;
}
a{
display: block;
position: relative;
padding: .5rem 0 .8rem (@icon-size + 1);
margin-bottom: -.3rem;
border: 1px solid transparent;
&::before {
//background-color: @color-link;
color: @color-nav;
content: counter(nav-counter);
position: absolute;
top: -.1rem;
left: 0;
display: flex;
display: -webkit-flex;
flex-direction: column;
-webkit-flex-direction: column;
justify-content: center;
-webkit-justify-content: center;
height: 100%;
width: @icon-size;
overflow: hidden;
text-align: center;
margin-top: auto;
margin-bottom: auto;
}
&::after {
content: '';
position: absolute;
top: 15%;
bottom: 15%;
width: 1px;
left: (@icon-size + .5);
background-color: @color-border;
transition: @transition background-color;
}
&:hover, &:focus, &:active{
text-decoration: none;
background-color: #fff;
border-color: @color-link;
color: @color-link;
}
}
}
&.opened{
a{
background-color: @color-link;
color: #fff;
&::after, &::before{
color: #fff;
border-color: #fff;
}
&:hover, &:focus, &:active{
text-decoration: none;
background-color: #fff;
border-color: @color-link;
color: @color-link;
&::after, &::before{
color: inherit;
border-color: inherit;
}
}
}
}
+ ul{
height: auto;
overflow: hidden;
}
&.closed + ul{
height: 0;
}
}
}
}
}

View file

@ -24,6 +24,7 @@
nav#dokuwiki__pagetools{
right: -2rem;
top: 3.05rem;
z-index: 100;
ul {
li {
*{

View file

@ -19,8 +19,8 @@
padding: .5rem 0 .5rem (@icon-size + 1);
&::before {
background-color: gold;
content: '?';
//background-color: gold;
content: 'A';
position: absolute;
top: 0;
left: 0;

View file

@ -14,16 +14,16 @@
font-family: @fontFamily;
font-style: normal;
font-weight: @fontWeight;
src: ~"local('@{localFontName}'), local("~"'@{localFontNameVar}'), url(fonts/"~"@{filename}.eot)";
src: ~"url(fonts/"~"@{filename}.eot?#iefix) format('embedded-opentype'), url(fonts/"~"@{filename}.woff) format('woff')";
src: ~"local('@{localFontName}'), local('@{localFontNameVar}'), url(fonts/@{filename}.eot)";
src: ~"url(fonts/@{filename}.eot?#iefix) format('embedded-opentype'), url(fonts/@{filename}.woff) format('woff')";
}
}
.setIconFontFace(@fontFamily,@filename) {
@font-face {
font-family: @fontFamily;
src: ~"url('fonts/icons/"~"@{filename}.eot?6762325')";
src: ~"url('fonts/icons/"~"@{filename}.eot?6762325#iefix') format('embedded-opentype'), url('fonts/icons/"~"@{filename}.woff2?6762325') format('woff2'), url('fonts/icons/"~"@{filename}.woff?6762325') format('woff'), url('fonts/icons/"~"@{filename}.ttf?6762325') format('truetype'), url('fonts/icons/"~"@{filename}.svg?6762325#fontello') format('svg')";
src: ~"url('fonts/icons/@{filename}.eot?6762325')";
src: ~"url('fonts/icons/@{filename}.eot?6762325#iefix') format('embedded-opentype'), url('fonts/icons/@{filename}.woff2?6762325') format('woff2'), url('fonts/icons/@{filename}.woff?6762325') format('woff'), url('fonts/icons/@{filename}.ttf?6762325') format('truetype'), url('fonts/icons/@{filename}.svg?6762325#fontello') format('svg')";
font-weight: normal;
font-style: normal;
}

View file

@ -124,13 +124,13 @@
.tools {
.row > .col-xs-12 {
position: absolute;
background: pink;
}
}
.content {
.row > .col-xs-12 {
width: 100%;
position: relative;
background-color: #fff;
}
}
@ -139,7 +139,6 @@
.content {
.row > .col-xs-12 {
width: 73%;
position: relative;
float: right;
}
}