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

Merge branch 'spis-master' into 'master'

Browse source 
spis-master: SPR-908

See merge request !74
This commit is contained in:
Jana Deutschländer 2017-05-24 07:42:42 +02:00
commit 3c819177e9
9 changed files with 65 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,8 +205,8 @@
span.ico { span.ico {
position: relative; position: relative;
display: table-cell; display: table-cell;
width: @menu-margin; width: (@menu-margin - .1);
min-width: @menu-margin; min-width: (@menu-margin - .1);
height: @icon-size; height: @icon-size;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;

11
css/area_nav-metabox.less
View file

@ -157,7 +157,6 @@
} }
&.active { &.active {
> a { > a {
cursor: default; cursor: default;
background-color: @ini_background; background-color: @ini_background;
@ -377,9 +376,9 @@
vertical-align: text-top; vertical-align: text-top;
button { button {
background: @ini_existing; background: @ini_button_background;
border-color: @ini_existing; border-color: @ini_button_background;
color: @ini_background; color: @ini_button_color;
font-size: @font-size-small; font-size: @font-size-small;
padding: .2em .3em; padding: .2em .3em;
@ -396,8 +395,8 @@
&:hover, &:hover,
&:focus, &:focus,
&:active { &:active {
background: @ini_background; background: @ini_button_color;
color: @ini_existing; color: @ini_button_background;
} }
} }
} }

65
css/area_nav-usertools.less
View file

@ -61,6 +61,7 @@
> a { > a {
display: block; display: block;
width: auto; width: auto;
min-width: (@toggle-size + .25);
min-height: @toggle-size; min-height: @toggle-size;
overflow: hidden; overflow: hidden;
border: 1px solid @wikiicons-border; border: 1px solid @wikiicons-border;
@ -71,20 +72,11 @@
@media @screen_md-xlg { @media @screen_md-xlg {
padding-top: .14rem; padding-top: .14rem;
} }
@media @screen_only-lg {
min-width: 2rem;
}
} }
/* !!! &.user-task FIND in plugins/do_tasks.less !!! */ /* !!! &.user-task FIND in plugins/do_tasks.less !!! */
&.user { &.user {
@space-min-xxlg: .35rem;
@space-max-xxlg: .4rem;
@space-max-xlg: .5rem;
@space-max-md: .35rem;
position: relative; position: relative;
display: table-cell; display: table-cell;
background-color: @ini_background_site; background-color: @ini_background_site;
@ -93,36 +85,34 @@
color: @ini_text_webframe; color: @ini_text_webframe;
padding-right: .3rem; padding-right: .3rem;
@media @screen_min-xxlg { @media @screen_min-md {
padding-top: @space-min-xxlg; padding-top: .35rem;
}
@media @screen_max-xxlg {
padding-top: @space-max-xxlg;
}
@media @screen_max-xlg {
padding-top: @space-max-xlg;
} }
@media @screen_max-md { @media @screen_max-md {
min-height: @toggle-size; min-height: @toggle-size;
padding-top: @space-max-md; padding-top: .3rem;
}
@media @screen_max-sm {
padding-top: .35rem;
} }
@media @screen_max-xs { @media @screen_max-xs {
position: absolute; position: absolute;
top: @headericons-margin-xxs; top: @headericons-margin-xxs;
right: (@toggle-size + @headericons-margin-xxs + @space-max-xlg + .5); // 1.75rem + .45 + .5 + (button login/out margin-right) right: (@toggle-size + @headericons-margin-xxs + 1); // 1.75rem + 1 + (button login/out margin-right)
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
margin: -1px 0 0; margin: -1px 0 0;
padding-top: .4rem;
} }
@media @screen_max-xxs { @media @screen_max-xxs {
left: -10px; left: -10px;
right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem right: (@toggle-size + @headericons-margin-xxs); // 1.75rem + .45rem
width: auto; width: auto;
padding-top: .35rem;
} }
> a { > a {
@ -130,7 +120,6 @@
.align-items(); .align-items();
position: relative; position: relative;
min-height: 26px;
height: 1rem; // for IE11 height: 1rem; // for IE11
overflow: visible; overflow: visible;
background: @ini_nav_menu_hover_bg; // for removing bg-image background: @ini_nav_menu_hover_bg; // for removing bg-image
@ -141,29 +130,27 @@
margin-right: -.3rem; margin-right: -.3rem;
padding: 0 .2em 0 0; padding: 0 .2em 0 0;
@media @screen_only-xlg {
padding-bottom: .1em;
}
@media @screen_min-xxlg { @media @screen_min-xxlg {
margin-top: -(@space-min-xxlg); min-height: (@toggle-size - .1);
margin-top: -.4rem;
} }
@media @screen_max-xxlg { @media @screen_max-xxlg {
margin-top: -(@space-max-xxlg); min-height: (@toggle-size - .15);
} margin-top: -.35rem;
@media @screen_max-xlg {
margin-top: -(@space-max-xlg);
} }
@media @screen_max-md { @media @screen_max-md {
min-height: (@toggle-size - .1); min-height: (@toggle-size - .1);
margin-top: -(@space-max-md); margin-top: -.35rem;
} }
@media @screen_max-xxs { @media @screen_max-sm {
min-height: (@toggle-size - .15); margin-top: -.35rem;
}
@media @screen_max-xs {
margin-top: -.4rem;
} }
&::before { &::before {
@ -188,7 +175,7 @@
&::before { &::before {
opacity: 1; opacity: 1;
border-color: @ini_nav_menu_hover_bg; border-color: @ini_nav_menu_hover_color;
} }
bdi, bdi,
@ -246,10 +233,6 @@
line-height: 1; line-height: 1;
text-decoration: none; text-decoration: none;
@media @screen_md-xlg {
min-width: 2rem;
}
&::before { &::before {
.center-middle(); .center-middle();

2
css/area_togglelink.less
View file

@ -72,7 +72,7 @@
/* + + + toggle out + + + */ /* + + + toggle out + + + */
.wide-content & { .wide-content & {
left: -1px; left: 0;
a { a {
background-color: @ini_button_background; background-color: @ini_button_background;

4
css/base_structure.less
View file

@ -79,6 +79,10 @@
} }
} }
.qc-output {
z-index: 1; // put qc-output above meta-box
}
#spr__meta-box { #spr__meta-box {
z-index: 1; // put meta-box above positioned content-elements such as aggregations, edit-buttons z-index: 1; // put meta-box above positioned content-elements such as aggregations, edit-buttons
ul.meta-tabs > li.active { ul.meta-tabs > li.active {

2
css/plugins/do_tasks.less
View file

@ -38,7 +38,7 @@ ul.page-attributes {
.plugin__do_usertasks { .plugin__do_usertasks {
width: 100%; width: 100%;
min-width: @toggle-size; min-width: (@toggle-size + .25);
min-height: @toggle-size; min-height: @toggle-size;
border-radius: @ini_default_border_radius; border-radius: @ini_default_border_radius;
border: 1px solid @wikiicons-border; border: 1px solid @wikiicons-border;

4
css/plugins/magic-matcher.less
View file

@ -25,6 +25,10 @@
max-width: 50%; max-width: 50%;
} }
select[name="mmissues"] + div.chosen-container {
max-width: 67%;
}
button[name="toggleSuggestions"] { button[name="toggleSuggestions"] {
position: absolute; position: absolute;
right: 0; right: 0;

35
css/plugins/qc.less
View file

@ -31,33 +31,29 @@
/* + + + + + slideout output + + + + + */ /* + + + + + slideout output + + + + + */
.qc-output { .qc-output {
position: relative;
min-width: 100%; min-width: 100%;
width: auto; width: auto;
background-color: @ini_background !important;
font-size: 90%; font-size: 90%;
box-shadow: @box-shadow-bottom; box-shadow: @box-shadow-bottom;
border-bottom: solid 1px @ini_border_light; border-bottom: solid 1px @ini_border_light;
margin-bottom: 0; margin-bottom: 0;
padding-top: 0 !important; // for JS overwrite
h2 {
font-size: 1.3rem;
}
h3 {
font-size: 1.1rem;
}
h4, h5, h6 {
font-size: 1rem;
}
@media @screen_min-xxs { @media @screen_min-xxs {
margin-top: -(@margin-default + 1);
margin-right: -(@margin-default); margin-right: -(@margin-default);
margin-left: -(@margin-default); margin-left: -(@margin-default);
padding-left: @margin-default; padding-left: @margin-default;
padding-right: @margin-default; padding-right: @margin-default;
} }
@media @screen_min-md {
top: -(@margin-small);
}
@media @screen_max-md { @media @screen_max-md {
top: 0;
margin-top: -(@page_padding-top + 2); margin-top: -(@page_padding-top + 2);
margin-right: -(@margin-default * 1.6); margin-right: -(@margin-default * 1.6);
margin-left: -(@margin-default); margin-left: -(@margin-default);
@ -70,6 +66,21 @@
padding-right: @margin-default; padding-right: @margin-default;
} }
h1 {
@media @screen_min-md {
padding-top: 0;
}
}
h2 {
font-size: 1.3rem;
}
h3 {
font-size: 1.1rem;
}
h4, h5, h6 {
font-size: 1rem;
}
div, div,
p { p {
margin-left: 0; margin-left: 0;

2
css/plugins/starred.less
View file

@ -23,7 +23,6 @@
fill: @ini_nav_menu_hover_bg; fill: @ini_nav_menu_hover_bg;
} }
} }
} }
} }
@ -42,6 +41,7 @@ nav.nav-starred {
svg { svg {
vertical-align: text-top; vertical-align: text-top;
fill: @ini_nav_menu_color;
} }
} }
} }