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

Merge remote-tracking branch 'origin/bar_search' part 1

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Jana Deutschländer 2017-02-09 16:53:43 +01:00
commit 432353279d
30 changed files with 626 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

25
css/area_content.less
View file

@ -13,22 +13,15 @@
z-index: 10; z-index: 10;
&::before { &::before {
content: ""; content: '';
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
z-index: -1; z-index: -1;
height: 2.6rem; height: @page-header_height;
width: 100%; width: 100%;
background-color: @background_page-header; background-color: @background_page-header;
border-bottom: 1px solid @color-border; border-bottom: 1px solid @color-border-light;
}
#meta-box {
display: inline-block;
min-height: 1.95rem;
max-width: 40%;
float: right;
} }
#plugin__highlightparent { #plugin__highlightparent {
@ -38,14 +31,16 @@
} }
} }
.structaggregation { .structaggregation {
td, td,
th { th {
line-height: 125%; line-height: @line-height-default;
a { a {
line-height: 125%; line-height: @line-height-default;
} }
} }
@ -65,7 +60,7 @@
.main-content > .level4, .main-content > .level4,
.main-content > .level5, .main-content > .level5,
.main-content > .level6 { .main-content > .level6 {
padding-bottom: 1rem; //padding-bottom: 1rem;
> p, > ul > li .li { > p, > ul > li .li {
a { a {
@ -81,11 +76,11 @@
.level4, .level4,
.level5, .level5,
.level6 { .level6 {
line-height: 125%; line-height: @line-height-default;
div, p, th, td, textarea, div, p, th, td, textarea,
h1, h2, h3, h4, h5, h6, h1, h2, h3, h4, h5, h6,
dl, dt, dd, ol, ul, li { dl, dt, dd, ol, ul, li {
line-height: 125%; line-height: @line-height-default;
} }
} }

38
css/area_footer.less
View file

@ -10,81 +10,65 @@
@media screen { @media screen {
.page-footer { .page-footer {
background: @background_page-header; min-height: @page-header_height;
border-top: 1px solid @color-border; background-color: @background_page-header;
border-top: 1px solid @color-border-light;
font-size: @font-size-default; font-size: @font-size-default;
padding: @margin-small (@margin-big - .5);
text-align: right; text-align: right;
padding: @margin-small @margin-default;
bdi { bdi {
font-weight: bold; font-weight: bold;
} }
} }
#dokuwiki__footer { #dokuwiki__footer {
.main-footer { .main-footer {
position: relative; position: relative;
z-index: 10; z-index: 2;
box-sizing: border-box; box-sizing: border-box;
background-color: @color-site-bg; background-color: @color-site-bg;
} }
p { p {
font-size: @font-size-default; font-size: @font-size-default;
margin: 0; margin: 0;
} }
} }
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1024px */ /* min-width: 1024px */
@media @screen_min-md { @media @screen_min-md {
#dokuwiki__footer { #dokuwiki__footer {
.col-xs-12 { .col-xs-12 {
float: right; float: right;
width: 100%; width: 100%;
} }
.main-footer { .main-footer {
padding: @margin-default 0; padding: @margin-default 0;
} }
} }
.showSidebar { .showSidebar {
#dokuwiki__footer { #dokuwiki__footer {
.col-xs-12 { .col-xs-12 {
width: 73%; width: 73%;
} }
} }
} }
.wide-content { .wide-content {
#dokuwiki__footer { &.showSidebar {
.col-xs-12 {
width: auto;
float: none;
}
}
&.showSidebar{
#dokuwiki__footer { #dokuwiki__footer {
.col-xs-12 { .col-xs-12 {
margin-left: @margin-big; margin-left: @toggle-showsidebar_width;
} }
} }
} }
} }
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */ /* max-width: 1023px */
@media @screen_max-md { @media @screen_max-md {
#dokuwiki__footer { #dokuwiki__footer {
.main-footer { .main-footer {
padding: @margin-default (@margin-big - .5); margin-top: .5rem;
padding: (@margin-default - .5) 0 @margin-default;
} }
} }
} }

79
css/area_main-content.less
View file

