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

Merge branch 'master' into 'userTasksOverlay'

Browse source 
# Conflicts:
#   css/area_nav-usertools.less
This commit is contained in:
Jana Deutschländer 2017-04-25 16:26:02 +02:00
commit 446069796c
21 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/area_footer.less
View file

@ -40,7 +40,7 @@
position: relative;
z-index: 2;
box-sizing: border-box;
background-color: @ini_background;
background-color: @ini_background_site;
}
p {

2
css/area_header.less
View file

@ -92,7 +92,7 @@
/* + + + wiki title + + + */
p.title {
background-color: @ini_background;
background-color: @ini_background_site;
opacity: @header-font-opacity;
color: @ini_text_webframe;
line-height: @line-height-default;

2
css/area_main-content.less
View file

@ -9,7 +9,7 @@
.level2 {
p a.media {
img {
border: 1px dotted @ini_background;
border: 1px dotted @ini_background_site;
}
&:hover,

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

@ -53,9 +53,9 @@
right: 0;
width: 100%;
height: 100%;
background: @ini_background;
background: -webkit-linear-gradient(left, @ini_background, @ini_background_content);
background: linear-gradient(left, @ini_background, @ini_background_content);
background: @ini_background_site;
background: -webkit-linear-gradient(left, @ini_background_site, @ini_background);
background: linear-gradient(left, @ini_background_site, @ini_background);
z-index: 0;
}
}

4
css/area_nav-breadcrumb.less
View file

@ -9,7 +9,7 @@
position: relative;
min-height: @page-header_height;
box-sizing: border-box;
background-color: @ini_background_content;
background-color: @ini_background;
border-bottom: 1px solid @ini_border_light;
padding: 1rem 1.8rem .2rem;
@ -23,7 +23,7 @@
}
@media @screen_xs-lg {
background-color: @ini_background_content;
background-color: @ini_background;
}
> p {

18
css/area_nav-metabox.less
View file

@ -102,9 +102,9 @@
transition: @transition background-color, @transition border-color, @transition color;
@media @screen_min-md {
background-color: @ini_background;
background-color: @ini_background_site;
border: 1px solid @noopentasks-border;
border-bottom-color: @ini_background;
border-bottom-color: @ini_background_site;
border-radius: @ini_default_border_radius @ini_default_border_radius 0 0; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_nav_menu_color;
margin-left: 4px;
@ -137,15 +137,15 @@
text-decoration: none;
@media @screen_min-md {
background-color: @ini_background_content;
background-color: @ini_background;
border-color: @ini_existing;
color: @ini_existing;
}
@media @screen_max-md {
background-color: @ini_existing;
border-color: @ini_background_content;
color: @ini_background_content;
border-color: @ini_background;
color: @ini_background;
}
}
}
@ -155,16 +155,16 @@
> a {
cursor: default;
background-color: @ini_background_content;
background-color: @ini_background;
border-color: @ini_existing;
border-bottom-color: @ini_background_content;
border-bottom-color: @ini_background;
color: @ini_existing;
@media @screen_max-md {
background-color: @ini_existing;
border-bottom-color: @ini_existing;
border-radius: 0;
color: @ini_background_content;
color: @ini_background;
}
}
}
@ -187,7 +187,7 @@
right: 0;
display: none;
width: 100%;
background-color: @ini_background_content;
background-color: @ini_background;
border: 1px solid @ini_existing;
@media @screen_min-xs {

4
css/area_nav-pagetools.less
View file

@ -116,7 +116,7 @@ nav#dokuwiki__pagetools {
&:hover {
ul {
box-shadow: @box-shadow; // @box-shadow-offset;
background-color: @ini_background_content;
background-color: @ini_background;
border-color: @wikiicons-border;
li {
@ -142,7 +142,7 @@ nav#dokuwiki__pagetools {
svg {
background-color: @ini_existing;
border-color: @ini_existing;
fill: @ini_background_content;
fill: @ini_background;
}
}

2
css/area_nav-usertools.less
View file

@ -82,7 +82,7 @@
position: relative;
display: table-cell;
background-color: @ini_background;
background-color: @ini_background_site;
border: solid 1px @wikiicons-border; // @ini_border_light;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe;

8
css/area_recent.less
View file

@ -71,8 +71,8 @@
.diffnav {
a {
background-color: @ini_background;
border: solid 1px @ini_background;
background-color: @ini_background_site;
border: solid 1px @ini_background_site;
border-radius: @ini_default_border_radius;
color: @ini_nav_menu_color;
transition: @transition background-color, @transition color, @transition border-color;
@ -88,7 +88,7 @@
&:active {
background-color: @ini_nav_menu_color;
border: solid 1px @ini_nav_menu_color;
color: @ini_background;
color: @ini_background_site;
&::before {
background-color: inherit;
@ -114,7 +114,7 @@
}
th {
background-color: @ini_background_content;
background-color: @ini_background;
color: @ini_text;
padding-top: 10px;
padding-bottom: 10px;

6
css/base.less
View file

@ -12,7 +12,7 @@
@font_family_screen: arial, sans-serif;
@font_family_print: "Times New Roman", serif;
@nav_direct_background: @ini_background_content;
@nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing;
@ini_sidebar_width: (100 - @ini_site_width) - 4;
@ -72,12 +72,12 @@
/* edit mode */
@highlight-odd-ini_text: fade(@ini_background_content, 95%);
@highlight-odd-ini_text: fade(@ini_background, 95%);
@highlight-even-ini_text: fade(@ini_text, 5%);
@color-editBox: #252525; // editmode for tables, revision states
//@nolinkedicon-ini_background: fade(@ini_background, 10%);
//@nolinkedicon-ini_background: fade(@ini_background_site, 10%);
//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%);

8
css/base_design.less
View file

@ -7,7 +7,7 @@
html, body {
background-color: @ini_background;
background-color: @ini_background_site;
}
@ -45,7 +45,7 @@ html, body {
font-size: @font-size-small;
border: solid @ini_background_alt;
border-width: 1px 1px 0;
background-color: @ini_background;
background-color: @ini_background_site;
color: @ini_text_alt;
padding: .1em .35em;
border-top-left-radius: 2px;
@ -59,7 +59,7 @@ html, body {
clear: both;
overflow: hidden;
word-wrap: break-word;
background: @ini_background_content;
background: @ini_background;
color: inherit;
padding: @page_padding-top @margin-default @margin-default;
@ -520,7 +520,7 @@ button img {
hr {
border-top: solid @ini_border;
border-bottom: solid @ini_background;
border-bottom: solid @ini_background_site;
border-width: 1px 0;
height: 0;
text-align: center;

4
css/plugins/data.less
View file

@ -24,7 +24,7 @@
button {
min-height: 1rem;
height: 1.8em;
background-color: @ini_background_content;
background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
@ -41,7 +41,7 @@
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
}
}
}

2
css/plugins/do_tasks.less
View file

@ -11,7 +11,7 @@ ul.page-attributes {
strong {
overflow: hidden;
background-color: @ini_background;
background-color: @ini_background_site;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}

4
css/plugins/edittable.less
View file

@ -16,7 +16,7 @@
button,
input.button {
min-height: 1rem;
background-color: @ini_background_content;
background-color: @ini_background;
border-top: solid 1px @ini_button_background;
border-color: @ini_border;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
@ -31,7 +31,7 @@
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
}
}
}

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

@ -49,7 +49,7 @@
min-height: @height-context-bar;
box-sizing: border-box;
box-shadow: @box-shadow;
background-color: @ini_background_content;
background-color: @ini_background;
border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
font-size: @font-size-default;
padding: .8em 1em .5em;

2
css/plugins/struct.less
View file

@ -65,7 +65,7 @@
background-color: @ini_existing;
background-image: url("svg.php?svg=file-export.svg&f=background_content");
border-color: @ini_existing;
color: @ini_background_content;
color: @ini_background;
text-decoration: none;
}
}

4
css/plugins/tabinclude.less
View file

@ -35,7 +35,7 @@ div#dwpl-ti-container {
&.selected {
position: relative;
z-index: 1;
background-color: @ini_background_content;
background-color: @ini_background;
color: @ini_text;
}
}
@ -48,7 +48,7 @@ div#dwpl-ti-container {
z-index: 0;
overflow: auto;
box-shadow: @box-shadow;
background-color: @ini_background_content;
background-color: @ini_background;
border: solid 1px @ini_border;
border-radius: 0;
margin-top: -1px;

6
css/template_admin.less
View file

@ -52,7 +52,7 @@
svg {
width: 26px;
height: 26px;
border: solid 1px @ini_background_content;
border: solid 1px @ini_background;
border-radius: @ini_default_border_radius;
fill: @ini_existing;
transition: @transition background-color, @transition border-color, @transition fill;
@ -71,10 +71,10 @@
svg {
background-color: @ini_existing;
border-color: @ini_existing;
fill: @ini_background_content;
fill: @ini_background;
path {
fill: @ini_background_content;
fill: @ini_background;
}
}
}

2
css/template_detail.less
View file

@ -36,7 +36,7 @@
img {
margin: 0;
display: block;
border: 1px dotted @ini_background;
border: 1px dotted @ini_background_site;
position: relative;
z-index: 1;
}

4
lang/de/lang.php
View file

@ -54,14 +54,14 @@ $lang['image_detail'] = 'Detailinformationen zum Bild';
$lang['__site_width__'] = 'Content - Breite (in %)';
$lang['__background__'] = 'Website - Hintergrundfarbe';
$lang['__background_site__'] = 'Website - Hintergrundfarbe';
$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe';
$lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, 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_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
$lang['__background_content__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
$lang['__text__'] = 'Content: Text - Schriftfarbe';
$lang['__background_neu__'] = 'Content neutral (nicht zu unterschiedlich zum Content-Hintergrund) - Hintergrundfarbe';

4
style.ini
View file

@ -135,7 +135,7 @@ __site_width__ = "73%" ; @ini_site_width
; alternative text and background colors
__background__ = "#ECECEC" ; @ini_background (guaranteed for every plugin)
__background_site__ = "#ECECEC" ; @ini_background_site
__text_webframe__ = "#696969" ; @ini_text_webframe
@ -145,7 +145,7 @@ __nav_menu_color__ = "#696969" ; @ini_nav_menu_color
__nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color
__nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg
__background_content__ = "#FFF" ; @ini_background_content
__background __ = "#FFF" ; @ini_background (guaranteed for every plugin)
__text__ = "#252525" ; @ini_text (guaranteed for every plugin)
__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin)