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

See merge request !59
This commit is contained in:
Jana Deutschländer 2017-04-26 16:57:50 +02:00
commit 96ffde03fc
14 changed files with 250 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/area_main-content-secedit.less
View file

@ -56,7 +56,7 @@
&::after { &::after {
background-color: @ini_existing; background-color: @ini_existing;
background-image: url("svg.php?svg=pencil.svg&f=background_content"); background-image: url("svg.php?svg=pencil.svg&f=background");
border-color: @ini_existing; border-color: @ini_existing;
} }
} }

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

@ -10,9 +10,7 @@
@icon-size: @font-size-big; @icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small * 2; @menu-margin: @icon-size + @margin-small * 2;
nav > p, nav > p {
.mmissuelist li,
.mmissuelist div {
color: @ini_nav_menu_color; color: @ini_nav_menu_color;
&.noissue { &.noissue {
@ -44,35 +42,6 @@
} }
} }
/* jira itemlist */
.mmissuelist {
li {
&.noissue {
list-style-type: none;
margin-left: 0;
}
a {
display: inline-block;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
}
}
> * { > * {
margin-left: @menu-margin; // moves *all* sidebar content to the right margin-left: @menu-margin; // moves *all* sidebar content to the right
@ -154,7 +123,6 @@
border: 2px solid @ini_nav_menu_color; border: 2px solid @ini_nav_menu_color;
border-top-right-radius: 50%; border-top-right-radius: 50%;
border-bottom-left-radius: 50%; border-bottom-left-radius: 50%;
transition: @transition border-color;
} }
// real icon // real icon
@ -278,24 +246,30 @@
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */ /* max-width: 1439px */
@media @screen_max-md { @media @screen_max-xlg {
// show when toggled #dokuwiki__aside {
body.show-mobile-sidebar { nav {
.search.main-sidebar { li:not([class]),
display: block !important; .li {
position: relative; font-size: @font-size-default;
form { * {
margin-bottom: 1rem; font-size: inherit;
font-weight: inherit;
.no {
display: block;
} }
} }
} }
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
body.show-mobile-sidebar {
#dokuwiki__aside { #dokuwiki__aside {
> nav { > nav {
position: relative; position: relative;
@ -319,23 +293,3 @@
} }
} }
} }
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */
@media @screen_max-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}

42
css/area_main-sidebar-search.less
View file

@ -181,30 +181,32 @@
/* + + + + + wide page content + + + + + */ /* + + + + + wide page content + + + + + */
.wide-content { @media @screen_min-md {
.search.main-sidebar { .wide-content {
p.toggleSearch { .search.main-sidebar {
position: relative; p.toggleSearch {
z-index: 1; position: relative;
display: block; z-index: 1;
float: left; display: block;
width: 100%; float: left;
} width: 100%;
form {
input {
border: 0 none;
} }
.no { form {
#qsearch__in { input {
width: 0; border: 0 none;
padding: 0;
margin: 0;
} }
button[type="submit"] { .no {
display: none; #qsearch__in {
width: 0;
padding: 0;
margin: 0;
}
button[type="submit"] {
display: none;
}
} }
} }
} }

41
css/area_nav-metabox.less
View file

@ -36,6 +36,11 @@
border: 0 none; border: 0 none;
} }
+ .msg-area + a {
clear: right;
margin-top: 20px;
}
.tab-container { .tab-container {
display: table; display: table;
@ -123,6 +128,7 @@
* { * {
cursor: pointer; cursor: pointer;
color: inherit; color: inherit;
font-size: inherit;
} }
.prefix { .prefix {
@ -292,8 +298,37 @@
} }
} }
+ .msg-area + a {
clear: right; /* + + + + + tab issues + + + + + */
margin-top: 20px; #spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
li {
&.noissue {
list-style-type: none;
margin-left: 0;
}
a {
display: inline-block;
}
}
img {
vertical-align: bottom;
margin-right: .3rem;
}
.mm__status {
padding-left: .3rem;
padding-right: .3rem;
}
form {
vertical-align: text-top;
}
}
} }
} }

1
css/base.less
View file

@ -15,6 +15,7 @@
@nav_direct_background: @ini_background; @nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing; @nav_direct_color: @ini_existing;
@background_darker: rgba(230,230,230, .2);
@ini_sidebar_width: (100 - @ini_site_width) - 4; @ini_sidebar_width: (100 - @ini_site_width) - 4;
@height-context-bar: 50px; @height-context-bar: 50px;

2
css/base_mixins.less
View file