@ -1,23 +1,56 @@
/** /**
* This file provides the design styles for the main-content. * This file provides the design styles for the main-content.
* *
* @author Jana Deutschlaender <deutschlaender@cosmocode.de> * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/ */
#dokuwiki__content.main-content { #dokuwiki__content.main-content {
}
.level2 {
p a.media {
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ img{
/* min-width: 1440px */ border:1px dotted @color-site-bg;
@media @screen_min-xlg { }
} &:hover,&:focus,&:active{
img{
border:1px solid @color-link;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ }
/* max-width: 1199px */ }
@media @screen_max-xlg { }
} }
div.section_highlight{
margin: 0;
padding: 0 0 1rem 0;
border: 1px solid #abced4;
background-color: #fff;
background-image:
linear-gradient(90deg, transparent 79px, #abced4 79px, #abced4 81px, transparent 81px),
linear-gradient(#eee .1em, transparent .1em);
background-size: 100% 1.2em;
opacity: .7;
}
.secedit {
float: right;
margin-top: 0;
position: relative;
z-index:2;
top: 0;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1199px */
@media @screen_max-xlg {
}

5
css/area_main-sidebar.less
View file

@ -72,7 +72,7 @@
position: relative; position: relative;
z-index: 1; z-index: 1;
margin-top: -1px; margin-top: -1px;
padding: .5em 0 .5em (@margin-big + 1); padding: .5em 0 .5em (@margin-big + 1.1);
&[class="li"] { &[class="li"] {
border-bottom: solid 1px @color-border; border-bottom: solid 1px @color-border;
@ -221,6 +221,9 @@
&.closed + ul { &.closed + ul {
height: 0; height: 0;
li a{
display: none;
}
} }
} }
} }

28
css/area_nav-breadcrumb.less
View file

@ -7,11 +7,17 @@
.breadcrumbs { .breadcrumbs {
position: relative; position: relative;
border-bottom: 1px solid @color-border; border-bottom: 1px solid @color-border;
padding: 1rem 1.8rem .2rem; padding: .8rem 1.8rem .35rem;
> p { > p {
font-size: @font-size-small; font-size: @font-size-small;
margin: 0; margin: 0;
@media @screen_max-xs{
width: 1px;
position: relative;
overflow: hidden;
height: 1.6rem;
}
* { * {
font-size: @font-size-small; font-size: @font-size-small;
@ -28,6 +34,7 @@
.icon-home(); .icon-home();
min-height: 1.8em; min-height: 1.8em;
min-width: 1.9em;
width: auto; width: auto;
box-sizing: border-box; box-sizing: border-box;
border: solid 1px transparent; border: solid 1px transparent;
@ -62,8 +69,11 @@
float: right; float: right;
display: inline-block; display: inline-block;
max-width: 30%; max-width: 30%;
margin: -.6em 0 0; margin: -.35em 0 0;
padding: 0; padding: 0;
@media @screen_max-xs{
max-width: 90%;
}
> li { > li {
.btn-usertools-wrapper(); // uniform li .btn-usertools-wrapper(); // uniform li
@ -139,18 +149,24 @@
z-index: 2000; z-index: 2000;
#plugin__qc__out{ #plugin__qc__out{
h1{ h1 {
font-size: @font-size-head3; font-size: @font-size-head3;
} }
h2{
h2 {
margin-top: 1.6em; margin-top: 1.6em;
font-size: @font-size-head5; font-size: @font-size-head5;
} }
> h1, > h2, > p, >dl, >div{ > h1,
> h2,
> p,
> dl,
> div {
padding-left: 1rem; padding-left: 1rem;
margin-left: 0; margin-left: 0;
} }
> div p{
> div p {
padding-left: 0; padding-left: 0;
margin-left: 0; margin-left: 0;
} }

39
css/area_nav-metabox.less
View file

@ -1,6 +1,18 @@
#meta-box { #meta-box {
position: relative;
z-index: 10;
display: inline-block;
min-height: 1.95rem;
max-width: 40%;
float: right;
.tab-container { .tab-container {
display: table; display: table;
@media @screen_max-md{
width: 100%;
}
} }
.box-content { .box-content {
@ -12,6 +24,9 @@
ul.meta-tabs { ul.meta-tabs {
list-style: none; list-style: none;
background-color: @background_page-header; background-color: @background_page-header;
@media @screen_max-md{
background-color: #fff;
}
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -47,6 +62,10 @@
padding: .3em 1rem .1em; padding: .3em 1rem .1em;
margin-left: 4px; margin-left: 4px;
transition: @transition color, @transition background-color, @transition border-color; transition: @transition color, @transition background-color, @transition border-color;
@media @screen_max-xs{
padding: .3em .3rem .1em;
margin-left: 0;
}
* { * {
cursor: pointer; cursor: pointer;
@ -196,5 +215,25 @@
clear: right; clear: right;
margin-top: 20px; margin-top: 20px;
} }
@media @screen_max-md{
max-width: 100%;
float: none;
display: block;
top: -1.1rem;
position: relative;
right: auto;
.tab-container{
display: block;
}
ul.meta-tabs{
> li > a{
margin-left: 0;
}
}
.meta-content{
clear: both;
}
}
} }

5
css/area_nav-pagetools.less
View file

@ -199,8 +199,11 @@ nav#dokuwiki__pagetools{
} }
} }
} }
}
/* overwrite do:backlink */
.mode_backlink #dokuwiki__pagetools ul li a.backlink{
background-position: 95% center;
} }

179
css/area_sidebar-search.less
View file

@ -1,78 +1,101 @@
/** /**
* This file provides the design styles for the quick search. * This file provides the design styles for the quick search.
* *
* @author Jana Deutschlaender <deutschlaender@cosmocode.de> * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/ */
.search.main-sidebar { .search.main-sidebar {
form {
@icon-size: 40px; p.toggleSearch{
padding: 0; Margin: 0;
display: block; display: none;
margin: @margin-default 0; }
form {
.no { @icon-size: 40px;
#qsearch__in {
width: 100%; display: block;
padding-left: 10px; margin: 0 0 @margin-default;
padding-right: (@icon-size + 10);
} .no {
} #qsearch__in {
width: 100%;
input { padding-left: 10px;
min-height: @icon-size; padding-right: (@icon-size + 10);
box-sizing: border-box; }
} }
button[type="submit"] { input {
.fontello(); min-height: @icon-size;
.hide-text-show-before(); box-sizing: border-box;
.icon-search(); }
position: relative; button[type="submit"] {
width: @icon-size; .fontello();
min-height: @icon-size; .hide-text-show-before();
overflow: visible; .icon-search();
background-image: none;
background-color: transparent; position: relative;
border: solid 1px transparent; width: @icon-size;
border-right-color: @color-border; min-height: @icon-size;
color: @color-nav; overflow: visible;
margin-left: -(@icon-size); background-image: none;
padding: 0; background-color: transparent;
transition: @transition color, @transition background-color, @transition border-color; border: solid 1px transparent;
border-right-color: @color-border;
&:hover, color: @color-nav;
&:focus, margin-left: -(@icon-size);
&:active { padding: 0;
background-color: @button_color; transition: @transition color, @transition background-color, @transition border-color;
border: solid 1px @button_background;
color: @button_background; &:hover,
&:focus,
&::after { &:active {
background-color: @button_background; background-color: @button_color;
} border: solid 1px @button_background;
} color: @button_background;
&::before { &::after {
width: 100%; background-color: @button_background;
color: inherit; }
font-size: 25px; }
text-align: center;
margin: 0; &::before {
} width: 100%;
color: inherit;
&::after { font-size: 25px;
content: ''; text-align: center;
position: absolute; margin: 0;
top: 15%; }
bottom: 15%;
width: 1px; &::after {
left: -1px; content: '';
background-color: @color-border; position: absolute;
transition: @transition background-color; top: 15%;
} bottom: 15%;
} width: 1px;
} left: -1px;
} background-color: @color-border;
transition: @transition background-color;
}
}
}
}
.wide-content{
.search.main-sidebar{
p.toggleSearch{
display: block;
float: left;
}
form{
.no {
#qsearch__in{
width: 0;
padding: 0;
margin: 0;
}
}
}
}
}

