Merge branch 'master' into pagetoolShims

This commit is contained in:
Michael Große 2017-04-10 11:03:22 +02:00
commit 26c27b0ca0
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
48 changed files with 1570 additions and 767 deletions

View file

@ -17,6 +17,7 @@ class Template {
protected $plugins = array(
'sqlite' => null,
'tagging' => null,
'magicmatcher' => null,
);
/**
@ -35,6 +36,36 @@ class Template {
*/
protected function __construct() {
$this->initializePlugins();
/** @var \Doku_Event_Handler */
global $EVENT_HANDLER;
$EVENT_HANDLER->register_hook('PLUGIN_TPLINC_LOCATIONS_SET', 'BEFORE', $this, 'registerIncludes');
}
/**
* Makes include position info available to the tplinc plugin
*
* @param \Doku_Event $event
*/
public function registerIncludes(\Doku_Event $event) {
$event->data['footer'] = 'Footer below the page content';
}
/**
* Get the content to include from the tplinc plugin
*
* prefix and postfix are only added when there actually is any content
*
* @param string $location
* @param string $pre prepend this before the content
* @param string $post append this to the content
* @return string
*/
public function getInclude($location, $pre = '', $post = '') {
if(!$this->plugins['tplinc']) return '';
$content = $this->plugins['tplinc']->renderIncludes($location);
if($content === '') return '';
return $pre . $content . $post;
}
/**
@ -44,7 +75,9 @@ class Template {
$this->plugins['sqlite'] = plugin_load('helper', 'sqlite');
if($this->plugins['sqlite']) {
$this->plugins['tagging'] = plugin_load('helper', 'tagging');
$this->plugins['magicmatcher'] = plugin_load('syntax', 'magicmatcher_issuelist');
}
$this->plugins['tplinc'] = plugin_load('helper', 'tplinc');
}
/**
@ -75,7 +108,14 @@ class Template {
);
}
// fixme add magicmatcher info
if ($this->plugins['magicmatcher']) {
$tabs[] = array(
'id' => 'spr__tab-issues',
'label' => tpl_getLang('tab_issues'),
'tab' => $this->plugins['magicmatcher']->getIssueListHTML(),
'count' => $this->plugins['magicmatcher']->getCountIssues(),
);
}
return $tabs;
}

View file

@ -21,8 +21,8 @@
height: @page-header_height;
box-sizing: border-box;
width: 100%;
background-color: @background_page-header;
border-bottom: 1px solid @color-border-light;
background-color: @ini_background_page_header;
border-bottom: 1px solid @ini_border_light;
}
#plugin__highlightparent {
@ -33,28 +33,6 @@
}
.structaggregation {
td,
th {
line-height: @line-height-default;
a {
line-height: @line-height-default;
}
}
> a.export {
line-height: 135%;
padding-top: .5em;
}
}
.dokuwiki .structaggregation a.export {
padding-top: .3em;
}
.main-content > .level2,
.main-content > .level1,
.main-content > .level3,

View file

@ -11,12 +11,20 @@
@media screen {
.page-footer {
min-height: @page-header_height;
background-color: @background_page-header;
border-top: 1px solid @color-border-light;
background-color: @ini_background_page_header;
border-top: 1px solid @ini_border_light;
border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_background_page_footer;
font-size: @font-size-default;
text-align: right;
padding: @margin-small @margin-default;
*,
a:link,
a:visited {
color: inherit;
}
bdi {
font-weight: bold;
}
@ -27,13 +35,18 @@
position: relative;
z-index: 2;
box-sizing: border-box;
background-color: @color-site-bg;
background-color: @ini_background;
}
p {
color: @ini_text_webframe;
font-size: @font-size-default;
margin: 0;
}
a {
color: @ini_nav_menu_color;
}
}
}
@ -56,7 +69,7 @@
.showSidebar {
#dokuwiki__footer {
.col-xs-12 {
width: 73%;
width: @ini_site_width;
}
}
}
@ -84,3 +97,38 @@
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 768px */
@media @screen_max-xs {
.page-footer {
padding-left: @margin-small;
padding-right: @margin-small;
}
#dokuwiki__footer {
.main-footer {
> * {
padding-left: 0;
padding-right: 0;
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 480px */
@media @screen_max-xxs {
#dokuwiki__footer {
.main-footer {
> * {
padding-left: @margin-small;
padding-right: @margin-small;
}
}
}
}

View file

@ -12,6 +12,7 @@ form {
margin: 0;
padding: 0;
// multiline label
fieldset > label.block > span:first-child {
display: inline-block;
@ -25,6 +26,7 @@ form {
}
}
// older version (history)
.dokuwiki & > .no > ul > li {
min-height: 2rem;
@ -121,7 +123,7 @@ textarea,
select,
keygen {
min-height: @formfield_min-height;
border: 1px solid @color-border;
border: 1px solid @ini_border;
box-shadow: inset 0 0 1px #eee;
border-radius: @fix_border-radius;
padding-left: .3rem;
@ -139,14 +141,19 @@ keygen:focus {
border-color: #999;
}
input[type=radio],
input[type=checkbox],
input[type=image] {
input[type="radio"],
input[type="checkbox"],
input[type="image"] {
padding: 0;
border-style: none;
box-shadow: none;
}
input[type="file"] {
padding-top: .1rem;
padding-bottom: .1rem;
}
/* + + + + + buttons + + + + + */
button {
@ -181,10 +188,10 @@ button[type=submit],
cursor: pointer;
box-shadow: none;
background-image: none;
background-color: @button_background;
border: 1px solid @button_background;
background-color: @ini_button_background;
border: 1px solid @ini_button_background;
border-radius: @fix_border-radius;
color: @button_color;
color: @ini_button_color;
vertical-align: top;
padding: .3em @grid;
transition: @transition background-color, @transition color;
@ -192,8 +199,8 @@ button[type=submit],
&:hover,
&:active,
&:focus {
background-color: @button_color;
color: @button_background;
background-color: @ini_button_color;
color: @ini_button_background;
}
}
@ -216,9 +223,9 @@ button[type=submit] {
&:focus {
box-shadow: none;
background-image: none;
background-color: @button_background;
color: @button_color;
border-color: @button_background;
background-color: @ini_button_background;
color: @ini_button_color;
border-color: @ini_button_background;
}
}
@ -268,7 +275,7 @@ textarea[readonly] {
background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
background-color: #eee;
opacity: .5;
border: 1px solid @color-border;
border: 1px solid @ini_border;
border-radius: @fix_border-radius;
color: #333;
font-weight: normal;

View file

@ -6,7 +6,7 @@
#dokuwiki__header {
@header-font-opacity: .7;
@header-font-opacity: 1;
/* + + + wiki logo + + + */
@media @screen_min-md {
@ -83,8 +83,9 @@
/* + + + wiki title + + + */
p.title {
background-color: @color-site-bg;;
background-color: @ini_background;
opacity: @header-font-opacity;
color: @ini_text_webframe;
line-height: @line-height-default;
margin-bottom: .5rem;
@ -103,8 +104,9 @@
/* + + + wiki claim + + + */
p.claim {
opacity: @header-font-opacity;
margin-bottom: 0;
color: @ini_text_webframe;
font-size: @font-size-default;
margin-bottom: 0;
@media @screen_max-md {
padding-top: .5rem;
@ -114,7 +116,7 @@
/* + + + mobile nav togglelink + + + */
.menu-togglelink {
margin: @very-small-spacing -(@very-small-spacing) 0 0;
margin: .45rem -(@very-small-spacing) 0 0;
a {
.fontello();
@ -125,8 +127,9 @@
min-width: @toggle-size;
box-sizing: border-box;
background-color: #fff;
border: 1px solid @color-border;
border-radius: @border-radius;
border: 1px solid @ini_border;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_nav_menu_color;
font-size: 1rem;
text-align: center;
text-decoration: none;
@ -137,13 +140,14 @@
font-size: 1.5rem;
margin: .1rem 0 0;
}
}
&:hover,
&:active,
&:focus {
background-color: @button_color;
border-color: @button_background;
&:hover,
&:active,
&:focus {
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
}
}
}
}

View file

@ -1,25 +1,19 @@
/**
* This styles the section editing buttons and highlighting
*/
#dokuwiki__content.main-content {
@button-margin: .5rem; // FIXME shouldn't we have something in our base.less for this?
#dokuwiki__content.main-content {
div.section_highlight {
clear: right; // FIXME why?
clear: right;
background: repeating-linear-gradient(
-45deg,
transparent,
transparent 10px,
@ini_background_alt 10px,
@ini_background_alt 20px,
@highlight-odd-ini_text,
@highlight-odd-ini_text 10px,
@highlight-even-ini_text 10px,
@highlight-even-ini_text 20px,
);
}
.secedit button {
clear: both;
font-size: 100%;
margin-top: -1em;
margin-bottom: @button-margin;
border-color: @ini_background_page_header;
}
.editbutton_section {
@ -29,6 +23,12 @@
float: right;
margin-top: 0;
form div.no {
button {
padding-right: 0;
}
}
button {
background-color: transparent;
color: transparent;
@ -36,20 +36,30 @@
&::after {
content: '';
float: right;
display: inline-block;
background: transparent url("svg.php?svg=pencil.svg&f=link") center center no-repeat;
background: transparent url("svg.php?svg=pencil.svg&f=existing") center center no-repeat;
height: 1em;
width: 1em;
background-size: contain;
margin-left: @button-margin;
border: solid 2px transparent;
border-radius: @ini_default_border_radius;
margin-left: @small-spacing;
margin-top: -1px;
}
&:hover,
&:active,
&:focus {
background-color: @button_color;
color: @button_background;
border-color: @button_background;
//background-color: @ini_existing;
color: @ini_existing;
//border-color: @ini_existing;
&::after {
background-color: @ini_existing;
background-image: url("svg.php?svg=pencil.svg&f=background_content");
border-color: @ini_existing;
}
}
}
}

View file

@ -4,39 +4,52 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
#dokuwiki__content.main-content {
#dokuwiki__content.main-content {
.level2 {
p a.media {
img {
border: 1px dotted @color-site-bg;
border: 1px dotted @ini_background;
}
&:hover, &:focus, &:active {
&:hover,
&:focus,
&:active {
img {
border: 1px solid @color-link;
border: 1px solid @ini_existing;
}
}
}
}
> div,
.section_highlight > div {
> ul,
> ol {
&:not([class="tabs"]) > li {
margin-bottom: @small-spacing;
}
}
}
.wikipagefooter {
> hr {
margin-top: 3em;
margin-bottom: 0.5em;
border-top: dashed @color-border-light 2px;
margin-bottom: .5em;
border-top: dashed @ini_border_light 2px;
border-bottom: none;
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1199px */

View file

@ -1,14 +1,18 @@
/**
* This file provides the design styles the non-navigational elements in the sidebar
*/
#dokuwiki__aside {
// do not indent the first level of lists
// and use less indention in deeper levels
ul, ol {
ul,
ol {
padding-left: 0;
ul, ol {
ul,
ol {
padding-left: @margin-small;
li {
@ -17,3 +21,41 @@
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
#dokuwiki__aside {
display: none;
}
body.show-mobile-sidebar {
#dokuwiki__aside {
display: block !important;
position: absolute;
left: 1.25rem; //left margin of content container
z-index: 200; // above all
box-shadow: @box-shadow-right-bottom;
min-width: 45%;
max-width: 90%;
height: auto;
&:after {
content: "";
position: absolute;
top: 0;
left: 0;
bottom: 0;
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);
z-index: 0;
}
}
}
}

View file

@ -5,26 +5,91 @@
* @author Andreas Gohr <gohr@cosmocode.de>
*/
#dokuwiki__aside {
@icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
nav > p,
.mmissuelist li,
.mmissuelist div {
color: @ini_nav_menu_color;
&.noissue {
color: @ini_text_webframe;
* {
color: inherit;
}
}
}
nav {
li {
color: @ini_nav_menu_color;
> div {
color: @ini_text_webframe;
}
}
}
/* 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
}
a {
&:link,
&:visited {
opacity: .9;
color: @ini_nav_menu_color;
}
* {
color: inherit;
}
}
// the toggle element
a.nav {
.display-flex();
.align-items();
cursor: pointer;
display: flex;
display: -ms-flexbox;
flex-direction: row;
-ms-flex-direction: row;
align-items: center;
height: @icon-size + @margin-small;
opacity: 1;
border: 1px solid transparent;
border-radius: @fix_border-radius;
color: @color-nav;
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
@ -44,7 +109,7 @@
width: @menu-margin;
height: @icon-size;
flex-grow: 0;
border-right: 1px solid @color-border;
border-right: 1px solid @ini_nav_menu_color;
text-align: center;
margin-right: @margin-small;
color: inherit;
@ -60,9 +125,10 @@
vertical-align: baseline;
text-align: center;
color: inherit;
border: 2px solid @color-nav;
border: 2px solid @ini_nav_menu_color;
border-top-right-radius: 50%;
border-bottom-left-radius: 50%;
transition: @transition border-color;
}
// real icon
@ -71,7 +137,7 @@
height: @icon-size;
path {
fill: @color-nav;
fill: @ini_nav_menu_color;
transition: @transition all;
}
}
@ -80,19 +146,21 @@
&:hover,
&:focus,
&:active {
background-color: @color-nav-hover-bg;
border-color: @color-nav-hover;
color: @color-nav-hover;
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
text-decoration: none;
span.ico {
border-color: inherit;
strong {
border-color: @color-nav-hover-bg;
border-color: inherit;
}
svg {
path {
fill: @color-nav-hover;
fill: @ini_nav_menu_hover_color;
}
}
}
@ -106,12 +174,16 @@
ul {
margin-bottom: 1rem;
ul {
margin-bottom: 0;
}
}
}
}
/* + + + + + + wide page content + + + + +
/* + + + + + + wide page content border-bottom between a.nav (short width) + + + + +
.wide-content {
#dokuwiki__aside {
a.nav {
@ -124,7 +196,7 @@
left: 0;
width: 100%;
height: 1px;
border-bottom: solid 1px @color-border;
border-bottom: solid 1px @ini_border;
}
&:hover,
@ -139,15 +211,35 @@
} */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-head6;
padding: .15em 0;
* {
font-size: inherit;
font-weight: inherit;
}
a {
font-size: (@font-size-head6 - .05);
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1023px */
@media @screen_max-md {
// hide on medium and smaller screens
#dokuwiki__aside {
display: none;
}
// show when toggled
body.show-mobile-sidebar {
.search.main-sidebar {
@ -164,30 +256,6 @@
}
#dokuwiki__aside {
display: block !important;
position: absolute;
left: 1.25rem; //left margin of content container
z-index: 200; // above all
box-shadow: @box-shadow-right-bottom;
min-width: 45%;
max-width: 90%;
height: auto;
&:after {
content: "";
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
width: 100%;
height: 100%;
background: @ini_background;
background: -webkit-linear-gradient(left, @ini_background, @color-content-bg);
background: linear-gradient(left, @ini_background, @color-content-bg);
z-index: 0;
}
> nav {
position: relative;
z-index: 2;
@ -212,27 +280,6 @@
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
#dokuwiki__aside {
nav {
li:not([class]),
.li {
font-size: @font-size-default;
padding: .1em 0;
* {
font-size: inherit;
font-weight: inherit;
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1439px */

View file

@ -1,10 +1,12 @@
.msg-area{
.msg-area {
clear: both;
padding-top: 1.6rem;
div{
div {
line-height: 135%;
}
&:empty{
&:empty {
display: none;
}
}
@ -20,4 +22,18 @@ div.success, div.error, div.info, div.notify {
padding-left: 32px;
overflow: hidden;
border-radius: 5px;
* {
color: inherit;
}
a {
text-decoration: underline;
&:hover,
&:focus,
&:active {
text-decoration: none;
}
}
}

View file

@ -1,18 +1,29 @@
/**
* This file provides the design styles for the direct / menu jump links.
* This file provides the design styles for the breadcrumb
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
.breadcrumbs {
position: relative;
border-bottom: 1px solid @color-border-light;
padding: 1rem 1.8rem .2rem;
min-height: @page-header_height;
box-sizing: border-box;
background-color: @ini_background_content;
border-bottom: 1px solid @ini_border_light;
padding: 1rem 1.8rem .2rem;
@media @screen_max-md {
background-color: @background_page-header;
background-color: @ini_background_page_header;
}
@media @screen_max-xs {
padding-left: @margin-small;
padding-right: .75rem;
}
@media @screen_xs-lg {
background-color: @ini_background_content;
}
> p {
@ -51,7 +62,7 @@
width: auto;
box-sizing: border-box;
border: solid 1px transparent;
border-radius: @border-radius;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
vertical-align: middle;
text-decoration: none;
margin-top: -.2em;
@ -65,7 +76,7 @@
&:hover,
&:focus,
&:active {
border-color: @color-link;
border-color: @ini_existing;
}
}
}
@ -100,9 +111,8 @@
display: block;
width: auto;
min-height: @toggle-size;
border: 1px solid @color-border;
border-radius: @border-radius;
color: @color-nav;
border: 1px solid @wikiicons-border;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
text-align: center;
margin: 0;
}
@ -115,113 +125,14 @@
font-size: 1.2rem;
line-height: 1;
}
/* check !!! */
&.do_none {
position: relative;
strong {
background-color: @color-site-bg;
}
.num {
background-color: @noopentasks-background; // fix
color: @noopentasks-color; // fix
}
}
/* end check !!! */
&.plugin__qc {
display: inline-block;
overflow: visible;
position: static;
}
} // li
a {
transition: @transition color, @transition background-color, @transition border-color;
.btn-hover();
&[aria-expanded="false"] + #plugin__qc__wrapper {
display: none;
}
&:hover,
&:active,
&:focus {
background-color: @color-nav-hover-bg;
border-color: @color-nav-hover;
color: @color-nav-hover;
.prefix {
color: inherit;
}
}
}
#plugin__qc__wrapper {
position: absolute;
right: 0;
width: auto;
border: 0 none;
background: @background_page-header;
background: -webkit-linear-gradient(top, @background_page-header, @color-content-bg);
background: linear-gradient(top, @background_page-header, @color-content-bg);
box-shadow: @box-shadow-bottom;
z-index: 2000;
#plugin__qc__out{
h1 {
font-size: @font-size-head3;
}
h2 {
margin-top: 1.6em;
font-size: @font-size-head5;
}
> h1,
> h2,
> p,
> dl,
> div {
padding-left: 1rem;
margin-left: 0;
}
> div p {
padding-left: 0;
margin-left: 0;
}
}
&[aria-hidden="false"] {
margin-top: .5rem;
}
}
#plugin__qc__icon {
display: none;
}
#plugin__qc__link {
position: relative;
.prefix {
.icon-emo-happy();
width: 100%;
font-size: @font-size-default;
&::before {
width: 100%;
margin: 0;
}
}
}
}
}
/* + + + + + ? + + + + + */
.mode_admin {
}

View file

@ -4,8 +4,9 @@
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
.nav-direct {
background-color: __nav_direct_background__;
background-color: @nav_direct_background;
margin-top: -1px;
p {
@ -21,12 +22,12 @@
a:visited {
.sr-out();
box-shadow: __box_shadow__;
box-shadow: @box-shadow;
display: block;
width: 100%;
background-color: __nav_direct_background__;
border-bottom: 1px solid __shadow_color__;
color: __nav_direct_color__;
background-color: @nav_direct_background;
border-bottom: 1px solid @ini_border_light;
color: @nav_direct_color;
line-height: @line-height-default;
text-decoration: none;
padding: 1em;

View file

@ -1,22 +1,39 @@
/**
* This file provides the design styles for the metatabbox
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
#spr__meta-box {
.display-flex();
.flex-direction();
.justify-content(flex-end);
position: relative;
z-index: 10;
float: right;
display: inline-block;
max-width: 40%;
min-height: @page-header_height;
border: 1px solid transparent;
margin-top: (@page_padding-top * -1); // reverse padding-top of .page container
margin-top: -(@page_padding-top); // reverse padding-top of .page container
margin-right: -1px;
padding-top: 1rem;
// >= 1024
@media @screen_min-md {
height: @page-header_height;
border: 1px solid transparent;
}
// < 1024
@media @screen_max-md {
position: relative;
top: -1.1rem;
top: .2rem;
right: auto;
float: none;
display: block;
max-width: 100%;
min-height: @page-header_height;
height: auto;
border: 0 none;
}
.tab-container {
@ -34,16 +51,17 @@
overflow-y: visible;
}
/* + + + + + tab controlls + + + + + */
ul.meta-tabs {
list-style: none;
line-height: 160%;
text-align: right; // right-aligned
white-space: nowrap;
margin: 0;
padding: 0;
@media @screen_max-md {
margin-top: 3px;
@media @screen_min-md {
white-space: nowrap;
text-align: right;
}
&::before,
@ -66,41 +84,40 @@
vertical-align: bottom;
margin: 0;
@media @screen_min-md {
margin-left: .3rem;
}
@media @screen_max-md {
margin-left: .2rem;
margin-right: .4rem;
margin-bottom: .2rem;
}
> a {
cursor: pointer;
position: relative;
display: block;
background-color: @color-site-bg;
border: 1px solid @color-border-light;
//border-bottom-color: @color-site-bg;
border-radius: @fix_border-radius @fix_border-radius 0 0;
color: @color-link;
font-size: @font-size-small;
line-height: 1.42857143;
padding: .3em 1rem .1em;
margin-left: 4px;
transition: @transition color, @transition background-color, @transition border-color;
transition: @transition background-color, @transition border-color, @transition color;
@media @screen_max-xxlg {
padding-top: .35em;
}
@media @screen_max-xlg {
padding-top: .3em;
@media @screen_min-md {
background-color: @ini_background;
border: 1px solid @noopentasks-border;
border-bottom-color: @ini_background;
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;
padding: .3em 1rem .1em;
}
@media @screen_max-md {
top: -1px;
padding: .2em .3rem .1em;
top: 0;
border: 1px solid @ini_existing;
color: @ini_existing;
margin-top: .2rem;
margin-left: 0;
}
@media @screen_max-xs {
min-height: 30px;
padding: .2em .3rem;
}
* {
@ -112,15 +129,24 @@
position: relative;
color: inherit;
font-size: @font-size-small;
transition: @transition color;
}
&:hover,
&:focus,
&:active {
background-color: @color-content-bg;
border-color: @color-link;
text-decoration: none;
@media @screen_min-md {
background-color: @ini_background_content;
border-color: @ini_existing;
color: @ini_existing;
}
@media @screen_max-md {
background-color: @ini_existing;
border-color: @ini_background_content;
color: @ini_background_content;
}
}
}
@ -129,27 +155,30 @@
> a {
cursor: default;
background-color: @color-content-bg;
border-color: @color-link;
border-bottom-color: @color-content-bg;
color: @color-link;
background-color: @ini_background_content;
border-color: @ini_existing;
border-bottom-color: @ini_background_content;
color: @ini_existing;
@media @screen_max-md {
background-color: @ini_existing;
border-bottom-color: @ini_existing;
border-radius: 0;
color: @ini_background_content;
}
}
}
}
}
.meta-content {
@media @screen_min-xlg {
margin-top: -1px;
}
@media @screen_max-xlg {
margin-top: -1px;
}
/* + + + + + toggle content + + + + + */
.meta-content {
margin-top: -1px;
@media @screen_max-md {
clear: both;
margin-top: -2px;
margin-top: 2px;
}
.tab-pane {
@ -158,19 +187,26 @@
right: 0;
display: none;
width: 100%;
background-color: @color-content-bg;
border: 1px solid @color-link;
border-radius: 0 0 @fix_border-radius @fix_border-radius;
background-color: @ini_background_content;
border: 1px solid @ini_existing;
@media @screen_min-xs {
min-width: 20em;
}
@media @screen_min-md {
border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
}
&.active {
display: block;
overflow: hidden;
}
a {
color: @ini_existing;
}
> div {
font-size: @font-size-small;
padding: .8rem .5rem .5rem;
@ -236,15 +272,15 @@
padding: .15em 0;
&::before {
content: '';
position: absolute;
top: .6em;
content: "";
left: 0;
display: inline-block;
width: 4px;
height: 4px;
background-color: #ccc;
overflow: hidden;
left: 0;
background-color: @ini_existing;
}
}
}

View file

@ -21,7 +21,7 @@
.pagetools-item(img_backto, 12);
*/
#dokuwiki__aside{
#dokuwiki__aside {
@media @screen_max-md {
display: none !important;
}
@ -57,11 +57,17 @@ nav#dokuwiki__pagetools {
height: auto;
min-height: @toolbox-size; // for nav:hover
width: @toolbox-size; // for nav:hover
opacity: .6;
color: @color-nav;
font-size: @font-size-default;
padding: 2px @toolbox-size 2px 2px;
@media @screen_min-md {
color: @ini_nav_menu_color;
}
@media @screen_max-md {
color: @ini_existing;
}
* {
color: inherit;
}
@ -73,9 +79,7 @@ nav#dokuwiki__pagetools {
&:hover,
&:focus,
&:active {
opacity: 1;
color: @color-nav-hover;
background-color: #FFF;
background-color: transparent;
}
span {
@ -90,8 +94,16 @@ nav#dokuwiki__pagetools {
width: @page-tools_svg-size;
height: @page-tools_svg-size;
vertical-align: middle;
fill: @color-nav;
border: solid 1px transparent;
margin: @page-tools_svg-space;
@media @screen_min-md {
fill: @ini_nav_menu_color;
}
@media @screen_max-md {
fill: @ini_existing;
}
}
&.top {
@ -101,20 +113,13 @@ nav#dokuwiki__pagetools {
&.plugin_move_page {
a {
opacity: .6;
color: @color-nav;
.btn-hover();
color: @ini_nav_menu_color;
* {
color: inherit;
}
&:hover,
&:focus,
&:active {
color: @color-nav-hover;
background-color: #fff;
opacity: 1;
}
}
}
}
@ -122,24 +127,34 @@ nav#dokuwiki__pagetools {
&:hover {
ul {
background-color: #fff;
box-shadow: @box-shadow-offset;
box-shadow: @box-shadow; // @box-shadow-offset;
background-color: @ini_background_content;
border-color: @wikiicons-border;
li {
color: @ini_existing;
a {
box-shadow: none;
background-image: none;
opacity: .8;
border-color: transparent;
color: inherit;
padding: 2px 0 2px 2px;
svg {
border: solid 1px transparent;
border-radius: @ini_default_border_radius;
fill: @ini_existing;
transition: @transition background-color, @transition border-color, @transition fill;
}
&:hover,
&:focus,
&:active {
opacity: 1;
svg {
fill: @color-nav-hover;
background-color: @ini_existing;
border-color: @ini_existing;
fill: @ini_background_content;
}
}

View file

@ -31,12 +31,15 @@
width: auto;
min-height: @toggle-size;
overflow: hidden;
border: 1px solid @color-border;
border-radius: @border-radius;
color: @color-nav;
border: 1px solid @wikiicons-border;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
text-align: center;
margin: 0;
@media @screen_only-lg {
padding-top: .14rem;
}
@media @screen_max-xxlg {
min-height: 28px;
}
@ -47,27 +50,34 @@
}
&.user {
@space-min-xxlg: .35rem;
@space-max-xxlg: .4rem;
@space-max-xlg: .5rem;
@space-max-md: .35rem;
position: relative;
display: table-cell;
border: solid 1px @color-border;
border-radius: @border-radius;
background-color: @ini_background;
border: solid 1px @noopentasks-border;//@ini_border_light;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe;
padding-right: .3rem;
@media @screen_min-xxlg {
padding-top: .35rem;
padding-top: @space-min-xxlg;
}
@media @screen_max-xxlg {
padding-top: .4rem;
padding-top: @space-max-xxlg;
}
@media @screen_max-xlg {
padding-top: .5rem;
padding-top: @space-max-xlg;
}
@media @screen_max-md {
min-height: @toggle-size;
padding-top: .35rem;
padding-top: @space-max-md;
}
> a {
@ -77,29 +87,29 @@
position: relative;
min-height: 26px;
overflow: visible;
background: #FFF; // for removing bg-image
background: @ini_nav_menu_hover_bg; // for removing bg-image
border: 0 none;
color: @ini_nav_menu_hover_color;
text-indent: 0;
color: @color-nav;
font-size: inherit;
margin-right: -.3rem;
padding: 0 .2em 0 0;
@media @screen_min-xxlg {
margin-top: -.3rem;
margin-top: -(@space-min-xxlg);
}
@media @screen_max-xxlg {
margin-top: -.3rem;
margin-top: -(@space-max-xxlg);
}
@media @screen_max-xlg {
margin-top: -.5rem;
margin-top: -(@space-max-xlg);
}
@media @screen_max-md {
min-height: (@toggle-size - .1);
margin-top: -.35rem;
margin-top: -(@space-max-md);
}
&::before {
@ -110,18 +120,19 @@
right: -1px;
width: auto;
opacity: 0;
border: solid 1px @color-nav-hover;
border-radius: @border-radius;
border: solid 1px @ini_nav_menu_hover_color;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: inherit;
transform: none;
transition: @transition opacity;
//transition: @transition opacity;
}
&:hover,
&:focus,
&:active {
background-color: @color-nav-hover-bg;
border-color: @color-nav-hover;
color: @color-nav-hover;
background-color: @ini_nav_menu_hover_color;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_bg;
&::before {
opacity: 1;
@ -129,18 +140,18 @@
bdi,
bdi:first-of-type {
color: @color-nav-hover;
color: @ini_nav_menu_hover_bg;
&::before {
color: inherit;
}
//&::before {
// color: inherit;
//}
}
}
}
bdi {
color: inherit;
display: inline-block;
color: inherit;
transition: @transition color;
}
@ -156,7 +167,6 @@
position: absolute;
left: -2px;
font-size: 1.4rem;
color: @color-nav;
margin: 0;
transition: @transition color;
@ -185,10 +195,6 @@
white-space: normal;
text-indent: 0;
@media @screen_only-lg {
padding-top: .14rem;
}
&::before {
content: '';
position: absolute;
@ -208,12 +214,15 @@
&.noopentasks {
strong {
background-color: @color-site-bg;
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
.num {
background-color: @noopentasks-background; // fix
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
margin-top: 1px;
}
}
} // li
@ -223,36 +232,27 @@
a {
.fontello();
.hide-text-show-before();
.btn-hover();
cursor: pointer;
position: relative;
background-color: #fff;
line-height: 1;
text-decoration: none;
transition: @transition color, @transition background-color, @transition border-color;
@media @screen_only-lg {
min-width: 2rem;
}
&::before {//background-color: deeppink !important;
&::before {
.center-middle();
content: "?";
cursor: pointer;
display: block;
width: 100%;
box-sizing: border-box;
font-size: @font-size-default + (@font-scale-factor * 4);
line-height: 1;
cursor: pointer;
}
&:hover,
&:active,
&:focus {
background-color: @color-nav-hover-bg;
border-color: @color-nav-hover;
color: @color-nav-hover;
}
/* icon register new user */

12
css/area_search.less Normal file
View file

@ -0,0 +1,12 @@
/**
* This file provides the design styles for the search results
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
/* search hit in normal text */
.dokuwiki .search_hit {
background-color: @ini_highlight;
color: @ini_highlight_text;
}

View file

@ -22,7 +22,6 @@
background-image: none;
background-color: transparent; // fix
border: solid 1px transparent;
color: @color-nav; // fix
padding: 0;
transition: @transition color, @transition background-color, @transition border-color;
@ -30,12 +29,11 @@
&:focus,
&:active {
min-height: @icon-size;
background-color: @button_color;
border: solid 1px @button_background;
color: @button_background;
background-color: @ini_button_color;
border: solid 1px @ini_button_background;
&::after {
background-color: @button_background;
background-color: @ini_button_background;
}
}
@ -61,6 +59,7 @@
min-width: (@toggle-showsidebar_width + 0.1); /* must be a bit a wider than @toggle-showsidebar_width to hide right border */
width: @main-ico-dummy;
border-radius: @fix_border-radius;
color: @ini_nav_menu_color;
text-decoration: none;
box-sizing: border-box;
@ -76,9 +75,9 @@
&:hover,
&:focus,
&:active {
background-color: @color-nav-hover-bg;
border-color: @color-nav-hover;
color: @color-nav-hover;
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
}
}
}
@ -90,6 +89,7 @@
right: 0;
height: auto;
min-height: (@icon-size - .2);
color: @quicksearch-button-color;
&:hover,
&:focus,
@ -97,9 +97,9 @@
top: 0;
bottom: 0;
min-height: @icon-size;
background-color: @button_color;
border: solid 1px @button_background;
color: @button_background;
background-color: @ini_button_color;
border: solid 1px @ini_button_background;
color: @ini_button_background;
}
}
@ -111,12 +111,12 @@
margin: 0 0 @margin-default;
.no {
display: inline-block;
display: block;
#qsearch__in {
width: 100%;
padding-left: 10px;
padding-right: (@icon-size + 10);
padding-right: @icon-size;
}
}
@ -127,7 +127,7 @@
button[type="submit"] {
border: solid 1px transparent;
border-right-color: @color-border;
border-right-color: @ini_border;
margin-left: -(@icon-size);
&::after {
@ -137,10 +137,32 @@
bottom: 15%;
width: 1px;
left: -1px;
background-color: @color-border;
background-color: @ini_border;
transition: @transition background-color;
}
}
div.ajax_qsearch {
box-shadow: none;
background-color: #FFF;
padding: 0;
strong,
ul li {
color: @quicksearch-button-color;
padding: .25rem .5rem;
* {
color: inherit;
}
}
ul li {
&:nth-child(odd) {
background-color: @suggestion-zebra;
}
}
}
}
#qsearch__out {

39
css/area_tabs.less Normal file
View file

@ -0,0 +1,39 @@
/**
* This file provides styles for tab boxes
*/
/* + + + + + tabs + + + + + */
#dokuwiki__content {
ul.tabs {
li:not([class~="active"]) {
strong,
a {
color: @ini_text_neu;
transition: @transition background-color, @transition color;
}
a:hover,
a:focus,
a:active {
color: @ini_text;
}
}
}
.tabs > ul {
li:not([class~="active"]) {
a {
color: @ini_text_neu;
transition: @transition background-color, @transition color;
}
a:hover,
a:focus,
a:active {
color: @ini_text;
}
}
}
}

View file

@ -29,10 +29,10 @@
width: @margin-default;
height: 100%;
background-color: @button_background;
border: solid 1px @button_background;
border-radius: @fix_border-radius 0 0 @fix_border-radius;
color: @button_color;
background-color: @ini_button_background;
border: solid 1px @ini_button_background;
border-radius: @ini_default_border_radius 0 0 @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_button_color;
text-decoration: none;
transition: @transition color, @transition background-color, @transition border-color;
@ -55,9 +55,9 @@
&:hover,
&:focus,
&:active {
background-color: @button_color;
border-color: @button_background;
color: @button_background;
background-color: @ini_button_color;
border-color: @ini_button_background;
color: @ini_button_background;
text-decoration: none;
* {
@ -76,9 +76,9 @@
left: -1px;
a {
background-color: @button_background;
border-color: @button_background;
border-radius: 0 @fix_border-radius @fix_border-radius 0;
background-color: @ini_button_background;
border-color: @ini_button_background;
border-radius: 0 @ini_default_border_radius @ini_default_border_radius 0; // @ini_default_border_radius vs. @fix_border-radius
&::before {
opacity: .6;
@ -93,7 +93,7 @@
&:hover,
&:focus,
&:active {
background-color: @button_color;
background-color: @ini_button_color;
&::before {
opacity: 0;
@ -107,21 +107,3 @@
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
.togglelink {
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1199px */
@media @screen_max-xlg {
.togglelink {
}
}

View file

@ -5,97 +5,101 @@
*/
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* converted vars */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@background_page-header: __background_page-header__;
@border-radius: __default_border_radius__;
@font_family_screen: __font_family_screen__;
@color-text: __text__;
@color-border: __border__;
@color-border-light: __border_light__;
@color-nav: __nav_menu_color__;
@color-nav-hover: __nav_menu_hover_color__;
@color-nav-hover-bg: __nav_menu_hover_bg__;
@color-content-bg: __background_content__;
@color-site-bg: __background_site__;
@color-link: __existing__;
@color-link-hover: @color-nav;
@button_color: __button_color__;
@button_background: __button_background__;
@box-shadow-offset: __box_shadow_offset__;
@box-shadow: __box_shadow__;
@box-shadow-colored: __box_shadow_colored__;
@box-shadow-right-bottom:__box_shadow_right_bottom__;
@box-shadow-bottom: __box_shadow_bottom__;
@th_background: __background_alt__;
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* global vars */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@height-context-bar: 50px;
@font_family_screen: arial, sans-serif;
@font_family_print: "Times New Roman", serif;
@margin-small: 1rem;
@margin-default: 2rem;
@margin-big: 3.07rem;
@nav_direct_background: @ini_background_content;
@nav_direct_color: @ini_existing;
@small-spacing: .3rem;
@very-small-spacing: .2rem;
@ini_sidebar_width: (100 - @ini_site_width) - 4;
@grid: @margin-small;
@toggle-size: 1.75rem;
@height-context-bar: 50px;
@transition: ease-out .30s;
@margin-small: 1rem;
@margin-default: 2rem;
@margin-big: 3.07rem;
@small-spacing: .3rem;
@very-small-spacing: .2rem;
@grid: @margin-small;
@toggle-size: 1.75rem;
@transition: ease-out .30s;
@box-shadow-offset: .1em .1em .1em rgba(153,153,153,.5); // pagetools, tabinclude
@box-shadow: 0 0 .5em rgba(153,153,153,.5);
@box-shadow-colored: 0 0 .5em fade(@ini_existing, 50%);
@box-shadow-right-bottom: 0.1em 0.3rem 0.5em rgba(153,153,153,.5);
@box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper - breadcrumb
/* + + + 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
@noopentasks-background: #BBB;
@noopentasks-color: #696969;
//@metanav-ini_background: rgba(0, 0, 0, .1);
/* icons */
@noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude + code, pre, samp, kbd */
@noopentasks-border: #BBB; /* metabox tabs + num in icons + code, pre, samp, kbd */
@noopentasks-color: #666; /* metabox tabs + num in icons + code, pre, samp, kbd */
@wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */
/* navigation left */
@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
@suggestion-zebra: #EEE;
/* edit mode */
@highlight-odd-ini_text: fade(@ini_background_content, 95%);
@highlight-even-ini_text: fade(@ini_text, 5%);
@color-editBox: #252525; // editmode for tables
//@nolinkedicon-ini_background: fade(@ini_background, 10%);
//@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%);
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* fonts */
@font-size-very-small: .73rem;
@font-size-small: .88rem;
@font-size-default: 1rem;
@font-size-big: 1.5rem;
@font-size-bigger: 1.75rem;
@font-size-very-small: .73rem;
@font-size-small: .88rem;
@font-size-default: 1rem;
@font-size-big: 1.5rem;
@font-size-bigger: 1.75rem;
@line-height-default: 125%;
@line-height-big: 135%;
@line-height-bigger: 140%;
@line-height-default: 125%;
@line-height-big: 135%;
@line-height-bigger: 140%;
@font-weight-bold: 800;
@font-weight-normal: 400;
@font-weight-bold: 800;
@font-weight-normal: 400;
@font-scale-factor: .0769;
@font-scale-factor: .0769;
@font-size-head6: @font-size-default;
@font-size-head5: @font-size-default + @font-scale-factor;
@font-size-head4: @font-size-default + (@font-scale-factor * 2);
@font-size-head3: @font-size-default + (@font-scale-factor * 3);
@font-size-head2: @font-size-default + (@font-scale-factor * 4);
@font-size-head1: @font-size-default + (@font-scale-factor * 5);
@font-size-head4: @font-size-default + (@font-scale-factor * 3);
@font-size-head3: @font-size-default + (@font-scale-factor * 5);
@font-size-head2: @font-size-default + (@font-scale-factor * 7);
@font-size-head1: @font-size-default + (@font-scale-factor * 9);
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
@ -137,11 +141,9 @@
@screen_min-md: ~"only screen and (min-width: " ~"@{break-min-md}px)";
@screen_max-md: ~"only screen and (max-width: " ~"@{break-max-md}px)";
@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)";
@screen_min-lg: ~"only screen and (min-width: " ~"@{break-min-lg}px)";
@screen_max-lg: ~"only screen and (max-width: " ~"@{break-max-lg}px)";
@screen_only-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
@screen_min-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px)";
@screen_max-xlg: ~"only screen and (max-width: " ~"@{break-max-xlg}px)";
@ -149,6 +151,10 @@
@screen_min-xxlg: ~"only screen and (min-width: " ~"@{break-min-xxlg}px)";
@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_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* col width */
@ -208,7 +214,7 @@ q {
acronym {
cursor: help;
border-bottom: dotted 1px #333;
border-bottom: dotted 1px @ini_text;
}
*:focus {
@ -251,7 +257,7 @@ nav > ul {
&::before,
&::after {
display: table;
content: " ";
content: ' ';
clear: both;
}
}
@ -280,6 +286,7 @@ nav > ul {
.mobile-only {
display: none;
@media @screen_max-md {
display: inline-block;
}

Some files were not shown because too many files have changed in this diff Show more