Merge branch 'master' into title

* master:
  Adjust less vars for compatibility
  Use do-plugin's user task button w/ overlay
  SPR-937: comment
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-958: Scrollbars im meta-footer (bdi)
  SPR-950: optimate Headerstyling in Mobile
  SPR-950: mobile - magicmatcher additional class makes wrong padding in usertoolicons
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-950: optimate Headerstyling in Mobile
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-945: min-width for quicksearch qs wide-screen
  SPR-942: sublist less indent; SPR-945: min-width for quicksearch
  SPR-942: sublist alignment in sidebar; SPR-953: nav active
  SPR-942: sublist less indent
  SPR-908: qs old data plugin (edit button for table)
  SPR-908: check fix border-radius
  SPR-937: Alignment Sidebar
This commit is contained in:
Andreas Gohr 2017-04-26 11:54:19 +02:00
commit 146503ce08
29 changed files with 351 additions and 159 deletions

View file

@ -26,10 +26,11 @@
} }
bdi { bdi {
font-weight: bold;
max-width: 100%;
display: inline-block; display: inline-block;
overflow: auto; max-width: 100%;
overflow-x: auto;
overflow-y: hidden;
font-weight: bold;
vertical-align: bottom; vertical-align: bottom;
} }
} }
@ -39,7 +40,7 @@
position: relative; position: relative;
z-index: 2; z-index: 2;
box-sizing: border-box; box-sizing: border-box;
background-color: @ini_background; background-color: @ini_background_site;
} }
p { p {

View file

@ -8,14 +8,13 @@
#dokuwiki__header { #dokuwiki__header {
@header-font-opacity: 1; @header-font-opacity: 1;
@media @screen_max-xs {
min-height: 120px;
}
/* + + + wiki logo + + + */ /* + + + wiki logo + + + */
@media @screen_min-md { @media @screen_min-md {
div.claim {
display: table-cell;
height: 100%;
vertical-align: middle;
}
.logo { .logo {
padding: 1rem 0 .3rem; padding: 1rem 0 .3rem;
@ -48,7 +47,7 @@
} }
/* + + + wiki title + claim + + + */ /* + + + + + DESKTOP - wiki title + claim + + + + + */
.main-title.desktop-only { .main-title.desktop-only {
@media @screen_min-md { @media @screen_min-md {
display: table-cell; display: table-cell;
@ -70,20 +69,30 @@
display: block; display: block;
padding-bottom: 1rem; padding-bottom: 1rem;
} }
@media @screen_max-xs {
padding-right: (@toggle-size + @headericons-margin-xxs);
}
} }
} }
/* + + + + + MOBILE - wiki title wrapper + + + + + */
.main-title:not([class*="desktop-only"]) { .main-title:not([class*="desktop-only"]) {
@media @screen_max-md { @media @screen_max-md {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
@media @screen_max-xs {
padding-right: (@toggle-size + @headericons-margin-xxs);
}
} }
/* + + + wiki title + + + */ /* + + + wiki title + + + */
p.title { p.title {
background-color: @ini_background; background-color: @ini_background_site;
opacity: @header-font-opacity; opacity: @header-font-opacity;
color: @ini_text_webframe; color: @ini_text_webframe;
line-height: @line-height-default; line-height: @line-height-default;
@ -101,6 +110,16 @@
} }
/* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */
@media @screen_min-md {
div.claim {
display: table-cell;
height: 100%;
vertical-align: middle;
}
}
/* + + + wiki claim + + + */ /* + + + wiki claim + + + */
p.claim { p.claim {
opacity: @header-font-opacity; opacity: @header-font-opacity;
@ -116,7 +135,9 @@
/* + + + mobile nav togglelink + + + */ /* + + + mobile nav togglelink + + + */
.menu-togglelink { .menu-togglelink {
margin: .45rem -(@very-small-spacing) 0 0; position: relative;
z-index: 1;
margin: @headericons-margin-xxs -(@very-small-spacing) 0 0;
a { a {
.fontello(); .fontello();
@ -156,7 +177,7 @@
&.has-magicmatcher { &.has-magicmatcher {
.logo { .logo {
@media @screen_min-md { @media @screen_min-md {
padding-top: 2rem; padding-top: 3rem;
} }
} }

View file

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

View file

@ -4,16 +4,18 @@
#dokuwiki__aside { #dokuwiki__aside {
// do not indent the first level of lists
// and use less indention in deeper levels
ul, ul,
ol { ol {
margin-left: -.4rem;
padding-left: 0; padding-left: 0;
ul, ul,
ol { ol {
padding-left: @margin-small; padding-left: 1.8rem;
@media @screen_md-lg {
padding-left: @menu-margin-lg;
}
li { li {
margin-left: 0; margin-left: 0;
@ -51,9 +53,9 @@
right: 0; right: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
background: @ini_background; background: @ini_background_site;
background: -webkit-linear-gradient(left, @ini_background, @ini_background_content); background: -webkit-linear-gradient(left, @ini_background_site, @ini_background);
background: linear-gradient(left, @ini_background, @ini_background_content); background: linear-gradient(left, @ini_background_site, @ini_background);
z-index: 0; z-index: 0;
} }
} }

View file

@ -8,7 +8,7 @@
#dokuwiki__aside { #dokuwiki__aside {
@icon-size: @font-size-big; @icon-size: @font-size-big;
@menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong @menu-margin: @icon-size + @margin-small * 2;
nav > p, nav > p,
.mmissuelist li, .mmissuelist li,
@ -37,6 +37,11 @@
margin-left: 0; margin-left: 0;
} }
} }
li:not([class]),
.li {
padding: .15em 0;
}
} }
@ -70,6 +75,10 @@
> * { > * {
margin-left: @menu-margin; // moves *all* sidebar content to the right margin-left: @menu-margin; // moves *all* sidebar content to the right
@media @screen_md-lg {
margin-left: @menu-margin-lg;
}
} }
a { a {
@ -96,16 +105,20 @@
.align-items(); .align-items();
cursor: pointer; cursor: pointer;
height: @icon-size + @margin-small; min-height: @icon-size + @margin-small;
opacity: 1; opacity: 1;
border: 1px solid transparent; border: 1px solid transparent;
border-radius: @fix_border-radius; border-radius: @fix_border-radius;
color: @ini_nav_menu_color; color: @ini_nav_menu_color;
font-size: @font-size-head6; font-size: @font-size-head6;
font-weight: normal; font-weight: normal;
margin: -1px 0 (@font-size-head6 / 2) (@menu-margin * -1); // moves the toggles back to the left margin: -1px 0 (@font-size-head6 / 2) -(@menu-margin - .4); // moves the toggles back to the left (.4 from li margin)
transition: @transition color, @transition background-color, @transition border-color; transition: @transition color, @transition background-color, @transition border-color;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg + .8);
}
span { span {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@ -114,12 +127,20 @@
span.lbl { span.lbl {
flex-grow: 1; flex-grow: 1;
// wordbreak too late in IE 10
@media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
width: 100%;
box-sizing: border-box;
padding-right: 13px;
}
} }
span.ico { span.ico {
.flex(0 0 auto);
width: @menu-margin; width: @menu-margin;
height: @icon-size; height: @icon-size;
flex-grow: 0;
border-right: 1px solid @ini_nav_menu_color; border-right: 1px solid @ini_nav_menu_color;
text-align: center; text-align: center;
margin-right: 4%; margin-right: 4%;
@ -183,7 +204,23 @@
} }
} }
// the panel (hidden by default) // without wrapping UL
nav > a.nav {
margin-left: -3.5rem;
@media @screen_md-lg {
margin-left: -2.5rem;
}
}
/* + + + + + active + + + + + */
span.curid a {
font-weight: bold;
}
/* + + + + + the panel (hidden by default) + + + + + */
div.nav-panel { div.nav-panel {
display: none; display: none;
margin-top: .5rem; margin-top: .5rem;
@ -236,7 +273,6 @@
li:not([class]), li:not([class]),
.li { .li {
font-size: @font-size-head6; font-size: @font-size-head6;
padding: .15em 0;
* { * {
font-size: inherit; font-size: inherit;
@ -304,7 +340,6 @@
li:not([class]), li:not([class]),
.li { .li {
font-size: @font-size-default; font-size: @font-size-default;
padding: .15em 0 .15em .25rem;
* { * {
font-size: inherit; font-size: inherit;

View file

@ -0,0 +1,212 @@
/**
* This file provides the design styles for the quick search.
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
.search.main-sidebar {
@main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
@icon-size: @page-header_height;
@icon-search_font-size: @font-size-big;
@media @screen_md-lg {
margin-left: -(@menu-margin-lg);
}
p.toggleSearch a,
button[type="submit"] {
.fontello();
.hide-text-show-before();
.icon-search();
position: relative;
width: @icon-size;
min-height: @icon-size;
overflow: visible;
background-image: none;
background-color: transparent; // fix
border: solid 1px transparent;
padding: 0;
transition: @transition color, @transition background-color, @transition border-color;
&:hover,
&:focus,
&:active {
min-height: @icon-size;
background-color: @ini_button_color;
border: solid 1px @ini_button_background;
&::after {
background-color: @ini_button_background;
}
}
&::before {
width: 100%;
color: inherit;
font-size: @icon-search_font-size;
text-align: center;
margin: 0;
}
}
p.toggleSearch {
display: none;
margin: -2px 0 0; // reverse transparent border and box-sizing of a child
padding: 0;
@media @screen_max-xxlg {
margin-top: -1px;
}
a {
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;
&::before {
position: absolute;
top: 50%;
left: 0;
color: inherit;
text-align: center;
margin-top: -(@icon-search_font-size / 2);
}
&:hover,
&:focus,
&:active {
background-color: @ini_nav_menu_hover_bg;
border-color: @ini_nav_menu_hover_color;
color: @ini_nav_menu_hover_color;
}
}
}
button[type="submit"] {
position: absolute;
top: 1px;
bottom: 1px;
right: 0;
height: auto;
min-height: (@icon-size - .2);
color: @quicksearch-button-color;
&:hover,
&:focus,
&:active {
top: 0;
bottom: 0;
min-height: @icon-size;
background-color: @ini_button_color;
border: solid 1px @ini_button_background;
color: @ini_button_background;
}
}
/* + + + form + + + */
form {
position: relative;
display: block;
margin: 0 0 @margin-default;
.no {
display: block;
#qsearch__in {
width: 100%;
padding-left: 10px;
padding-right: @icon-size;
}
}
input {
min-height: @icon-size;
box-sizing: border-box;
}
button[type="submit"] {
border: solid 1px transparent;
border-right-color: @ini_border;
margin-left: -(@icon-size);
&::after {
content: '';
position: absolute;
top: 15%;
bottom: 15%;
width: 1px;
left: -1px;
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;
}
}
}
}
/* + + + + + suggestionlist + + + + + */
#qsearch__out {
left: auto;
top: auto;
width: 100%;
min-width: 20rem;
}
}
/* + + + + + wide page content + + + + + */
.wide-content {
.search.main-sidebar {
p.toggleSearch {
position: relative;
z-index: 1;
display: block;
float: left;
width: 100%;
}
form {
input {
border: 0 none;
}
.no {
#qsearch__in {
width: 0;
padding: 0;
margin: 0;
}
button[type="submit"] {
display: none;
}
}
}
}
}

View file

@ -19,7 +19,10 @@
} }
/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */ /* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */
div.success, div.error, div.info, div.notify { div.success,
div.error,
div.info,
div.notify {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 8px 50%; background-position: 8px 50%;
border: 1px solid #eeb; border: 1px solid #eeb;
@ -28,7 +31,7 @@ div.success, div.error, div.info, div.notify {
padding: .4em; padding: .4em;
padding-left: 32px; padding-left: 32px;
overflow: hidden; overflow: hidden;
border-radius: 5px; border-radius: @fix_border-radius;
* { * {
color: inherit; color: inherit;

View file

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

View file

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

View file

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

View file

@ -5,10 +5,25 @@
*/ */
.nav-usertools { #dokuwiki__usertools.nav-usertools {
@media @screen_min-md {
right: 1.25rem;
}
@media @screen_max-md {
position: absolute;
top: 0;
left: (@toggle-size + 1.25); // margin-left content
right: @headericons-margin-xxs;
margin-top: 0;
margin-right: 0;
}
&.has-bar { &.has-bar {
margin-top: @height-context-bar; @media @screen_min-md {
padding-top: .5em; margin-top: @height-context-bar;
padding-top: .5em;
}
} }
@ -25,7 +40,13 @@
float: right; float: right;
min-height: 28px; min-height: 28px;
> strong, @media @screen_max-xs {
display: block;
float: none;
margin-bottom: @headericons-margin-xxs;
}
> span,
> a { > a {
display: block; display: block;
width: auto; width: auto;
@ -36,7 +57,7 @@
text-align: center; text-align: center;
margin: 0; margin: 0;
@media @screen_only-lg { @media @screen_md-xlg {
padding-top: .14rem; padding-top: .14rem;
} }
@ -47,6 +68,10 @@
@media @screen_max-md { @media @screen_max-md {
min-height: @toggle-size; min-height: @toggle-size;
} }
@media @screen_only-lg {
min-width: 2rem;
}
} }
&.user { &.user {
@ -57,8 +82,8 @@
position: relative; position: relative;
display: table-cell; display: table-cell;
background-color: @ini_background; background-color: @ini_background_site;
border: solid 1px @noopentasks-border;//@ini_border_light; border: solid 1px @wikiicons-border; // @ini_border_light;
border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
color: @ini_text_webframe; color: @ini_text_webframe;
padding-right: .3rem; padding-right: .3rem;
@ -80,6 +105,20 @@
padding-top: @space-max-md; padding-top: @space-max-md;
} }
@media @screen_max-xs {
position: absolute;
top: @headericons-margin-xxs;
right: (@toggle-size + @headericons-margin-xxs);
overflow: hidden;
white-space: nowrap;
margin: -1px 0 0;
}
@media @screen_max-xxs {
left: -10px;
width: auto;
}
> a { > a {
.display-flex(); .display-flex();
.align-items(); .align-items();
@ -117,6 +156,10 @@
margin-top: -(@space-max-md); margin-top: -(@space-max-md);
} }
@media @screen_max-xxs {
min-height: (@toggle-size - .15);
}
&::before { &::before {
content: ''; content: '';
top: -1px; top: -1px;
@ -176,53 +219,13 @@
top: -.2rem; top: -.2rem;
} }
@media @screen_max-xxs { @media @screen_max-xs {
top: -.25rem; top: -.25rem;
} }
} }
} }
} // user } // user
&.user-task {
position: relative;
a {
position: relative;
overflow: visible;
white-space: normal;
text-indent: 0;
&::before {
content: '';
position: absolute;
}
}
.prefix {
.btn-prefix();
.icon-clipboard();
display: block;
font-size: 1.2rem;
text-align: center;
margin-bottom: -1px;
}
} // user-task
&.noopentasks {
strong {
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
}
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
margin-top: 1px;
}
}
} // li } // li
@ -237,7 +240,7 @@
line-height: 1; line-height: 1;
text-decoration: none; text-decoration: none;
@media @screen_only-lg { @media @screen_md-xlg {
min-width: 2rem; min-width: 2rem;
} }
@ -278,4 +281,4 @@
} }
} // a } // a
} // ul } // ul
} // nav-usertools } // nav-usertools

View file

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

View file

@ -12,7 +12,7 @@
@font_family_screen: arial, sans-serif; @font_family_screen: arial, sans-serif;
@font_family_print: "Times New Roman", serif; @font_family_print: "Times New Roman", serif;
@nav_direct_background: @ini_background_content; @nav_direct_background: @ini_background;
@nav_direct_color: @ini_existing; @nav_direct_color: @ini_existing;
@ini_sidebar_width: (100 - @ini_site_width) - 4; @ini_sidebar_width: (100 - @ini_site_width) - 4;
@ -40,10 +40,12 @@
/* + + + for programmers customizing + + + */ /* + + + for programmers customizing + + + */
@fix_border-radius: 3px; @fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
@toggle-showsidebar_width: 3.07rem; // shown sidebar after toggle @toggle-showsidebar_width: 3.07rem; // shown sidebar after toggle
@headericons-margin-xxs: .45rem; // screen xxs margin-top for header icons
@page_padding-top: @margin-small; // padding-top for 'dokuwiki__content' @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) @page-header_height: 2.8rem; // minimum: 2.8rem (height for breadcrumb, page-header, page-footer)
@meta-box_height: (@page-header_height - @page_padding-top); @meta-box_height: (@page-header_height - @page_padding-top);
@ -61,18 +63,21 @@
@wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */ @wikiicons-border: #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */
/* navigation left */ /* navigation left */
@menu-margin-lg: 1.3rem;
@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */ @quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
@suggestion-zebra: #EEE; @suggestion-zebra: #EEE;
/* edit mode */ /* 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%); @highlight-even-ini_text: fade(@ini_text, 5%);
@color-editBox: #252525; // editmode for tables, revision states @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%); //@opacity-ini_nav_menu_color: fade(@ini_nav_menu_color, 40%);
@ -152,8 +157,9 @@
@screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-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-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_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)"; @screen_only-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)";
@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)";
@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)"; @screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";

View file

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

View file

@ -161,20 +161,23 @@
} }
} }
@media @screen_md-lg {
.wide-content.showSidebar {
.content {
.row > .col-xs-12 {
margin-left: 2.1rem;
}
}
}
}
@media @screen_max-md { @media @screen_max-md {
.container { .container {
margin: 0 1.25rem; margin: 0 1.25rem;
} }
#dokuwiki__usertools {
margin-top: 0;
max-width: 75%;
position: absolute;
top: 0;
margin-right: 0;
right: 1.25rem;
}
.content { .content {
position: relative; position: relative;
@ -205,10 +208,6 @@
left: @mobileMargin; left: @mobileMargin;
} }
#dokuwiki__usertools {
right: @mobileMargin;
}
#dokuwiki__footer { #dokuwiki__footer {
.main-footer { .main-footer {
> * { > * {

50
css/plugins/data.less Normal file
View file

@ -0,0 +1,50 @@
/**
* This file provides styles for old data plugin
* after importing struct data this can be deleted
*/
/* + + + + + global + + + + + */
#dokuwiki__content {
.dataplugin_entry.mitarbeiter.sectionedit2 {
dl {
margin-left: 0;
margin-right: 0;
}
+ .secedit.editbutton_plugin_data {
position: relative;
top: -1em; // as margin after DL
float: left;
font-size: @font-size-small; // for right position
margin-top: 0;
form {
button {
min-height: 1rem;
height: 1.8em;
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;
color: @ini_existing;
font-size: @font-size-small;
line-height: 1.8em;
margin-top: -1px; // for right position
margin-left: .6em;
padding: 0 .3em;
transition: @transition background-color, @transition border-color, @transition color;
&:hover,
&:focus,
&:active {
background-color: @ini_existing;
border-color: @ini_existing;
color: @ini_background;
}
}
}
}
}
}

View file

@ -11,7 +11,7 @@ ul.page-attributes {
strong { strong {
overflow: hidden; overflow: hidden;
background-color: @ini_background; background-color: @ini_background_site;
border-color: @noopentasks-border; border-color: @noopentasks-border;
color: @ini_text_webframe; color: @ini_text_webframe;
} }
@ -24,3 +24,60 @@ ul.page-attributes {
} }
} }
} }
#dokuwiki__usertools.nav-usertools {
ul {
li {
&.user-task {
position: relative;
a {
overflow: visible;
white-space: normal; // Is this still needed?
text-indent: 0;
&::before {
content: ''; // remove when fontello is removed from usertools
}
}
svg {
width: 20px;
margin-top: 2px;
@media @screen_max-md {
margin-top: 4px;
}
}
&:hover {
:not(.noopentasks) {
svg path {
fill: @ini_background;
}
}
}
.noopentasks {
background-color: @ini_background;
border-color: @noopentasks-border;
color: @ini_text_webframe;
.num {
background-color: @noopentasks-border; // fix
color: @noopentasks-color; // fix
margin-top: 1px;
}
}
@media @screen_max-sm {
display: none;
}
} // user-task
} // li
} // ul
}
.plugin__do_usertasks_list {
z-index: 5;
}

View file

@ -22,7 +22,6 @@
div.editBox { div.editBox {
background-color: #FFF; background-color: #FFF;
border: solid 2px #FFF; border: solid 2px #FFF;
border-radius: @ini_default_border_radius;
.editButtons { .editButtons {
display: inline-block; display: inline-block;

View file

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

View file

@ -12,6 +12,12 @@
left: 0; left: 0;
width: 100%; width: 100%;
.container {
@media @screen_md-lg {
margin-left: 1.8rem;
}
}
#mm__issueselect_chosen { #mm__issueselect_chosen {
max-width: 50%; max-width: 50%;
} }
@ -43,7 +49,7 @@
min-height: @height-context-bar; min-height: @height-context-bar;
box-sizing: border-box; box-sizing: border-box;
box-shadow: @box-shadow; 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; border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
font-size: @font-size-default; font-size: @font-size-default;
padding: .8em 1em .5em; padding: .8em 1em .5em;

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