5
css/area_sidetools.less
View file

@ -130,7 +130,7 @@
display: block; display: block;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: @fix_border-radius; border-radius: @fix_border-radius;
padding: .6em 0 .6em (@icon-size + 1); padding: .6em 0 .6em (@margin-big + 1);
transition: @transition color, @transition background-color, @transition border-color; transition: @transition color, @transition background-color, @transition border-color;
&::before { &::before {
@ -233,6 +233,9 @@
+ ul, + ul,
+ div { + div {
height: 0; height: 0;
a{
display: none;
}
} }
} }
} }

3
css/area_togglelink.less Normal file → Executable file
View file

@ -12,6 +12,9 @@
bottom: -1px; bottom: -1px;
left: -(@margin-default); left: -(@margin-default);
z-index: 1; z-index: 1;
@media @screen_max-md{
display: none;
}
a { a {
.display-flex(); .display-flex();

15
css/base.less
View file

@ -12,12 +12,12 @@
@background_page-header: __background_page-header__; @background_page-header: __background_page-header__;
@border-radius: __default_border_radius__; @border-radius: __default_border_radius__;
@fix_border-radius: 2px;
@font_family_screen: __font_family_screen__; @font_family_screen: __font_family_screen__;
@color-text: __text__; @color-text: __text__;
@color-border: __border__; @color-border: __border__;
@color-border-light: __border_light__;
@color-nav: __nav_menu_color__; @color-nav: __nav_menu_color__;
@color-nav-hover: __nav_menu_hover_color__; @color-nav-hover: __nav_menu_hover_color__;
@color-nav-hover-bg: __nav_menu_hover_bg__; @color-nav-hover-bg: __nav_menu_hover_bg__;
@ -35,6 +35,8 @@
@box-shadow: __box_shadow__; @box-shadow: __box_shadow__;
@box-shadow-colored: __box_shadow_colored__; @box-shadow-colored: __box_shadow_colored__;
@th_background: __background_alt__;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* global vars */ /* global vars */
@ -53,6 +55,15 @@
@transition: ease-out .30s; @transition: ease-out .30s;
/* + + + for programmers customizing + + + */
@fix_border-radius: 3px;
@toggle-showsidebar_width: 3.07rem; // shown sidebar after toggle
@page_padding-top: @margin-small; // padding-top for 'dokuwiki__content'
@page-header_height: 2.8rem; // minimum: 2.8rem (height for breadcrumb, page-header, page-footer)
@meta-box_height: (@page-header_height - @page_padding-top);
@breadcrumb_height: @page-header_height;
@formfield_min-height: 2rem; // min-height for input, textarea, select, keygen
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* fonts */ /* fonts */
@ -89,7 +100,7 @@
@break-max-xs: (@break-min-xs - 1); @break-max-xs: (@break-min-xs - 1);
@break-min-sm: 992; @break-min-sm: 992;
@break-max-sm: (@break-min-xs - 1); @break-max-sm: (@break-min-sm - 1);
@break-min-md: 1024; @break-min-md: 1024;
@break-max-md: (@break-min-md - 1); @break-max-md: (@break-min-md - 1);

84
css/base_design.less
View file

@ -14,7 +14,9 @@ a {
color: @color-link; color: @color-link;
} }
/* highlight selected tool */ /* highlight selected tool */
.mode_admin a.action.admin, .mode_admin a.action.admin,
.mode_login a.action.login, .mode_login a.action.login,
.mode_register a.action.register, .mode_register a.action.register,
@ -52,12 +54,21 @@ a {
.dokuwiki div.page { .dokuwiki div.page {
clear: both; clear: both;
background: @color-content-bg;
color: inherit;
padding: (@margin-default / 2) @margin-default @margin-default;
// margin-bottom: .5rem; // no margin: if there is another bg-color, then there is an #fff border
overflow: hidden; overflow: hidden;
word-wrap: break-word; word-wrap: break-word;
background: @color-content-bg;
color: inherit;
// margin-bottom: .5rem; // no margin: if there is another bg-color, then there is an #fff border
padding: @page_padding-top @margin-default @margin-default;
@media @screen_max-md{
padding-right: (@margin-default *1.6);
}
}
.content #dokuwiki__pagetools{
@media @screen_max-md{
top: 4rem;
}
} }
.dokuwiki .docInfo { .dokuwiki .docInfo {
@ -68,6 +79,12 @@ a {
/* license note under edit window */ /* license note under edit window */
.dokuwiki div.license { .dokuwiki div.license {
font-size: @font-size-small; font-size: @font-size-small;
line-height: @line-height-default;
padding-top: 1rem;
* {
font-size: inherit;
}
} }
[dir=rtl] .dokuwiki .docInfo { [dir=rtl] .dokuwiki .docInfo {
@ -112,34 +129,37 @@ h6 {
h1 { h1 {
font-size: @font-size-head1; font-size: @font-size-head1;
margin: 0 0 0.444em; margin: 0 0 @font-size-head1;
padding-top: 1em; padding-top: 1em;
#dokuwiki__content > & {
padding-top: 1.5em;
}
} }
h2 { h2 {
font-size: @font-size-head2; font-size: @font-size-head2;
margin: 0 0 0.666em; margin: 0 0 @font-size-head2;
} }
h3 { h3 {
font-size: @font-size-head3; font-size: @font-size-head3;
margin: 0 0 0.888em; margin: 0 0 @font-size-head3;
} }
h4 { h4 {
font-size: @font-size-head4; font-size: @font-size-head4;
margin: 0 0 1.0em; margin: 0 0 @font-size-head4;
} }
h5 { h5 {
font-size: @font-size-head5; font-size: @font-size-head5;
margin: 0 0 1.1428em; margin: 0 0 @font-size-head5;
} }
h6 { h6 {
font-size: @font-size-head6; font-size: @font-size-head6;
font-weight: @font-weight-bold; font-weight: @font-weight-bold;
margin: 0 0 1.333em; margin: 0 0 @font-size-head6;
} }
p { p {
@ -516,9 +536,12 @@ input,
textarea, textarea,
select, select,
keygen { keygen {
border: 1px solid #ccc; min-height: @formfield_min-height;
border: 1px solid @color-border;
box-shadow: inset 0 0 1px #eee; box-shadow: inset 0 0 1px #eee;
border-radius: @fix_border-radius; border-radius: @fix_border-radius;
padding-left: .3rem;
padding-right: .3rem;
} }
input:active, input:active,
@ -565,12 +588,14 @@ button {
/* + + + all types of submit-buttons + + + */ /* + + + all types of submit-buttons + + + */
form input[type=submit], // heredity 'adnewpage'
a.button, a.button,
input[type=submit], input[type=submit],
input[type=reset], input[type=reset],
button[type=submit], button[type=submit],
.qq-upload-button { .qq-upload-button {
cursor: pointer; cursor: pointer;
box-shadow: none;
background-image: none; background-image: none;
background-color: @button_background; background-color: @button_background;
border: 1px solid @button_background; border: 1px solid @button_background;
@ -587,6 +612,27 @@ button[type=submit],
} }
} }
input[type=submit],
button[type=submit] {
&[disabled] {
cursor: default;
&:hover,
&:active,
&:focus {
box-shadow: none;
background-image: none;
background-color: @button_background;
color: @button_color;
border-color: @button_background;
}
}
+ span {
display: block;
margin-top: @grid;
}
}
/* + + + all types of buttons not being submit-buttons + + + */ /* + + + all types of buttons not being submit-buttons + + + */
input.button, input.button,
@ -627,13 +673,12 @@ textarea[readonly] {
background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
background-color: #eee; background-color: #eee;
opacity: .5; opacity: .5;
border: 1px solid #ccc; border: 1px solid @color-border;
border-radius: @fix_border-radius; border-radius: @fix_border-radius;
color: #333; color: #333;
font-weight: normal; font-weight: normal;
padding: .3em @grid; padding: .3em @grid;
transition: @transition background-color, @transition color; transition: @transition background-color, @transition color;
&:hover, &:hover,
&:active, &:active,
&:focus { &:focus {
@ -644,9 +689,20 @@ textarea[readonly] {
color: #333; color: #333;
} }
} }
input::-moz-focus-inner, input::-moz-focus-inner,
button::-moz-focus-inner { button::-moz-focus-inner {
border: 0; border: 0;
padding: 0; padding: 0;
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* media queries */
@media @screen_max-lg {
.dokuwiki div.license {
font-size: @font-size-default;
}
}
@media @screen_max-md {
.dokuwiki div.license {
font-size: @font-size-small;
}
}

2
css/base_mixins.less
View file

@ -191,7 +191,7 @@
color: inherit; color: inherit;
font-size: @font-size-default; font-size: @font-size-default;
margin-top: @very-small-spacing; margin-top: .35rem;
} }

66
css/base_structure.less
View file

@ -18,9 +18,15 @@
} }
@media @screen_min-xxs { @media @screen_min-xxs {
html {
font-size: 114%; //16px
}
} }
@media @screen_min-xs { @media @screen_min-xs {
html {
font-size: 114%; //16px
}
} }
@media @screen_min-sm { @media @screen_min-sm {
@ -52,7 +58,7 @@
@media @screen_min-xxlg { @media @screen_min-xxlg {
html { html {
font-size: 106.25%; //17px font-size: 100%; //16px
} }
} }
@ -102,6 +108,7 @@
position: relative; position: relative;
height: 150px; height: 150px;
min-height: 6rem; min-height: 6rem;
display: table;
} }
} }
@ -120,17 +127,22 @@
} }
.claim { .claim {
display: table-cell;
height: 100%;
vertical-align: middle;
.logo { .logo {
position: absolute; /*position: absolute;
bottom: 1em; bottom: 1em;
overflow: visible; overflow: visible;*/
padding: 1rem 0 .3rem;
img { img {
height: 60px; height: 4.6rem;
width: auto; width: auto;
border-style: solid; border-style: solid;
border-color: transparent; border-color: transparent;
border-width: 0 2px; border-width: 2px 0;
} }
a:hover, a:hover,
@ -150,31 +162,12 @@
float: right; float: right;
} }
} }
.claim {
.logo {
position: absolute;
bottom: 0;
height: 1px;
width: 100%; // fo IE
overflow: visible;
}
.logo img {
max-width: 100%;
height: auto;
}
}
} }
.wide-content{ .wide-content{
.logo{ .logo{ }
visibility: hidden;
}
.content { .content {
.row > .col-xs-12{ .row > .col-xs-12 {
width: auto; width: auto;
float: none; float: none;
} }
@ -182,7 +175,7 @@
&.showSidebar{ &.showSidebar{
.content { .content {
.row > .col-xs-12 { .row > .col-xs-12 {
margin-left: @margin-big; margin-left: @toggle-showsidebar_width;
} }
} }
} }
@ -201,7 +194,7 @@
@media @screen_max-md { @media @screen_max-md {
.container { .container {
margin: 0 @margin-big 0 1.25rem; margin: 0 1.25rem;
} }
#dokuwiki__usertools { #dokuwiki__usertools {
@ -209,6 +202,8 @@
max-width: 75%; max-width: 75%;
position: absolute; position: absolute;
top: 0; top: 0;
margin-right: 0;
right: 1.25rem;
} }
.content { .content {
@ -225,9 +220,9 @@
#dokuwiki__header { #dokuwiki__header {
.logo { .logo {
width: 200px; /*width: 200px;
max-width: 33%; max-width: 33%;
margin: .8rem 0; margin: .8rem 0;*/
} }
} }
@ -237,3 +232,14 @@
} }
} }
} }
@media @screen_max-md{
.claim{
min-height: 3rem;
.logo{
.mobile-only{
margin: .8rem 1rem .6rem 0;
}
}
}
}

