EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'spis-master' into 'master'

Browse source 
spis master

See merge request !6
This commit is contained in:
Jana Deutschländer 2017-01-05 10:51:20 +01:00
commit 7ee8c3ecb7
10 changed files with 213 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

69
css/area_main-content.less Normal file
View file

@ -0,0 +1,69 @@
/**
* This file provides the design styles for the main-content.
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
#dokuwiki__content.main-content {
img {
display: inline-block;
}
/* + + + source block + + + */
.code {
margin-top: @grid;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
#dokuwiki__content.main-content {
p, a,
li, dl,
td, th,
label,
button {
font-size: .88rem;
line-height: 140%;
* {
font-size: inherit;
line-height: inherit;
}
}
.code {
font-size: .75rem;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1199px */
@media @screen_max-xlg {
#dokuwiki__content.main-content {
p, a,
li, dl,
td, th,
label,
button {
font-size: 1rem;
line-height: 140%;
* {
font-size: inherit;
line-height: inherit;
}
}
.code {
font-size: .94rem;
}
}
}

135
css/area_main-sidebar.less
View file

@ -7,10 +7,10 @@
#dokuwiki__aside.main-sidebar { #dokuwiki__aside.main-sidebar {
counter-reset: nav-counter; counter-reset: nav-counter;
/* + + + + + nav main + + + + + */ /* + + + + + nav main + + + + + */
.nav-main { .nav-main {
> ul { > ul {
@icon-size: 2rem; @icon-size: 2rem;
margin: 0; margin: 0;
@ -21,6 +21,7 @@
} }
li { li {
list-style-type: none;
color: @color-nav; color: @color-nav;
&:first-of-type { &:first-of-type {
@ -29,29 +30,49 @@
} }
.li { .li {
color: @color-nav;
a { a {
color: inherit; display: list-item;
list-style-type: square;
color: @color-nav;
padding-top: .1rem;
padding-bottom: .1rem;
transition: @transition color;
&:hover,
&:focus,
&:active {
color: @button_color;
}
} }
} }
/* + + + first level + + + */ /* + + + first level + + + */
> li { > li {
position: relative;
list-style-type: none; list-style-type: none;
border-bottom: solid 1px @color-border;
margin: 0; margin: 0;
padding: 0 0 .3rem 0; padding: 0 0 .3rem 0;
counter-increment: nav-counter; counter-increment: nav-counter;
> .li { //background-color: pink;// hier activ !!! &::after {
content: '';
position: absolute;
left: 0;
bottom: 0;
display: block;
width: 100%;
height: 1px;
background-color: @color-border;
}
> .li {
position: relative; position: relative;
z-index: 1;
margin-top: -1px;
padding: .5rem 0 .5rem (@icon-size + 1); padding: .5rem 0 .5rem (@icon-size + 1);
&::before { &::before {
//background-color: @color-link;
color: @color-nav;
content: counter(nav-counter); content: counter(nav-counter);
position: absolute; position: absolute;
top: 0; top: 0;
@ -65,6 +86,7 @@
height: 100%; height: 100%;
width: @icon-size; width: @icon-size;
overflow: hidden; overflow: hidden;
color: @color-nav;
text-align: center; text-align: center;
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
@ -78,23 +100,27 @@
width: 1px; width: 1px;
left: (@icon-size + .5); left: (@icon-size + .5);
background-color: @color-border; background-color: @color-border;
transition: @transition background-color;
} }
&.opened, &.closed{ &.opened,
&.closed {
padding: 0; padding: 0;
&::before, &::after{
&::before,
&::after {
display: none; display: none;
} }
a{
display: block; a {
position: relative; position: relative;
padding: .5rem 0 .8rem (@icon-size + 1); display: block;
margin-bottom: -.3rem;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 2px;
margin-bottom: -.3rem;
padding: .6rem 0 .7rem (@icon-size + 1);
transition: @transition color, @transition background-color, @transition border-color;
&::before { &::before {
//background-color: @color-link;
color: @color-nav;
content: counter(nav-counter); content: counter(nav-counter);
position: absolute; position: absolute;
top: -.1rem; top: -.1rem;
@ -108,9 +134,11 @@
height: 100%; height: 100%;
width: @icon-size; width: @icon-size;
overflow: hidden; overflow: hidden;
color: @color-nav;
text-align: center; text-align: center;
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
transition: @transition color;
} }
&::after { &::after {
@ -123,46 +151,59 @@
background-color: @color-border; background-color: @color-border;
transition: @transition background-color; transition: @transition background-color;
} }
&:hover, &:focus, &:active{
text-decoration: none;
background-color: #fff;
border-color: @color-link;
color: @color-link;
}
}
} &:hover,
&:focus,
&.opened{ &:active {
a{ background-color: @button_background;
background-color: @color-link; border-color: @button_color;
color: #fff; color: @button_color;
&::after, &::before{
color: #fff;
border-color: #fff;
}
&:hover, &:focus, &:active{
text-decoration: none; text-decoration: none;
background-color: #fff;
border-color: @color-link; &::before {
color: @color-link; color: @button_color;
&::after, &::before{ }
color: inherit;
border-color: inherit; &::after {
background-color: @button_color;
} }
} }
} }
} }
+ ul{
&.opened {
a {
background-color: @button_color;
color: @button_background;
&::before {
color: @button_background;
}
&:hover,
&:focus,
&:active {
background-color: @button_background;
border-color: @button_color;
color: @button_color;
text-decoration: none;
&::before {
color: @button_color;
}
}
}
}
+ ul {
height: auto; height: auto;
overflow: hidden; overflow: hidden;
} }
&.closed + ul{
height: 0; &.closed + ul {
} height: 0;
}
} }
} }
} }
} }

