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

merge jde_bar_search and bar_search branch

Browse source
This commit is contained in:
Jana Deutschländer 2017-02-09 16:48:46 +01:00
commit 5671e6e5e8
19 changed files with 333 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

16
css/area_content.less
View file

@ -13,12 +13,12 @@
z-index: 10;
&::before {
content: "";
content: '';
position: absolute;
top: 0;
left: 0;
z-index: -1;
height: 2.6rem;
height: @page-header_height;
width: 100%;
background-color: @background_page-header;
border-bottom: 1px solid @color-border-light;
@ -31,14 +31,16 @@
}
}
.structaggregation {
td,
th {
line-height: 125%;
line-height: @line-height-default;
a {
line-height: 125%;
line-height: @line-height-default;
}
}
@ -58,7 +60,7 @@
.main-content > .level4,
.main-content > .level5,
.main-content > .level6 {
padding-bottom: 1rem;
//padding-bottom: 1rem;
> p, > ul > li .li {
a {
@ -74,11 +76,11 @@
.level4,
.level5,
.level6 {
line-height: 125%;
line-height: @line-height-default;
div, p, th, td, textarea,
h1, h2, h3, h4, h5, h6,
dl, dt, dd, ol, ul, li {
line-height: 125%;
line-height: @line-height-default;
}
}

36
css/area_footer.less
View file

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

16
css/area_nav-breadcrumb.less
View file

@ -7,7 +7,7 @@
.breadcrumbs {
position: relative;
border-bottom: 1px solid @color-border;
padding: 1.6rem 1.8rem .2rem;
padding: .8rem 1.8rem .35rem;
> p {
font-size: @font-size-small;
@ -149,18 +149,24 @@
z-index: 2000;
#plugin__qc__out{
h1{
h1 {
font-size: @font-size-head3;
}
h2{
h2 {
margin-top: 1.6em;
font-size: @font-size-head5;
}
> h1, > h2, > p, >dl, >div{
> h1,
> h2,
> p,
> dl,
> div {
padding-left: 1rem;
margin-left: 0;
}
> div p{
> div p {
padding-left: 0;
margin-left: 0;
}

12
css/base.less
View file

@ -12,7 +12,6 @@
@background_page-header: __background_page-header__;
@border-radius: __default_border_radius__;
@fix_border-radius: 2px;
@font_family_screen: __font_family_screen__;
@ -56,6 +55,15 @@
@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 */
@ -92,7 +100,7 @@
@break-max-xs: (@break-min-xs - 1);
@break-min-sm: 992;
@break-max-sm: (@break-min-xs - 1);
@break-max-sm: (@break-min-sm - 1);
@break-min-md: 1024;
@break-max-md: (@break-min-md - 1);

76
css/base_design.less
View file

@ -14,7 +14,9 @@ a {
color: @color-link;
}
/* highlight selected tool */
.mode_admin a.action.admin,
.mode_login a.action.login,
.mode_register a.action.register,
@ -52,12 +54,13 @@ a {
.dokuwiki div.page {
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;
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);
}
@ -76,6 +79,12 @@ a {
/* license note under edit window */
.dokuwiki div.license {
font-size: @font-size-small;
line-height: @line-height-default;
padding-top: 1rem;
* {
font-size: inherit;
}
}
[dir=rtl] .dokuwiki .docInfo {
@ -120,34 +129,37 @@ h6 {
h1 {
font-size: @font-size-head1;
margin: 0 0 0.444em;
margin: 0 0 @font-size-head1;
padding-top: 1em;
#dokuwiki__content > & {
padding-top: 1.5em;
}
}
h2 {
font-size: @font-size-head2;
margin: 0 0 0.666em;
margin: 0 0 @font-size-head2;
}
h3 {
font-size: @font-size-head3;
margin: 0 0 0.888em;
margin: 0 0 @font-size-head3;
}
h4 {
font-size: @font-size-head4;
margin: 0 0 1.0em;
margin: 0 0 @font-size-head4;
}
h5 {
font-size: @font-size-head5;
margin: 0 0 1.1428em;
margin: 0 0 @font-size-head5;
}
h6 {
font-size: @font-size-head6;
font-weight: @font-weight-bold;
margin: 0 0 1.333em;
margin: 0 0 @font-size-head6;
}
p {
@ -524,9 +536,12 @@ input,
textarea,
select,
keygen {
border: 1px solid #ccc;
min-height: @formfield_min-height;
border: 1px solid @color-border;
box-shadow: inset 0 0 1px #eee;
border-radius: @fix_border-radius;
padding-left: .3rem;
padding-right: .3rem;
}
input:active,
@ -573,12 +588,14 @@ button {
/* + + + all types of submit-buttons + + + */
form input[type=submit], // heredity 'adnewpage'
a.button,
input[type=submit],
input[type=reset],
button[type=submit],
.qq-upload-button {
cursor: pointer;
box-shadow: none;
background-image: none;
background-color: @button_background;
border: 1px solid @button_background;
@ -595,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 + + + */
input.button,
@ -635,13 +673,12 @@ textarea[readonly] {
background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
background-color: #eee;
opacity: .5;
border: 1px solid #ccc;
border: 1px solid @color-border;
border-radius: @fix_border-radius;
color: #333;
font-weight: normal;
padding: .3em @grid;
transition: @transition background-color, @transition color;
&:hover,
&:active,
&:focus {
@ -652,9 +689,20 @@ textarea[readonly] {
color: #333;
}
}
input::-moz-focus-inner,
button::-moz-focus-inner {
border: 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;
font-size: @font-size-default;
margin-top: @very-small-spacing;
margin-top: .35rem;
}

45
css/base_structure.less
View file

@ -18,6 +18,9 @@
}
@media @screen_min-xxs {
html {
font-size: 114%; //16px
}
}
@media @screen_min-xs {
@ -55,7 +58,7 @@
@media @screen_min-xxlg {
html {
font-size: 106.25%; //17px
font-size: 100%; //16px
}
}
@ -105,6 +108,7 @@
position: relative;
height: 150px;
min-height: 6rem;
display: table;
}
}
@ -123,17 +127,22 @@
}
.claim {
display: table-cell;
height: 100%;
vertical-align: middle;
.logo {
/*position: absolute;
bottom: 1em;
overflow: visible;*/
padding: 1rem 0 .3rem;
img {
height: 60px;
height: 4.6rem;
width: auto;
border-style: solid;
border-color: transparent;
border-width: 0 2px;
border-width: 2px 0;
}
a:hover,
@ -153,31 +162,12 @@
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{
.logo{
/*visibility: hidden;*/
}
.logo{ }
.content {
.row > .col-xs-12{
.row > .col-xs-12 {
width: auto;
float: none;
}
@ -185,7 +175,7 @@
&.showSidebar{
.content {
.row > .col-xs-12 {
margin-left: @margin-big;
margin-left: @toggle-showsidebar_width;
}
}
}
@ -246,5 +236,10 @@
@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 {
float: left;
width: 50%;
min-height: 2em;
//min-height: 2em;
text-align: left;
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;
}
}
}

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{
> .controls > .content{
#popupviewer {
> .controls > .content {
padding: 1.5rem 1rem 1rem;
td, th{
td,
th {
font-size: @font-size-default;
line-height: 125%;
line-height: @line-height-default;
a{
font-size: @font-size-default;
line-height: 125%;
line-height: @line-height-default;
}
}
.li, li{
.li,
li {
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;
margin-bottom: @grid;
table th input:focus {
width: 100%;
box-sizing: border-box;
}
.table {
margin-bottom: 0;
}
@ -19,9 +24,24 @@
bottom: 0;
height: @link-height;
margin-bottom: 0;
&.export {
line-height: 1;
padding-top: .3em;
}
}
}
#plugin__struct_output{
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{
#admin__version{
.do-admin {
#admin__version {
font-size: @font-size-default;
}
.main-content ul{
.main-content ul {
> li{
font-size: @font-size-default;
div.li{
font-size: @font-size-default;
a{
font-size: @font-size-default;
line-height: 125%;
@ -15,19 +17,22 @@
}
}
}
ul.admin_tasks{
ul.admin_tasks {
padding: 0;
li{
li {
background-size: auto 1rem;
margin: 0 0 .6em 0;
a{
a {
font-weight: 400;
}
}
}
@media @screen_max-md{
ul.admin_tasks{
@media @screen_max-md {
ul.admin_tasks {
float: none;
width: auto;
}

2
lang/de/lang.php
View file

@ -21,6 +21,8 @@ $lang['head_breadcrumb'] = 'Standortanzeiger';
$lang['head_menu_trace'] = 'zuletzt angesehen';
$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_tags_none'] = 'Keine Tags verknüpft';
$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_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_tags_none'] = 'tags found: none';
$lang['meta_box_sitemap_none'] = 'no sitemap available';

6
style.ini
View file

@ -88,6 +88,10 @@ css/plugins/qc.less = all
css/plugins/struct.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 _____________
@ -161,7 +165,7 @@ __nav_menu_hover_bg__ = "#FFF"
__background_content__ = "#FFF"
__background_site__ = "#ECECEC"
__default_border_radius__ = "5px"
__default_border_radius__ = "3px"
__background_page-header__ = "#F6F6F6"

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

@ -1,14 +1,16 @@
<?php
if (!defined('DOKU_INC')) die();
echo '<div class="logo">';
/* homepage logo should not link to itself (BITV accessibility requirement) */
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'].'" />';
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'].'" />';
} 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]"' );
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>";
<?php
if (!defined('DOKU_INC')) die();
echo '<div class=\"menu-togglelink mobile-only\"><a href=\'#\'>MOB</a></div>';
echo '<div class="logo">';
/* homepage logo should not link to itself (BITV accessibility requirement) */
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'].'" />';
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'].'" />';
} 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]"' );
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>";