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 
SPR-937: Alignment Sidebar (spis-master)

See merge request !45
This commit is contained in:
Jana Deutschländer 2017-04-24 15:26:56 +02:00
commit 78020606c9
14 changed files with 163 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
css/area_main-sidebar-content.less
View file

@ -4,16 +4,18 @@
#dokuwiki__aside {
// do not indent the first level of lists
// and use less indention in deeper levels
ul,
ol {
margin-left: -.4rem;
padding-left: 0;
ul,
ol {
padding-left: @margin-small;
padding-left: 1.8rem;
@media @screen_md-lg {
padding-left: @menu-margin-lg;
}
li {
margin-left: 0;

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

@ -8,7 +8,7 @@
#dokuwiki__aside {
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
@menu-margin: @icon-size + @margin-small * 2;
nav > p,
.mmissuelist li,
@ -37,6 +37,11 @@
margin-left: 0;
}
}
li:not([class]),
.li {
padding: .15em 0;
}
}
@ -70,6 +75,10 @@
> * {
margin-left: @menu-margin; // moves *all* sidebar content to the right
@media @screen_md-lg {
margin-left: @menu-margin-lg;
}
}
a {
@ -90,16 +99,20 @@
.align-items();
cursor: pointer;
height: @icon-size + @margin-small;
min-height: @icon-size + @margin-small;
opacity: 1;
border: 1px solid transparent;
border-radius: @fix_border-radius;
color: @ini_nav_menu_color;
font-size: @font-size-head6;
font-weight: normal;
margin: -1px 0 (@font-size-head6 / 2) (@menu-margin * -1); // moves the toggles back to the left
margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin - .4); // moves the toggles back to the left (.4 from li margin)
transition: @transition color, @transition background-color, @transition border-color;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg + .8);
}
span {
display: inline-block;
vertical-align: middle;
@ -108,12 +121,20 @@
span.lbl {
flex-grow: 1;
// wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
width: 100%;
box-sizing: border-box;
padding-right: 13px;
}
}
span.ico {
.flex(0 0 auto);
width: @menu-margin;
height: @icon-size;
flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: 4%;
@ -172,7 +193,23 @@
}
}
// the panel (hidden by default)
// without wrapping UL
nav > a.nav {
margin-left: -3.5rem;
@media @screen_md-lg {
margin-left: -2.5rem;
}
}
/* + + + + + active + + + + + */
span.curid a {
font-weight: bold;
}
/* + + + + + the panel (hidden by default) + + + + + */
div.nav-panel {
display: none;
margin-top: .5rem;
@ -225,7 +262,6 @@
li:not([class]),
.li {
font-size: @font-size-head6;
padding: .15em 0;
* {
font-size: inherit;
@ -294,7 +330,6 @@
li:not([class]),
.li {
font-size: @font-size-default;
padding: .15em 0 .15em .25rem;
* {
font-size: inherit;

7
css/area_sidebar-search.less → css/area_main-sidebar-search.less Executable file → Normal file
View file

@ -9,6 +9,10 @@
@icon-size: @page-header_height;
@icon-search_font-size: @font-size-big;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg);
}
p.toggleSearch a,
button[type="submit"] {
.fontello();
@ -165,10 +169,13 @@
}
}
/* + + + + + suggestionlist + + + + + */
#qsearch__out {
left: auto;
top: auto;
width: 100%;
min-width: 20rem;
}
}

7
css/area_msg.less
View file