2
css/plugins/bureaucracy.less
View file

@ -42,7 +42,7 @@
select { select {
float: left; float: left;
width: 50%; width: 50%;
min-height: 2em; //min-height: 2em;
text-align: left; text-align: left;
padding: .1em .2em; padding: .1em .2em;
} }

43
css/plugins/edit.less Normal file
View file

@ -0,0 +1,43 @@
/**
* This file provides styles for the edit view (?do=edit), preview
* and section edit buttons.
*/
/* + + + + + edit view + + + + + */
.dokuwiki {
div.section_highlight {
clear: right;
}
.secedit button {
clear: both;
font-size: 100%;
margin-top: .5rem;
margin-bottom: .5rem;
}
div.editbutton_table form div.no {
button,
input.button {
border-top: solid 1px @button_background;
margin-top: 0;
}
}
.editBox {
.editButtons {
display: inline-block;
padding-bottom: 1rem;
}
}
}
.mode_edit {
.content {
.msg-area {
display: block;
margin-bottom: 1.5rem;
clear: both;
}
#meta-box {
display: none;
}
}
}

6
css/plugins/hightlight_parent.less Normal file
View file

@ -0,0 +1,6 @@
@media @screen_max-md{
#plugin__highlightparent{
clear: both;
margin-top: 1rem;
}
}

