Merge remote-tracking branch 'origin/spis-master' into bar_search

# Conflicts:
#	css/area_content.less
#	css/area_nav-breadcrumb.less
This commit is contained in:
Jana Deutschländer 2017-01-11 15:59:24 +01:00
commit 863ddc8263
8 changed files with 135 additions and 87 deletions

View file

@ -4,56 +4,58 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
.content .row {
> .col-xs-12 {
box-shadow: @box-shadow;
#dokuwiki__content{
#dokuwiki__content {
position: relative;
z-index: 10;
&::before{
&::before {
content: "";
position: absolute;
top: 0;
left: 0;
z-index: -1;
height: 2.6rem;
width: 100%;
background-color: @background_page-header;
border-bottom: 1px solid @color-border-light;
position: absolute;
top: 0; left: 0;
height: 3rem; width: 100%;
z-index: -1;
}
#meta-box{
#meta-box {
display: inline-block;
min-height: 1.95rem;
max-width: 40%;
float: right;
}
#plugin__highlightparent{
#plugin__highlightparent {
display: block;
}
}
}
}
.structaggregation{
td, th{
.structaggregation {
td,
th {
line-height: 125%;
a{
a {
line-height: 125%;
}
}
> a.export{
> a.export {
line-height: 135%;
padding-top: .5em;
}
~ ul li .li{
}
}
.dokuwiki .structaggregation a.export{
.dokuwiki .structaggregation a.export {
padding-top: .3em;
}
@ -62,21 +64,28 @@
.main-content > .level3,
.main-content > .level4,
.main-content > .level5,
.main-content > .level6{
.main-content > .level6 {
padding-bottom: 1rem;
> p, > ul > li .li{
a{
> p, > ul > li .li {
a {
font-size: inherit;
}
}
}
.level1, .level2, .level3, .level4, .level5, .level6{
.level1,
.level2,
.level3,
.level4,
.level5,
.level6 {
line-height: 125%;
div, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, ul, li, th, td, textarea{
div, p, th, td, textarea,
h1, h2, h3, h4, h5, h6,
dl, dt, dd, ol, ul, li {
line-height: 125%;
}
}