@ -19,7 +19,10 @@
}
/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */
div.success, div.error, div.info, div.notify {
div.success,
div.error,
div.info,
div.notify {
background-repeat: no-repeat;
background-position: 8px 50%;
border: 1px solid #eeb;
@ -28,7 +31,7 @@ div.success, div.error, div.info, div.notify {
padding: .4em;
padding-left: 32px;
overflow: hidden;
border-radius: 5px;
border-radius: @fix_border-radius;
* {
color: inherit;

4
css/area_nav-usertools.less
View file

@ -36,7 +36,7 @@
text-align: center;
margin: 0;
@media @screen_only-lg {
@media @screen_md-xlg {
padding-top: .14rem;
}
@ -237,7 +237,7 @@
line-height: 1;
text-decoration: none;
@media @screen_only-lg {
@media @screen_md-xlg {
min-width: 2rem;
}

7
css/base.less
View file

@ -40,7 +40,7 @@
/* + + + for programmers customizing + + + */
@fix_border-radius: 3px;
@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
@toggle-showsidebar_width: 3.07rem; // shown sidebar after toggle
@ -62,6 +62,8 @@
/* navigation left */
@menu-margin-lg: 1.3rem;
@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
@suggestion-zebra: #EEE;
@ -152,8 +154,9 @@
@screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-xxlg}px)";
@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)";
@screen_only-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
@screen_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)";
@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)";
@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";

19
css/base_structure.less
View file

@ -73,9 +73,16 @@
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;
@ -170,6 +177,18 @@
}
}
@media @screen_md-lg {
.wide-content.showSidebar {
.content {
.row > .col-xs-12 {
margin-left: 2.1rem;
}
}
}
}
@media @screen_max-md {
.container {
margin: 0 1.25rem;

50
css/plugins/data.less Normal file
View file

@ -0,0 +1,50 @@
/**
* This file provides styles for old data plugin
* after importing struct data this can be deleted
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
.dataplugin_entry.mitarbeiter.sectionedit2 {
dl {
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;
form {
button {
min-height: 1rem;
height: 1.8em;
background-color: @ini_background_content;
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_content;
}
}
}
}
}
}

1
css/plugins/edit.less
View file

@ -22,7 +22,6 @@
div.editBox {
background-color: #FFF;
border: solid 2px #FFF;
border-radius: @ini_default_border_radius;
.editButtons {
display: inline-block;

1
css/plugins/edittable.less
View file

@ -19,6 +19,7 @@
background-color: @ini_background_content;
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;
margin-top: 0;

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

@ -12,6 +12,12 @@
left: 0;
width: 100%;
.container {
@media @screen_md-lg {
margin-left: 1.8rem;
}
}
#mm__issueselect_chosen {
max-width: 50%;
}

2
css/plugins/struct.less
View file

@ -47,9 +47,11 @@
&.export {
bottom: 1px;
overflow-x: hidden;
background: transparent url("svg.php?svg=file-export.svg&f=existing") left center no-repeat;
background-size: auto 20px;
border: solid 1px @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1;

14
css/plugins/structstatus.less Normal file
View file

@ -0,0 +1,14 @@
/**
* This file provides styles for structstatus plugin
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
.struct_status {
border-color: @ini_border;
border-radius: @fix_border-radius;
font-size: @font-size-small;
}
}

5
style.ini
View file

@ -68,10 +68,10 @@ css/area_nav-direct.less = all
css/area_nav-breadcrumb.less = all
css/area_nav-page-attributes.less = all
css/area_nav-usertools.less = all
css/area_sidebar-search.less = all
css/area_nav-pagetools.less = all
css/area_nav-metabox.less = all
css/area_main-sidebar-nav.less = all
css/area_main-sidebar-search.less = all
css/area_main-sidebar-content.less = all
css/area_main-content.less = all
css/area_main-content-secedit.less = all
@ -94,6 +94,7 @@ css/plugins/magic-matcher.less = all
css/plugins/do_tasks.less = all
css/plugins/qc.less = all
css/plugins/struct.less = all
css/plugins/structstatus.less = all
css/plugins/bureaucracy.less = all
css/plugins/highlight_parent.less = all
css/plugins/edit.less = all
@ -107,6 +108,8 @@ css/plugins/folded.less = all
css/plugins/configmanager.less = all
css/plugins/starred.less = all
css/plugins/data.less = all
; _____________ print styles _____________