26
css/plugins/include.less Normal file
View file

@ -0,0 +1,26 @@
/**
* This file provides the main design styles
* across all template elements (typo, colors etc.)
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
#dokuwiki__content .plugin_include_content {
> h1 {
padding-top: @font-size-head1;
}
> h2 {
padding-top: @font-size-head2;
}
> h3 {
padding-top: @font-size-head3;
}
> h4 {
padding-top: @font-size-head4;
}
> h5 {
padding-top: @font-size-head5;
}
> h6 {
padding-top: @font-size-head6;
}
}

23
css/plugins/mediamanager.less Normal file
View file

@ -0,0 +1,23 @@
/**
* This file provides styles for the edit view (?do=edit), preview
* and section edit buttons.
*/
/* + + + + + mediamanager + + + + + */
#mediamanager__page {
.namespaces h2 {
bottom: 0;
line-height: 100%;
margin-bottom: -1px;
}
#media__tree ul li img {
padding-top: .3em;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* media queries */
@media @screen_max-md {
#mediamanager__page {
min-width: 100%;
max-width: 100%;
}
}

18
css/plugins/popupviewer.less
View file

@ -1,19 +1,23 @@
#popupviewer{ #popupviewer {
> .controls > .content{ > .controls > .content {
padding: 1.5rem 1rem 1rem; padding: 1.5rem 1rem 1rem;
td, th{
td,
th {
font-size: @font-size-default; font-size: @font-size-default;
line-height: 125%; line-height: @line-height-default;
a{ a{
font-size: @font-size-default; font-size: @font-size-default;
line-height: 125%; line-height: @line-height-default;
} }
} }
.li, li{ .li,
li {
font-size: @font-size-default; font-size: @font-size-default;
line-height: 125%; line-height: @line-height-default;
} }
} }
} }

