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

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

2
css/area_main-content-secedit.less
View file

@ -56,7 +56,7 @@
&::after {
background-color: @ini_existing;
background-image: url("svg.php?svg=pencil.svg&f=background_content");
background-image: url("svg.php?svg=pencil.svg&f=background");
border-color: @ini_existing;
}
}

5
css/area_main-content.less
View file

@ -6,7 +6,7 @@
#dokuwiki__content.main-content {
.level2 {
div[class^="level"] {
p a.media {
img {
border: 1px dotted @ini_background_site;
@ -23,7 +23,8 @@
}
> div,
.section_highlight > div {
.section_highlight > div,
div[class^="level"] {
> ul,
> ol {
&:not([class="tabs"]) > li {

79
css/area_main-sidebar-nav.less
View file

@ -10,9 +10,7 @@
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small * 2;
nav > p,
.mmissuelist li,
.mmissuelist div {
nav > p {
color: @ini_nav_menu_color;
&.noissue {
@ -44,35 +42,6 @@
}
}
/* jira itemlist */
.mmissuelist {
li {
&.noissue {
list-style-type: none;
margin-left: 0;
}
a {
display: inline-block;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
}
}
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
@ -93,8 +62,14 @@
}
}
// the wrapper around the toggle to reserve space
div.nav {
height: @icon-size + @margin-small;
border: 1px solid transparent;
}
// the toggle element
a.nav {
div.nav a {
.display-flex();
.align-items();
@ -154,7 +129,6 @@
border: 2px solid @ini_nav_menu_color;
border-top-right-radius: 50%;
border-bottom-left-radius: 50%;
transition: @transition border-color;
}
// real icon
@ -177,6 +151,11 @@
color: @ini_nav_menu_hover_color;
text-decoration: none;
// always show label, even with collapsed sidebar
position: absolute;
z-index: 100;
width: 100%;
span.ico {
border-color: inherit;
@ -278,24 +257,30 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
/* max-width: 1439px */
@media @screen_max-md {
// show when toggled
body.show-mobile-sidebar {
.search.main-sidebar {
display: block !important;
position: relative;
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
form {
margin-bottom: 1rem;
.no {
display: block;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
body.show-mobile-sidebar {
#dokuwiki__aside {
> nav {
position: relative;
@ -320,7 +305,6 @@
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
@ -339,3 +323,4 @@
}
}
}

42
css/area_main-sidebar-search.less
View file

@ -181,30 +181,32 @@
/* + + + + + wide page content + + + + + */
.wide-content {
.search.main-sidebar {
p.toggleSearch {
position: relative;
z-index: 1;
display: block;
float: left;
width: 100%;
}
form {
input {
border: 0 none;
@media @screen_min-md {
.wide-content {
.search.main-sidebar {
p.toggleSearch {
position: relative;
z-index: 1;
display: block;
float: left;
width: 100%;
}
.no {
#qsearch__in {
width: 0;
padding: 0;
margin: 0;
form {
input {
border: 0 none;
}
button[type="submit"] {
display: none;
.no {
#qsearch__in {
width: 0;
padding: 0;
margin: 0;
}
button[type="submit"] {
display: none;
}
}
}
}

41
css/area_nav-metabox.less
View file

@ -37,6 +37,11 @@
border: 0 none;
}
+ .msg-area + a {
clear: right;
margin-top: 20px;
}
.tab-container {
display: table;
@ -124,6 +129,7 @@
* {
cursor: pointer;
color: inherit;
font-size: inherit;
}
.prefix {
@ -294,9 +300,38 @@
}
}
+ .msg-area + a {
clear: right;
margin-top: 20px;
/* + + + + + tab issues + + + + + */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
li {
&.noissue {
list-style-type: none;
margin-left: 0;
}
a {
display: inline-block;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
}
}
}

1
css/base.less
View file

@ -15,6 +15,7 @@
@nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing;
@background_darker: rgba(230,230,230, .2);
@ini_sidebar_width: (100 - @ini_site_width) - 4;
@height-context-bar: 50px;

2
css/base_mixins.less
View file

@ -151,7 +151,7 @@
&:active,
&:focus {
background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_bg;
color: @ini_nav_menu_hover_bg;
.prefix {

16
css/base_structure.less
View file

@ -73,23 +73,7 @@
z-index: 900;
}
/* if z-index is needed for .tools col, then use this:
.tools .row > .col-xs-12 {
z-index: 5; // SPR-945 sometimes too small space for suggestionlist
}
.wide-content .tools .row > .col-xs-12 {
z-index: 1;
}
*/
.header .row > .col-xs-12 {
z-index: 2;
}
.content .row > .col-xs-12 {
z-index: 3;
border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
}

135
css/plugins/configmanager.less
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%;
}
}
}
}
}

2
css/plugins/data.less
View file

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

10
css/plugins/magic-matcher.less
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;

5
css/plugins/struct.less
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;
}

2
css/plugins/tagging.less
View file

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