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

# Conflicts:
#	lang/de/lang.php
This commit is contained in:
Silke Pisulla 2017-04-26 09:37:42 +02:00
commit fabd75acdf
25 changed files with 129 additions and 118 deletions

View file

@ -42,7 +42,7 @@
padding: .8em 0 1em 1em;
span.outkey {
background-color: @ini_background_content;
background-color: @ini_background;
color: inherit;
font-size: 90%;

View file

@ -24,7 +24,7 @@
button {
min-height: 1rem;
height: 1.8em;
background-color: @ini_background_content;
background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
@ -41,7 +41,7 @@
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
}
}
}

View file

@ -11,7 +11,7 @@ ul.page-attributes {
strong {
overflow: hidden;
background-color: @ini_background;
background-color: @ini_background_site;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
@ -24,3 +24,60 @@ ul.page-attributes {
}
}
}
#dokuwiki__usertools.nav-usertools {
ul {
li {
&.user-task {
position: relative;
a {
overflow: visible;
white-space: normal; // Is this still needed?
text-indent: 0;
&::before {
content: ''; // remove when fontello is removed from usertools
}
}
svg {
width: 20px;
margin-top: 2px;
@media @screen_max-md {
margin-top: 4px;
}
}
&:hover {
:not(.noopentasks) {
svg path {
fill: @ini_background;
}
}
}
.noopentasks {
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
margin-top: 1px;
}
}
@media @screen_max-sm {
display: none;
}
} // user-task
} // li
} // ul
}
.plugin__do_usertasks_list {
z-index: 5;
}

View file

@ -16,7 +16,7 @@
button,
input.button {
min-height: 1rem;
background-color: @ini_background_content;
background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
@ -31,7 +31,7 @@
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
}
}
}

View file

@ -49,7 +49,7 @@
min-height: @height-context-bar;
box-sizing: border-box;
box-shadow: @box-shadow;
background-color: @ini_background_content;
background-color: @ini_background;
border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
font-size: @font-size-default;
padding: .8em 1em .5em;

View file

@ -63,9 +63,9 @@
&:focus,
&:active {
background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content");
background-image: url("svg.php?svg=file-export.svg&f=background");
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
text-decoration: none;
}
}

View file

@ -35,7 +35,7 @@ div#dwpl-ti-container {
&.selected {
position: relative;
z-index: 1;
background-color: @ini_background_content;
background-color: @ini_background;
color: @ini_text;
}
}
@ -48,7 +48,7 @@ div#dwpl-ti-container {
z-index: 0;
overflow: auto;
box-shadow: @box-shadow;
background-color: @ini_background_content;
background-color: @ini_background;
border: solid 1px @ini_border;
border-radius: 0;
margin-top: -1px;