20
css/plugins/struct.less
View file

@ -10,6 +10,11 @@
padding-bottom: @link-height; padding-bottom: @link-height;
margin-bottom: @grid; margin-bottom: @grid;
table th input:focus {
width: 100%;
box-sizing: border-box;
}
.table { .table {
margin-bottom: 0; margin-bottom: 0;
} }
@ -19,9 +24,24 @@
bottom: 0; bottom: 0;
height: @link-height; height: @link-height;
margin-bottom: 0; margin-bottom: 0;
&.export {
line-height: 1;
padding-top: .3em;
}
} }
} }
#plugin__struct_output{ #plugin__struct_output{
margin-right: 0; margin-right: 0;
} }
.struct_entry_form {
margin-bottom: 2rem;
> fieldset {
margin-top: 1.5rem;
}
}
textarea + .struct_entry_form {
margin-top: -.5rem;
}
} }

48
css/plugins/tabinclude.less Normal file
View file

@ -0,0 +1,48 @@
/**
* This file provides styles for the edit view (?do=edit), preview
* and section edit buttons.
*/
/* + + + + + plugin tabinclude + + + + + */
div#dwpl-ti-container {
/* + + + tabnav + + + */
li.dwpl-ti-tab {
box-shadow: none;
border-color: @color-site-bg;
border-radius: @fix_border-radius @fix_border-radius 0 0;
padding: 0;
div {
background-color: @background_page-header;
border-radius: inherit;
padding: .1em .35em;
&.selected {
background-color: @color-site-bg;
}
}
}
/* + + + box + + + */
div.dwpl-ti-content-box {
overflow: auto;
box-shadow: none;
background-color: @color-site-bg;
border: solid 1px @color-site-bg;
border-radius: 0;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* media queries */
@media @screen_max-md {
div#dwpl-ti-container {
}
}