@ -151,7 +151,7 @@
&:active, &:active,
&:focus { &:focus {
background-color: @ini_nav_menu_hover_color; background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color; border-color: @ini_nav_menu_hover_bg;
color: @ini_nav_menu_hover_bg; color: @ini_nav_menu_hover_bg;
.prefix { .prefix {

135
css/plugins/configmanager.less
View file

@ -7,8 +7,18 @@
#dokuwiki__content { #dokuwiki__content {
#config__manager { #config__manager {
fieldset {
min-width: 100%;
overflow-x: auto;
box-sizing: border-box;
background-color: @background_darker;
margin-left: 0;
margin-right: 0;
}
.selectiondefault { .selectiondefault {
background-color: transparent; background-color: transparent;
color: inherit;
} }
tr { tr {
@ -16,6 +26,12 @@
background-color: transparent; background-color: transparent;
color: inherit; color: inherit;
} }
&:hover {
td {
color: inherit;
}
}
} }
tr.default { tr.default {
@ -23,5 +39,124 @@
background-color: transparent; background-color: transparent;
} }
} }
td.label {
padding: .8em 0 1.2em 1em;
span.outkey {
background-color: @ini_background;
color: inherit;
font-size: (@font-size-small - .06);
font-weight: bold;
padding: 0 @very-small-spacing;
a {
font-size: inherit;
}
}
label {
line-height: @line-height-big;
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1024px */
@media @screen_max-md {
#dokuwiki__content {
#config__manager {
td {
&.label {
label,
span {
font-size: @font-size-small;
}
}
&.label + td {
font-size: @font-size-small;
span {
font-size: inherit;
}
}
select,
input.edit {
font-size: @font-size-small;
}
}
.selectiondefault {
label {
font-size: @font-size-small;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 768px */
@media @screen_max-sm {
#dokuwiki__content {
#config__manager {
table {
border-top: 0 none;
}
td {
padding-top: 0;
&.label {
display: block;
width: 100%;
border: 0 none;
border-top: 1px solid @ini_border;
border-bottom: 0 none;
padding: .8em .5em .3em;
span.outkey {
margin-left: 0;
}
}
.input {
width: 100%;
}
&.value,
&.label + td {
display: block;
width: 100%;
border: 0 none;
margin-bottom: 1.2rem;
}
select,
input.edit {
width: 100%;
text-overflow: ellipsis;
}
}
.selectiondefault {
float: none;
max-width: 100%;
width: auto;
label {
width: 90%;
}
}
}
} }
} }

2
css/plugins/data.less
View file

@ -7,7 +7,7 @@
/* + + + + + global + + + + + */ /* + + + + + global + + + + + */
#dokuwiki__content { #dokuwiki__content {
.dataplugin_entry.mitarbeiter.sectionedit2 { .dataplugin_entry {
dl { dl {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;

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

@ -83,15 +83,6 @@
} }
/* + + + + + in meta box + + + + + */
#spr__tab-issues {
ul.mmissuelist {
padding-left: 0;
margin-top: 1rem;
}
}
/* + + + + + in content + + + + + */ /* + + + + + in content + + + + + */
a.jiralink { a.jiralink {
font-size: @font-size-default; font-size: @font-size-default;

5
css/plugins/struct.less
View file

@ -63,7 +63,7 @@
&:focus, &:focus,
&:active { &:active {
background-color: @ini_existing; background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content"); background-image: url("svg.php?svg=file-export.svg&f=background");
border-color: @ini_existing; border-color: @ini_existing;
color: @ini_background; color: @ini_background;
text-decoration: none; text-decoration: none;
@ -104,8 +104,7 @@
z-index: 3; z-index: 3;
box-shadow: @box-shadow-bottom; box-shadow: @box-shadow-bottom;
.hint p { p.hint {
color: @color-editBox;
margin-top: @small-spacing; margin-top: @small-spacing;
margin-bottom: @margin-small; margin-bottom: @margin-small;
} }

2
css/plugins/tagging.less
View file

@ -12,7 +12,7 @@
li { li {
&.t0 a { &.t0 a {
font-size: .9rem; font-size: .88rem;
} }
&.t1 a { &.t1 a {
font-size: 1rem; font-size: 1rem;

18
lang/de/lang.php
View file

@ -23,6 +23,7 @@ $lang['head_menu_status'] = 'Seitenstatus';
$lang['head_breadcrumb_youarehere'] = 'Standortanzeiger'; $lang['head_breadcrumb_youarehere'] = '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['head_menu_starred'] = 'gemerkte Seite';
$lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche'; $lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche';
@ -31,12 +32,17 @@ $lang['meta_box_tags_none'] = 'Keine Tags verknüpft';
$lang['js']['meta_box_toc_none'] = 'kein Inhaltsverzeichnis vorhanden'; $lang['js']['meta_box_toc_none'] = 'kein Inhaltsverzeichnis vorhanden';
$lang['tab_tags'] = 'Tags'; $lang['tab_tags'] = 'Tags';
$lang['tab_issues'] = 'Issues';
$lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden'; $lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden';
$lang['prefix_tasks'] = 'offene Aufgaben: '; $lang['prefix_tasks'] = 'offene Aufgaben: ';
$lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: '; $lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: ';
$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: ';
$lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite'; $lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite';
$lang['tasks_page_intime'] = 'Es gibt %1$d offenen Aufgaben für diese Seite.';
$lang['tasks_page_late'] = 'Es gibt %1$d offenen Aufgaben für diese Seite, %2$d sind zu spät.';
$lang['discussion'] = 'Diskussion'; $lang['discussion'] = 'Diskussion';
$lang['back_to_article'] = 'Zurück zum Artikel'; $lang['back_to_article'] = 'Zurück zum Artikel';
@ -58,11 +64,11 @@ $lang['mode_detail'] = 'Details zum Bild';
$lang['__site_width__'] = 'Content - Breite (in %)'; $lang['__site_width__'] = 'Content - Breite (in %)';
$lang['__background_site__'] = 'Website - Hintergrundfarbe'; $lang['__background_site__'] = 'Website - Hintergrundfarbe';
$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe'; $lang['__text_webframe__'] = 'Claim, Titel, Footer (unverlinkt), Navigation (unverlinkt) - Schriftfarbe';
$lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe'; $lang['__nav_menu_color__'] = 'Navigation (verlinkt), Footer (verlinkt), Pagetools Icons, Tabbox - Schriftfarbe';
$lang['__nav_menu_hover_color__'] = 'verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe'; $lang['__nav_menu_hover_color__'] = 'Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
$lang['__nav_menu_hover_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe'; $lang['__nav_menu_hover_bg__'] = 'Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
$lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe'; $lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__text__'] = 'Content: Text - Schriftfarbe'; $lang['__text__'] = 'Content: Text - Schriftfarbe';
@ -85,8 +91,8 @@ $lang['__missing__'] = 'Links zu nicht vorhandenen Wikiseiten - S
$lang['__button_color__'] = 'Buttons - Schriftfarbe'; $lang['__button_color__'] = 'Buttons - Schriftfarbe';
$lang['__button_background__'] = 'Buttons - Hintergrundfarbe'; $lang['__button_background__'] = 'Buttons - Hintergrundfarbe';
$lang['__background_alt__'] = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Hintergrundfarbe (alternativ)'; $lang['__background_alt__'] = 'Tabellenkopf, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)';
$lang['__text_alt__'] = 'Tabellenkopf unverlinkt, hover: Tabellenzeile, struct Label - Schriftfarbe (alternativ)'; $lang['__text_alt__'] = 'Tabellenkopf (unverlinkt), Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)';
$lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe'; $lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe';
$lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius'; $lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius';

20
lang/en/lang.php
View file

@ -38,6 +38,8 @@ $lang['quality_trigger'] = 'toggle page analysis';
$lang['prefix_tasks'] = 'open tasks: '; $lang['prefix_tasks'] = 'open tasks: ';
$lang['prefix_tasks_page'] = 'open tasks for this page: '; $lang['prefix_tasks_page'] = 'open tasks for this page: ';
$lang['prefix_tasks_user'] = 'Your open tasks: ';
$lang['tasks_page_none'] = 'There are no open tasks for this page.'; $lang['tasks_page_none'] = 'There are no open tasks for this page.';
$lang['tasks_page_intime'] = 'There are %1$d open tasks on this page.'; $lang['tasks_page_intime'] = 'There are %1$d open tasks on this page.';
$lang['tasks_page_late'] = 'There are %1$d open tasks on this page, %2$d are late.'; $lang['tasks_page_late'] = 'There are %1$d open tasks on this page, %2$d are late.';
@ -60,14 +62,14 @@ $lang['mode_detail'] = 'Image Details';
$lang['__site_width__'] = 'content - width (in %)'; $lang['__site_width__'] = 'content - width (in %)';
$lang['__background__'] = 'website - background color'; $lang['__background_site__'] = 'website - background color';
$lang['__text_webframe__'] = 'website unlinked: claim, title, footer, navigation - font color'; $lang['__text_webframe__'] = 'claim, title, footer (unlinked), navigation (unlinked) - font color';
$lang['__nav_menu_color__'] = 'link: navigation, footer, pagetools icons, tabbox - font color'; $lang['__nav_menu_color__'] = 'navigation (link), footer (link), pagetools icons, tabbox - font color';
$lang['__nav_menu_hover_color__'] = 'link: navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color'; $lang['__nav_menu_hover_color__'] = 'navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color';
$lang['__nav_menu_hover_bg__'] = 'link: navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color'; $lang['__nav_menu_hover_bg__'] = 'navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color';
$lang['__background_content__'] = 'content, breadcrumb, pagetools (hover) - background color'; $lang['__background__'] = 'content, breadcrumb, pagetools (hover) - background color';
$lang['__text__'] = 'content: text - font color'; $lang['__text__'] = 'content: text - font color';
$lang['__background_neu__'] = 'Content neutral (not too different from the content background) - background color'; $lang['__background_neu__'] = 'Content neutral (not too different from the content background) - background color';
@ -88,8 +90,8 @@ $lang['__missing__'] = 'links to non-existing pages - font color'
$lang['__button_color__'] = 'buttons - font color'; $lang['__button_color__'] = 'buttons - font color';
$lang['__button_background__'] = 'buttons - background color'; $lang['__button_background__'] = 'buttons - background color';
$lang['__background_alt__'] = 'table head, hover: table cell, struct Label - background color (alternative)'; $lang['__background_alt__'] = 'table head, table cell (hover), struct Label (hover) - background color (alternative)';
$lang['__text_alt__'] = 'table head unlinked, hover: table cell, struct Label - font color (alternative)'; $lang['__text_alt__'] = 'table head (unlinked), table cell (hover), struct Label (hover) - font color (alternative)';
$lang['__border__'] = 'tables, form fields, blockquotes - border color'; $lang['__border__'] = 'tables, form fields, blockquotes - border color';
$lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius'; $lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius';

12
style.ini
View file

@ -145,19 +145,19 @@ __nav_menu_color__ = "#696969" ; @ini_nav_menu_color
__nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color __nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color
__nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg __nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg
__background __ = "#FFF" ; @ini_background (guaranteed for every plugin) __background__ = "#FFF" ; @ini_background (guaranteed for every plugin)
__text__ = "#252525" ; @ini_text (guaranteed for every plugin) __text__ = "#252525" ; @ini_text (guaranteed for every plugin)
__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin) __background_neu__ = "#FFF" ; @ini_background_neu (guaranteed for every plugin)
__text_neu__ = "#656565" ; @ini_text_neu (guaranteed for every plugin) __text_neu__ = "#656565" ; @ini_text_neu (guaranteed for every plugin)
__background_page_header__ = "#F6F6F6" ; @ini_background_page_header __background_page_header__ = "#F6F6F6" ; @ini_background_page_header
__border_light__ = "#dadada" ; @ini_border_light __border_light__ = "#DADADA" ; @ini_border_light
__background_page_footer__ = "#252525" ; @ini_background_page_footer __background_page_footer__ = "#252525" ; @ini_background_page_footer
; highlighted text (e.g. search snippets) ; highlighted text (e.g. search snippets)
__highlight__ = "#efefef" ; @ini_highlight (guaranteed for every plugin) __highlight__ = "#EFEFEF" ; @ini_highlight (guaranteed for every plugin)
__highlight_text__ = "#252525" ; @ini_highlight_text __highlight_text__ = "#252525" ; @ini_highlight_text
@ -171,12 +171,12 @@ __link__ = "#286DA8" ; @ini_link
__button_color__ = "#FFF" ; @ini_button_color __button_color__ = "#FFF" ; @ini_button_color
__button_background__ = "#286DA8" ; @ini_button_background __button_background__ = "#286DA8" ; @ini_button_background
__background_alt__ = "#f6f6f6" ; @ini_background_alt (guaranteed for every plugin) __background_alt__ = "#F6F6F6" ; @ini_background_alt (guaranteed for every plugin)
__text_alt__ = "#454545" ; @ini_text_alt (guaranteed for every plugin) __text_alt__ = "#454545" ; @ini_text_alt (guaranteed for every plugin)
; border color ; border color
__border__ = "#bbbbbb" ; @ini_border (guaranteed for every plugin) __border__ = "#BBB" ; @ini_border (guaranteed for every plugin)
__default_border_radius__ = "3px" ; @ini_default_border_radius __default_border_radius__ = "3px" ; @ini_default_border_radius