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

# Conflicts:
#	css/plugins/edittable.less
This commit is contained in:
Jana Deutschländer 2017-05-11 16:23:30 +02:00
commit 0a63fc83ec
43 changed files with 1111 additions and 474 deletions

View file

@ -1,5 +1,5 @@
/**
* This file provides styles for old data plugin
* This file provides styles for "data plugin"
* after importing struct data this can be deleted
*/
@ -12,37 +12,37 @@
margin-left: 0;
margin-right: 0;
}
}
+ .secedit.editbutton_plugin_data {
position: relative;
top: -1em; // as margin after DL
float: left;
font-size: @font-size-small; // for right position
margin-top: 0;
.editbutton_plugin_data {
position: relative;
top: -1em; // as margin after DL
float: left;
font-size: @font-size-small; // for right position
margin-top: 0;
form {
button {
min-height: 1rem;
height: 1.8em;
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;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1.8em;
margin-top: -1px; // for right position
margin-left: .6em;
padding: 0 .3em;
transition: @transition background-color, @transition border-color, @transition color;
form {
button {
min-height: 1rem;
height: 1.8em;
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;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1.8em;
margin-top: -1px; // for right position
margin-left: .6em;
padding: 0 .3em;
transition: @transition background-color, @transition border-color, @transition color;
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background;
}
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background;
}
}
}

View file

@ -25,36 +25,52 @@ ul.page-attributes {
}
}
/* + + + + + usertool icon in header + + + + + */
#dokuwiki__usertools.nav-usertools {
ul {
li {
&.user-task {
.btn-usertools-wrapper();
.btn-usertools-num();
position: relative;
a {
overflow: visible;
white-space: normal; // Is this still needed?
text-indent: 0;
.plugin__do_usertasks {
width: 100%;
min-width: @toggle-size;
min-height: @toggle-size;
border-radius: @ini_default_border_radius;
border: 1px solid @wikiicons-border;
padding: .14rem 0 0 0;
&::before {
content: ''; // remove when fontello is removed from usertools
}
}
svg {
width: 20px;
margin-top: 2px;
&:hover,
&:focus,
&:active {
background-color: @ini_nav_menu_hover_color;
border: none;
@media @screen_max-md {
margin-top: 4px;
svg path {
fill: @ini_nav_menu_hover_bg;
}
}
}
&:hover {
:not(.noopentasks) {
svg path {
fill: @ini_background;
}
button {
background-color: @ini_nav_menu_hover_bg;
}
svg {
width: 1.2rem;
height: 1.2rem; // for IE 11
margin-bottom: 2px;
path {
fill: @ini_nav_menu_hover_color;
}
}
@ -76,7 +92,7 @@ ul.page-attributes {
}
}
@media @screen_max-sm {
@media @screen_max-xs {
display: none;
}
} // user-task
@ -85,5 +101,19 @@ ul.page-attributes {
}
.plugin__do_usertasks_list {
z-index: 5;
background-color: transparent;
@media @screen_max-sm {
right: 1.25rem !important;
left: 1.25rem !important;
}
table.inline {
background-color: #FFF;
margin-top: .5rem;
@media @screen_max-sm {
width: 100%;
}
}
}

View file

@ -1,5 +1,5 @@
/**
* This file provides styles for qc edittable plugin
* This file provides styles for "edittable plugin"
*/
@ -8,9 +8,8 @@
#dokuwiki__content.main-content {
div.editbutton_table {
position: relative; // for IE
z-index: 1; // for IE
float: left;
margin-top: -1.46rem !important; // overwrite inline styles
margin-top: -1.4em !important; // overwrite inline styles
form div.no {
button,
@ -22,7 +21,7 @@
border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
margin-top: 0; // for best position of edit-tab beneath table
margin-top: -1px; // for best position of edit-tab beneeth table
padding-right: .3em;
transition: @transition background-color, @transition border-color, @transition color;

View file

@ -1,5 +1,8 @@
/**
* This file provides styles for magic matcher plugin
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
* @author Silke Pisulla <pisulla@cosmocode.de>
*/
@ -44,7 +47,6 @@
#magicmatcher__context {
position: relative;
z-index: 100;
width: 100%;
min-height: @height-context-bar;
box-sizing: border-box;
@ -103,6 +105,59 @@ a.jiralink {
}
/* + + + + + tooltip in metabox + + + + + */
.dokuwiki {
.serverToolTip {
box-shadow: @box-shadow;
border-radius: @fix_border-radius;
font-size: @font-size-default;
h1.issueTitle {
font-size: @font-size-default;
}
h2 {
font-size: @font-size-small;
}
ul {
margin-top: @small-spacing;
}
p,
li {
font-size: (@font-size-small - .06);
* {
font-size: inherit;
}
}
p {
margin-top: @small-spacing;
margin-bottom: @small-spacing;
}
.components {
.component {
font-size: (@font-size-small - .06);
}
}
.labels {
.label {
font-size: (@font-size-small - .06);
}
}
.descriptionTeaser {
font-size: (@font-size-small - .06);
margin-top: (@small-spacing * 2);
margin-bottom: (@small-spacing * 2);
}
}
}
/* + + + + + no js version + + + + + */
.no-js {
#spr__magic-matcher {
@ -144,4 +199,3 @@ a.jiralink {
display: none;
}
}

View file

@ -16,6 +16,16 @@
font-size: (@font-size-small - .06);
}
}
a {
&:hover,
&:focus,
&:active {
svg path {
fill: @ini_nav_menu_hover_bg;
}
}
}
}
@ -25,6 +35,7 @@
width: auto;
font-size: 90%;
box-shadow: @box-shadow-bottom;
border-bottom: solid 1px @ini_border_light;
margin-bottom: 0;
h2 {

View file

@ -4,19 +4,20 @@
.page-attributes {
li.plugin_starred {
.starred svg {
margin-top: .1em;
width: 1.6em;
height: 1.6em;
font-size: 0.82rem;
fill: @ini_nav_menu_color;
}
.starred {
display: block;
padding-top: .05rem;
.starred.on svg {
fill: @ini_link;
svg {
width: 1.6em;
height: 1.6em;
font-size: 0.82rem;
fill: @ini_nav_menu_hover_color;
}
}
a:hover,
a:focus,
a:active {
.starred svg {
fill: @ini_nav_menu_hover_bg;
@ -27,12 +28,20 @@
}
nav.nav-starred {
margin-top: @nav-margin;
ul {
list-style: none;
&#sidebar-menu-starred {
margin-left: 0;
}
li {
margin-left: 0;
svg {
vertical-align: middle;
vertical-align: text-top;
}
}
}

View file

@ -101,7 +101,6 @@
/* + + + + + struct inline-editor + + + + + */
.dokuwiki {
.struct_inlineditor {
z-index: 3;
box-shadow: @box-shadow-bottom;
p.hint {

View file

@ -34,7 +34,6 @@ div#dwpl-ti-container {
&.selected {
position: relative;
z-index: 1;
background-color: @ini_background;
color: @ini_text;
}
@ -45,7 +44,6 @@ div#dwpl-ti-container {
/* + + + content box + + + */
div.dwpl-ti-content-box {
position: relative;
z-index: 0;
overflow: auto;
box-shadow: @box-shadow;
background-color: @ini_background;