21
css/template_admin.less
View file

@ -1,12 +1,14 @@
.do-admin{ .do-admin {
#admin__version{ #admin__version {
font-size: @font-size-default; font-size: @font-size-default;
} }
.main-content ul{ .main-content ul {
> li{ > li{
font-size: @font-size-default; font-size: @font-size-default;
div.li{ div.li{
font-size: @font-size-default; font-size: @font-size-default;
a{ a{
font-size: @font-size-default; font-size: @font-size-default;
line-height: 125%; line-height: 125%;
@ -15,19 +17,22 @@
} }
} }
} }
ul.admin_tasks{
ul.admin_tasks {
padding: 0; padding: 0;
li{
li {
background-size: auto 1rem; background-size: auto 1rem;
margin: 0 0 .6em 0; margin: 0 0 .6em 0;
a{
a {
font-weight: 400; font-weight: 400;
} }
} }
} }
@media @screen_max-md{ @media @screen_max-md {
ul.admin_tasks{ ul.admin_tasks {
float: none; float: none;
width: auto; width: auto;
} }

25
js/sidebar-menu.js
View file

@ -3,11 +3,28 @@
var addToggleLink = function($elem){ var addToggleLink = function($elem){
$elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>'); $elem.wrapInner('<a href="#toggleMenu" class="toggler"></a>');
}, },
setContentMinHeight = function(){
var $sidebar = $('.page-wrapper').find('> .tools').find('.col-xs-12');
if($sidebar.length == 1){
var h = $sidebar.height(),
num = parseFloat(h);
if(!isNaN(num)){
$('#dokuwiki__content').css('minHeight',num + 100);
}
}
},
setWideContent = function(){ setWideContent = function(){
var $openTogglers = $('.main-sidebar').find('.opened').find('.toggler');
$openTogglers.trigger( "click" );
$('body').addClass('wide-content'); $('body').addClass('wide-content');
}, },
setDefaultContent= function(){ setDefaultContent= function(){
$('body').removeClass('wide-content'); $('body').removeClass('wide-content');
}, },
toggleState = function($toggler){ toggleState = function($toggler){
$toggler.toggleClass('closed'); $toggler.toggleClass('closed');
@ -54,6 +71,10 @@
if($this.hasClass('opened')){ if($this.hasClass('opened')){
var $foc = focusFirstSubLink($this.closest('li.level1'), true); var $foc = focusFirstSubLink($this.closest('li.level1'), true);
} }
if($('body').hasClass('wide-content')){
setDefaultContent();
}
}); });
}); });
@ -104,6 +125,9 @@
if ($this.hasClass('opened')) { if ($this.hasClass('opened')) {
var $elem = ($submenu.is('div')) ? focusLastSubLink($submenu): focusFirstSubLink($submenu,false); var $elem = ($submenu.is('div')) ? focusLastSubLink($submenu): focusFirstSubLink($submenu,false);
} }
if($('body').hasClass('wide-content')){
setDefaultContent();
}
}); });
}); });
@ -122,6 +146,7 @@
mainMenu(); mainMenu();
sideMenu(); sideMenu();
toggleMainContent(); toggleMainContent();
setContentMinHeight();
}); });
} )( jQuery, spc ); } )( jQuery, spc );

2
lang/de/lang.php
View file

@ -21,6 +21,8 @@ $lang['head_breadcrumb'] = 'Standortanzeiger';
$lang['head_menu_trace'] = 'zuletzt angesehen'; $lang['head_menu_trace'] = 'zuletzt angesehen';
$lang['head_meta_box'] = 'Metainformationen zur Seite'; $lang['head_meta_box'] = 'Metainformationen zur Seite';
$lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche';
$lang['meta_box_jira_tickets_none'] = 'Keine Jira-Tickets verknüpft'; $lang['meta_box_jira_tickets_none'] = 'Keine Jira-Tickets verknüpft';
$lang['meta_box_tags_none'] = 'Keine Tags verknüpft'; $lang['meta_box_tags_none'] = 'Keine Tags verknüpft';
$lang['meta_box_sitemap_none'] = 'keine Sitemap vorhanden'; $lang['meta_box_sitemap_none'] = 'keine Sitemap vorhanden';

2
lang/en/lang.php
View file

