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

# Conflicts:
#	css/plugins/magic-matcher.less
This commit is contained in:
Silke Pisulla 2017-04-28 15:06:27 +02:00
commit cc0073cf46
22 changed files with 345 additions and 184 deletions

View file

@ -7,8 +7,18 @@
#dokuwiki__content {
#config__manager {
fieldset {
min-width: 100%;
overflow-x: auto;
box-sizing: border-box;
background-color: @background_darker;
margin-left: 0;
margin-right: 0;
}
.selectiondefault {
background-color: transparent;
color: inherit;
}
tr {
@ -16,6 +26,12 @@
background-color: transparent;
color: inherit;
}
&:hover {
td {
color: inherit;
}
}
}
tr.default {
@ -23,5 +39,124 @@
background-color: transparent;
}
}
td.label {
padding: .8em 0 1.2em 1em;
span.outkey {
background-color: @ini_background;
color: inherit;
font-size: (@font-size-small - .06);
font-weight: bold;
padding: 0 @very-small-spacing;
a {
font-size: inherit;
}
}
label {
line-height: @line-height-big;
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1024px */
@media @screen_max-md {
#dokuwiki__content {
#config__manager {
td {
&.label {
label,
span {
font-size: @font-size-small;
}
}
&.label + td {
font-size: @font-size-small;
span {
font-size: inherit;
}
}
select,
input.edit {
font-size: @font-size-small;
}
}
.selectiondefault {
label {
font-size: @font-size-small;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 768px */
@media @screen_max-sm {
#dokuwiki__content {
#config__manager {
table {
border-top: 0 none;
}
td {
padding-top: 0;
&.label {
display: block;
width: 100%;
border: 0 none;
border-top: 1px solid @ini_border;
border-bottom: 0 none;
padding: .8em .5em .3em;
span.outkey {
margin-left: 0;
}
}
.input {
width: 100%;
}
&.value,
&.label + td {
display: block;
width: 100%;
border: 0 none;
margin-bottom: 1.2rem;
}
select,
input.edit {
width: 100%;
text-overflow: ellipsis;
}
}
.selectiondefault {
float: none;
max-width: 100%;
width: auto;
label {
width: 90%;
}
}
}
}
}

View file

@ -7,7 +7,7 @@
/* + + + + + global + + + + + */
#dokuwiki__content {
.dataplugin_entry.mitarbeiter.sectionedit2 {
.dataplugin_entry {
dl {
margin-left: 0;
margin-right: 0;

View file

@ -86,16 +86,6 @@
}
/* + + + + + in meta box + + + + + */
/* see area_nav-metabox.less */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
}
}
/* + + + + + in content + + + + + */
a.jiralink {
font-size: @font-size-default;

View file

@ -63,7 +63,7 @@
&: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;
text-decoration: none;
@ -104,8 +104,7 @@
z-index: 3;
box-shadow: @box-shadow-bottom;
.hint p {
color: @color-editBox;
p.hint {
margin-top: @small-spacing;
margin-bottom: @margin-small;
}

View file

@ -12,7 +12,7 @@
li {
&.t0 a {
font-size: .9rem;
font-size: .88rem;
}
&.t1 a {
font-size: 1rem;