Merge branch 'master' into pageattributes

Adjusted some more files to account for changes in the over 100 commits
in master since the creation of this branch.

SPR-869
This commit is contained in:
Michael Große 2017-04-11 16:13:02 +02:00
commit 3f9d4d521a
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
85 changed files with 4162 additions and 1910 deletions

View file

@ -5,92 +5,102 @@
*/
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* 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;
@height-context-bar: 50px;
@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
@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
//@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);
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* breakpoints */
@ -114,7 +124,7 @@
@break-max-xlg: (@break-min-xlg - 1);
@break-min-xxlg: 1600;
@break-max-xxlg: (@break-min-xlg - 1);
@break-max-xxlg: (@break-min-xxlg - 1);
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
@ -131,7 +141,6 @@
@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)";
@ -142,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 */
@ -201,7 +214,7 @@ q {
acronym {
cursor: help;
border-bottom: dotted 1px #333;
border-bottom: dotted 1px @ini_text;
}
*:focus {
@ -244,7 +257,7 @@ nav > ul {
&::before,
&::after {
display: table;
content: " ";
content: ' ';
clear: both;
}
}
@ -273,6 +286,7 @@ nav > ul {
.mobile-only {
display: none;
@media @screen_max-md {
display: inline-block;
}
@ -286,6 +300,13 @@ nav > ul {
}
}
.desktop-only {
display: none;
@media @screen_min-md {
display: inline-block;
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* screen only */