@ -21,6 +21,8 @@ $lang['head_breadcrumb'] = 'location indicator';
$lang['head_menu_trace'] = 'trace / visited last'; $lang['head_menu_trace'] = 'trace / visited last';
$lang['head_meta_box'] = 'meta data for this page'; $lang['head_meta_box'] = 'meta data for this page';
$lang['jump_to_quicksearch'] = 'Jump to quick search';
$lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none'; $lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none';
$lang['meta_box_tags_none'] = 'tags found: none'; $lang['meta_box_tags_none'] = 'tags found: none';
$lang['meta_box_sitemap_none'] = 'no sitemap available'; $lang['meta_box_sitemap_none'] = 'no sitemap available';

7
main.php
View file

@ -168,13 +168,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
<div class="search main-sidebar"> <div class="search main-sidebar">
<?php <?php
if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
if (tpl_getConf('logo_spacer') && file_exists(mediaFN(tpl_getConf('logo_spacer')))){
echo '<img width="5" height="5" src="'.ml(tpl_getConf('logo_spacer')).'" alt="" />';
} else{
echo '<img width="5" height="5" src="'.ml(tpl_getConf('logo')).'" alt="" />';
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */

13
style.ini
View file

@ -87,6 +87,11 @@ css/plugins/do_tasks.less = all
css/plugins/qc.less = all css/plugins/qc.less = all
css/plugins/struct.less = all css/plugins/struct.less = all
css/plugins/bureaucracy.less = all css/plugins/bureaucracy.less = all
css/plugins/highlight_parent.less = all
css/plugins/edit.less = all
css/plugins/mediamanager.less = all
css/plugins/tabinclude.less = all
css/plugins/include.less = all
; _____________ print styles _____________ ; _____________ print styles _____________
@ -114,14 +119,14 @@ __background__ = "#ECECEC" ; @ini_background
; alternative text and background colors ; alternative text and background colors
__text_alt__ = "#454545" ; @ini_text_alt __text_alt__ = "#454545" ; @ini_text_alt
__background_alt__ = "#e8e8e8" ; @ini_background_alt __background_alt__ = "#f6f6f6" ; @ini_background_alt
; neutral text and background colors ; neutral text and background colors
__text_neu__ = "#656565" ; @ini_text_neu __text_neu__ = "#656565" ; @ini_text_neu
__background_neu__ = "#ffffff" ; @ini_background_neu __background_neu__ = "#ffffff" ; @ini_background_neu
; border color ; border color
__border__ = "#cccccc" ; @ini_border __border__ = "#bbbbbb" ; @ini_border
; highlighted text (e.g. search snippets) ; highlighted text (e.g. search snippets)
__highlight__ = "#efefef" ; @ini_highlight __highlight__ = "#efefef" ; @ini_highlight
@ -160,6 +165,8 @@ __nav_menu_hover_bg__ = "#FFF"
__background_content__ = "#FFF" __background_content__ = "#FFF"
__background_site__ = "#ECECEC" __background_site__ = "#ECECEC"
__default_border_radius__ = "5px" __default_border_radius__ = "3px"
__background_page-header__ = "#F6F6F6" __background_page-header__ = "#F6F6F6"
__border_light__ = "#dadada"

30
tpl/main-sidebar-logo.php
View file

@ -1,14 +1,16 @@
<?php <?php
if (!defined('DOKU_INC')) die(); if (!defined('DOKU_INC')) die();
echo '<div class="logo">';
echo '<div class=\"menu-togglelink mobile-only\"><a href=\'#\'>MOB</a></div>';
/* homepage logo should not link to itself (BITV accessibility requirement) */ echo '<div class="logo">';
if (strcmp(wl(), $_SERVER['REQUEST_URI']) === 0 ){
echo '<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />'; /* homepage logo should not link to itself (BITV accessibility requirement) */
echo '<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />'; if (strcmp(wl(), $_SERVER['REQUEST_URI']) === 0 ){
echo '<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
} else{ echo '<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
tpl_link( wl(),'<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
tpl_link( wl(),'<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' ); } else{
} tpl_link( wl(),'<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
echo "<hr class=\"structure\" /></div>"; tpl_link( wl(),'<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
}
echo "<hr class=\"structure\" /></div>";

12
tpl/main-sidebar-search.php
View file

@ -1,6 +1,6 @@
<?php <?php
if (!defined('DOKU_INC')) die(); if (!defined('DOKU_INC')) die();
echo '<h6 class="sr-only" role="heading" aria-level="2">'.tpl_getLang('head_quick_search').'</h6>'; echo '<h6 class="sr-only" role="heading" aria-level="2">'.tpl_getLang('head_quick_search').'</h6>'; ?>
<p class="toggleSearch"><a href="#qsearch__out"><span class="prefix">Zur Suche springen</span></a></p>
tpl_searchform(); <?php tpl_searchform(); ?>