4
css/area_nav-breadcrumb.less
View file

@ -160,6 +160,8 @@
} }
} }
.mode_admin{
/* + + + + + ? + + + + + */
.mode_admin {
} }

14
css/area_nav-usertools.less
View file

@ -90,17 +90,9 @@
} }
.prefix { .prefix {
.btn-prefix (); .btn-prefix();
.icon-clipboard(); .icon-clipboard();
} }
&.opentasks,
&.opentask {
.num {
background-color: @color-link;
color: #fff;
}
}
} // user-task } // user-task
} // li } // li
@ -118,10 +110,10 @@
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
border-color: @color-nav-hover; border-color: @button_color;
//-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); //-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
//box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); //box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
color: @color-nav-hover; color: @button_color;
} }
&::before { &::before {

6
css/area_sidebar-search.less
View file

@ -46,11 +46,11 @@
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
border: solid 1px @color-link; border: solid 1px @button_color;
color: @color-link; color: @button_color;
&::after { &::after {
background-color: @color-link; background-color: @button_color;
} }
} }

16
css/area_sidetools.less
View file

@ -50,16 +50,28 @@
} }
} }
/* + + + linklist + + + */ /* + + + linklist + + + */
ul { ul {
padding-left: (@icon-size + .5); padding-left: (@icon-size + .5);
} }
li { li {
color: @color-nav; list-style-type: none;
a { a {
color: inherit; display: list-item;
list-style-type: square;
color: @color-nav;
padding-top: .1rem;
padding-bottom: .1rem;
transition: @transition color;
&:hover,
&:focus,
&:active {
color: @button_color;
}
} }
&:first-of-type { &:first-of-type {

2
css/base.less
View file

@ -45,6 +45,8 @@
@margin-default: 1.5rem; @margin-default: 1.5rem;
@margin-big: 2.5rem; @margin-big: 2.5rem;
@grid: @margin-small;
@transition: ease-out .30s; @transition: ease-out .30s;

10
css/base_mixins.less
View file

@ -160,15 +160,15 @@
.btn-usertools-num () { .btn-usertools-num () {
.num { .num {
position: absolute; position: absolute;
right: -.4em; right: -.5em;
top: -.4em; top: -.4em;
background-color: @button_color; background-color: @button_color;
border-radius: 2px; border-radius: 2px;
color: #fff; color: @button_background;
font-size: .6rem; font-size: .6rem;
font-weight: 400; font-weight: 400;
text-align: center; text-align: center;
line-height: 100%; line-height: 1;
padding: .2em .3em .1em; padding: .2em .3em .1em;
transition: @transition color, @transition background-color; transition: @transition color, @transition background-color;
} }
@ -189,8 +189,8 @@
.fontello(); .fontello();
.hide-text-show-before(); .hide-text-show-before();
color: @color-nav; color: inherit;
font-size: 1rem; font-size: 1.3em;
margin-top: .2rem; margin-top: .2rem;
} }

24
css/plugins/struct.less Normal file
View file

@ -0,0 +1,24 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* all media */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
#dokuwiki__content {
.structaggregation {
@link-height: 1.5rem;
position: relative;
padding-bottom: @link-height;
margin-bottom: @grid;
.table {
margin-bottom: 0;
}
> a {
position: absolute;
bottom: 0;
height: @link-height;
margin-bottom: 0;
}
}
}

2
style.ini
View file

@ -71,12 +71,14 @@ css/area_sidebar-search.less = all
css/area_nav-pagetools.less = all css/area_nav-pagetools.less = all
css/area_main-sidebar.less = all css/area_main-sidebar.less = all
css/area_sidetools.less = all css/area_sidetools.less = all
css/area_main-content.less = all
; _____________ plugin styles _____________ ; _____________ plugin styles _____________
css/plugins/magic-matcher.less = all css/plugins/magic-matcher.less = all
css/plugins/do_tasks.less = all css/plugins/do_tasks.less = all
css/plugins/struct.less = all
; _____________ print styles _____________ ; _____________ print styles _____________