diff --git a/css/area_content.less b/css/area_content.less index 9520f68..57e75e4 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -18,7 +18,7 @@ top: 0; left: 0; z-index: -1; - height: 2.45rem; + height: 2.6rem; width: 100%; background-color: @background_page-header; border-bottom: 1px solid @color-border; @@ -39,28 +39,24 @@ } .structaggregation { - font-size: .88rem; - td, th { - font-size: .88rem; + td, + th { line-height: 125%; + a { - font-size: .88rem; + line-height: 125%; } } + > a.export { - font-size: .88rem; line-height: 135%; padding-top: .5em; } - ~ ul li .li { - font-size: .88rem; - } } .dokuwiki .structaggregation a.export { padding-top: .3em; - font-size: .88rem; } .main-content > .level2, @@ -69,13 +65,27 @@ .main-content > .level4, .main-content > .level5, .main-content > .level6 { - font-size: .88rem; padding-bottom: 1rem; + > p, > ul > li .li { - font-size: .88rem; a { font-size: inherit; } } } + +.level1, +.level2, +.level3, +.level4, +.level5, +.level6 { + line-height: 125%; + + div, p, th, td, textarea, + h1, h2, h3, h4, h5, h6, + dl, dt, dd, ol, ul, li { + line-height: 125%; + } +} diff --git a/css/area_footer.less b/css/area_footer.less index a217bf0..ec50151 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -22,9 +22,12 @@ } #dokuwiki__footer { + .main-footer { position: relative; + z-index: 10; box-sizing: border-box; + background-color: @color-site-bg; } p { @@ -67,7 +70,7 @@ &.showSidebar{ #dokuwiki__footer { .col-xs-12 { - margin-left: 2.5rem; + margin-left: @margin-big; } } } diff --git a/css/area_main-sidebar.less b/css/area_main-sidebar.less index 4728b1f..0c84228 100755 --- a/css/area_main-sidebar.less +++ b/css/area_main-sidebar.less @@ -12,9 +12,9 @@ /* + + + + + nav main + + + + + */ .nav-main { > ul { - @icon-size: 2rem; + @icon-size: @margin-default; - margin: 0 0 1.8rem; + margin: 0 0 @margin-default; padding: 0; ul { @@ -72,7 +72,7 @@ position: relative; z-index: 1; margin-top: -1px; - padding: .5em 0 .5em (@icon-size + 1); + padding: .5em 0 .5em (@margin-big + 1); &[class="li"] { border-bottom: solid 1px @color-border; @@ -88,7 +88,7 @@ top: 0; left: 0; height: 100%; - width: 2.5rem; + width: @margin-big; overflow: hidden; color: @color-nav; text-align: center; @@ -102,7 +102,7 @@ top: 15%; bottom: 15%; width: 1px; - left: (@icon-size + .5); + left: (@margin-big + .5); background-color: @color-border; } @@ -121,7 +121,7 @@ border: 1px solid transparent; border-radius: @fix_border-radius; margin-bottom: -.3rem; - padding: .6em 0 .6em (@icon-size + 1); + padding: .7em 0 .7em (@margin-big + 1); transition: @transition color, @transition background-color, @transition border-color; &::before { @@ -135,7 +135,7 @@ bottom: 1px; left: 0; height: 100%; - width: 2.5rem; + width: @margin-big; overflow: hidden; color: @color-nav; text-align: center; @@ -150,7 +150,7 @@ top: 15%; bottom: 15%; width: 1px; - left: (@icon-size + .5); + left: @margin-big; background-color: @color-border; transition: @transition background-color; } @@ -236,7 +236,7 @@ #dokuwiki__aside.main-sidebar { .nav-main { .li { - font-size: .8rem; + font-size: @font-size-default; padding: .1em 0; * { @@ -246,7 +246,7 @@ } > ul > li > .li { - font-size: .9rem; + font-size: @font-size-default; * { font-size: inherit; @@ -264,7 +264,7 @@ #dokuwiki__aside.main-sidebar { .nav-main { .li { - font-size: .9rem; + font-size: @font-size-default; padding: .15em 0 .15em .25rem; * { @@ -274,7 +274,7 @@ } > ul > li > .li { - font-size: 1rem; + font-size: @font-size-default; > * { font-size: inherit; diff --git a/css/area_msg.less b/css/area_msg.less index 17a7430..21a47d7 100644 --- a/css/area_msg.less +++ b/css/area_msg.less @@ -2,7 +2,7 @@ clear: both; padding-top: 1.6rem; div{ - font-size: .88rem; + //font-size: .88rem; line-height: 135%; } &:empty{ diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 529997c..eeffdf1 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -10,11 +10,11 @@ padding: 1rem 1.8rem .2rem; > p { - font-size: .83rem; + font-size: @font-size-small; margin: 0; * { - font-size: .83rem; + font-size: @font-size-small; } .bchead { @@ -38,7 +38,7 @@ transition: @transition border-color; &:before { - font-size: 1rem; + font-size: @font-size-default + (@font-scale-factor * 2); margin-top: .17rem; } @@ -140,11 +140,11 @@ #plugin__qc__out{ h1{ - font-size: 1.2rem; + font-size: @font-size-head3; } h2{ margin-top: 1.6em; - font-size: .93rem; + font-size: @font-size-head5; } > h1, > h2, > p, >dl, >div{ padding-left: 1rem; @@ -172,7 +172,7 @@ .icon-emo-happy(); width: 100%; - font-size: .9rem; + font-size: @font-size-default; &::before { width: 100%; diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index de64db4..a846b88 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -10,11 +10,10 @@ } ul.meta-tabs { - //border-bottom: 1px solid @color-border; - //background-color: @background_page-header; + list-style: none; + background-color: @background_page-header; margin: 0; padding: 0; - list-style: none; &::before, &::after { @@ -30,12 +29,6 @@ } } - > li:last-child { - > a { - margin-right: -1px; - } - } - > li { margin: 0 0 -1px; position: relative; @@ -49,7 +42,7 @@ border: 1px solid @color-border; border-radius: @fix_border-radius @fix_border-radius 0 0; color: @color-nav; - font-size: .78rem; + font-size: @font-size-small; line-height: 1.42857143; padding: .3em 1rem .1em; margin-left: 4px; @@ -57,28 +50,13 @@ * { cursor: pointer; + color: inherit; } .prefix { - font-size: .78rem; - color: @color-nav; position: relative; transition: @transition color; - } - - .num { - position: absolute; - right: -.8rem; - top: -.2rem; - background-color: @color-border; - border-radius: @fix_border-radius; - color: @color-nav; - font-size: .56rem; - font-weight: 400; - text-align: center; - line-height: 1; - padding: .2em .2rem .1em; - transition: @transition color, @transition background-color; + font-size: @font-size-small; } &:hover, @@ -92,10 +70,6 @@ .prefix { color: inherit; } - - .num { - color: inherit; - } } } @@ -141,11 +115,17 @@ } > div { + font-size: @font-size-small; padding: .8rem .5rem .5rem; + * { + font-size: inherit; + } + p { padding-left: 1em; } + ul { list-style: none; padding-left: 0; @@ -174,11 +154,11 @@ } > div ul.toc { - font-size: .78rem; + font-size: @font-size-small; padding-left: .5em; a { - font-size: .78rem; + font-size: @font-size-small; display: inline-block; padding-left: 10px; position: relative; diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index f09bbbf..659fd4e 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -22,16 +22,14 @@ nav#dokuwiki__pagetools{ - right: -2rem; + right: -(@margin-default); top: 3.05rem; z-index: 100; ul { li { - &:nth-child(3n+3){ - margin-bottom: 1rem; - } + *{ - font-size: .8rem; + font-size: @font-size-default; } &.plugin_move_page{ a{ @@ -42,7 +40,7 @@ nav#dokuwiki__pagetools{ } background: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSIxMDAwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPjxwYXRoIGZpbGw9InJnYigxMDUsMTA1LDEwNSkiIGQ9Ik05NDYuNCAyMTQuM3EyMi40IDAgMzggMTUuNnQxNS42IDM4djY3OC41cTAgMjIuMyAtMTUuNiAzOHQtMzggMTUuNkg0MTAuN3EtMjIuMyAwIC0zNy45IC0xNS42dC0xNS43IC0zOFY3ODUuN0g1My42cS0yMi40IDAgLTM4IC0xNS42VDAgNzMyLjF2LTM3NVEwIDMzNC44IDExLjIgMzA4dDI2LjcgLTQyLjRMMjY1LjYgMzcuOVEyODEuMyAyMi4zIDMwOCAxMS4yVDM1Ny4xIDBoMjMyLjJxMjIuMyAwIDM3LjkgMTUuNnQxNS43IDM4djE4M3EzNy45IC0yMi4zIDcxLjQgLTIyLjNoMjMyLjF6TTY0Mi45IDMzMy4xTDQ3NiA1MDBoMTY2LjlWMzMzLjF6TTI4NS43IDExOC45TDExOC45IDI4NS43aDE2Ni44VjExOC45em0xMDkuNCAzNjFMNTcxLjQgMzAzLjZWNzEuNEgzNTcuMXYyMzIuMnEwIDIyLjMgLTE1LjYgMzcuOXQtMzcuOSAxNS42SDcxLjR2MzU3LjJoMjg1LjdWNTcxLjRxMCAtMjIuMyAxMS4yIC00OS4xdDI2LjggLTQyLjR6bTUzMy41IDQ0OC43VjI4NS43SDcxNC4zdjIzMi4ycTAgMjIuMyAtMTUuNiAzNy45dC0zOCAxNS42SDQyOC42djM1Ny4yaDUwMHoiLz48L3N2Zz4=) 95% center no-repeat; - background-size: 1rem auto; + background-size: @font-size-head2 auto; &:before{ visibility: hidden; } @@ -65,7 +63,7 @@ nav#dokuwiki__pagetools{ } a{ - font-size: .8rem; + font-size: @font-size-default; &.source, &.revs, &.backlink, &.plugin_bookcreator_addtobook, &.export_pdf, &.top, &.edit, &.show{ opacity: .6; color: @color-nav; @@ -73,7 +71,7 @@ nav#dokuwiki__pagetools{ color: @color-nav; } background-position: 95% center; - background-size: 1rem auto; + background-size: @font-size-head2 auto; &:before{ visibility: hidden; } @@ -118,7 +116,7 @@ nav#dokuwiki__pagetools{ &.top{ margin-top: 1em; position: relative; - background-size: .9rem; + background-size: @font-size-default; background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4MzQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0icmdiKDEwNSwxMDUsMTA1KSIgZD0iTTQxNi4yNSAxMDAxcS02NSAwIC0xMTAuNjI1IC00NS42MjV0LTQ1LjYyNSAtMTEwLjYyNWwwIC0yNDcuNXEtNDUgNDAgLTEwOC4xMjUgMzguMTI1dC0xMDUuNjI1IC00NC4zNzVxLTQ2LjI1IC00Ni4yNSAtNDYuMjUgLTExMC42MjV0NDYuMjUgLTExMC42MjVsMzcwIC0zNzEuMjUgMzcxLjI1IDM3MS4yNXE0Ni4yNSA0Ni4yNSA0Ni4yNSAxMTAuNjI1dC00Ni4yNSAxMTAuNjI1cS00Mi41IDQyLjUgLTEwNi4yNSA0NC4zNzV0LTEwOC43NSAtMzguMTI1bDAgMjQ3LjVxMCA2NSAtNDUuNjI1IDExMC42MjV0LTExMC42MjUgNDUuNjI1em0tNTEuMjUgLTY1NWwwIDQ5OC43NXEwIDIxLjI1IDE1IDM2Ljg3NXQzNi4yNSAxNS42MjUgMzYuODc1IC0xNS42MjUgMTUuNjI1IC0zNi44NzVsMCAtNDk4Ljc1bDE3MS4yNSAxNzEuMjVxMTUgMTUgMzYuODc1IDE1dDM2Ljg3NSAtMTUgMTUgLTM2Ljg3NSAtMTUgLTM2Ljg3NWwtMjk3LjUgLTI5Ny41IC0yOTcuNSAyOTcuNXEtMTUgMTUgLTE1IDM2Ljg3NXQxNSAzNi44NzUgMzYuODc1IDE1IDM2Ljg3NSAtMTV6Ii8+PC9zdmc+); &:hover, &:focus, &:active{ background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4MzQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0icmdiKDQwLDEwOSwxNjgpIiBkPSJNNDE2LjI1IDEwMDFxLTY1IDAgLTExMC42MjUgLTQ1LjYyNXQtNDUuNjI1IC0xMTAuNjI1bDAgLTI0Ny41cS00NSA0MCAtMTA4LjEyNSAzOC4xMjV0LTEwNS42MjUgLTQ0LjM3NXEtNDYuMjUgLTQ2LjI1IC00Ni4yNSAtMTEwLjYyNXQ0Ni4yNSAtMTEwLjYyNWwzNzAgLTM3MS4yNSAzNzEuMjUgMzcxLjI1cTQ2LjI1IDQ2LjI1IDQ2LjI1IDExMC42MjV0LTQ2LjI1IDExMC42MjVxLTQyLjUgNDIuNSAtMTA2LjI1IDQ0LjM3NXQtMTA4Ljc1IC0zOC4xMjVsMCAyNDcuNXEwIDY1IC00NS42MjUgMTEwLjYyNXQtMTEwLjYyNSA0NS42MjV6bS01MS4yNSAtNjU1bDAgNDk4Ljc1cTAgMjEuMjUgMTUgMzYuODc1dDM2LjI1IDE1LjYyNSAzNi44NzUgLTE1LjYyNSAxNS42MjUgLTM2Ljg3NWwwIC00OTguNzVsMTcxLjI1IDE3MS4yNXExNSAxNSAzNi44NzUgMTV0MzYuODc1IC0xNSAxNSAtMzYuODc1IC0xNSAtMzYuODc1bC0yOTcuNSAtMjk3LjUgLTI5Ny41IDI5Ny41cS0xNSAxNSAtMTUgMzYuODc1dDE1IDM2Ljg3NSAzNi44NzUgMTUgMzYuODc1IC0xNXoiLz48L3N2Zz4=); @@ -131,7 +129,7 @@ nav#dokuwiki__pagetools{ } } &.export_pdf{ - background-size: .9rem auto; + background-size: @font-size-default auto; background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4NTcuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSJyZ2IoMTA1LDEwNSwxMDUpIiBkPSJNODE5LjIgMjEyLjFxMTUuNiAxNS42IDI2LjggNDIuNHQxMS4xIDQ5LjF2NjQyLjhxMCAyMi40IC0xNS42IDM4dC0zNy45IDE1LjZoLTc1MHEtMjIuMyAwIC0zOCAtMTUuNlQwIDk0Ni40VjUzLjZxMCAtMjIuNCAxNS42IC0zOFQ1My42IDBoNTAwcTIyLjMgMCA0OS4xIDExLjJ0NDIuNCAyNi43ek01NzEuNCA3NS45djIwOS44aDIwOS45UTc3NS43IDI2OS41IDc2OSAyNjIuOEw1OTQuMyA4OC4ycS02LjcgLTYuNyAtMjIuOSAtMTIuM3ptMjE0LjMgODUyLjdWMzU3LjFINTUzLjZxLTIyLjMgMCAtMzggLTE1LjZUNTAwIDMwMy42VjcxLjRINzEuNHY4NTcuMmg3MTQuM3pNNDk4LjkgNTk3LjdxMTguNCAxNC41IDQ2LjkgMzEuMlE1NzguNyA2MjUgNjExIDYyNXE4Mi4xIDAgOTguOCAyNy4zIDkgMTIuMyAxLjEgMjkuMSAwIC41IC0uNSAxLjFsLTEuMSAxLjF2LjZxLTMuNCAyMS4yIC0zOS43IDIxLjIgLTI2LjcgMCAtNjQuMSAtMTEuMnQtNzIuNiAtMjkuNlE0MDkuNiA2NzggMzE0LjIgNzEwLjkgMjI4LjggODU3LjEgMTc5LjEgODU3LjFxLTguMyAwIC0xNS42IC0zLjlsLTEzLjQgLTYuN3EtLjUgLS41IC0zLjMgLTIuOCAtNS42IC01LjUgLTMuNCAtMjAgNSAtMjIuNCAzMS4zIC01MS4xdDczLjYgLTUzLjlxNy44IC01IDEyLjkgMy40IDEuMSAxLjEgMS4xIDIuMiAyOSAtNDcuNCA1OS43IC0xMDkuOSAzNy45IC03NS45IDU4IC0xNDYuMiAtMTMuNCAtNDUuOCAtMTcgLTg5dDMuNiAtNzEuMnE2LjIgLTIyLjMgMjMuNSAtMjIuM2gxMi4ycTEyLjkgMCAxOS42IDguNCAxMCAxMS43IDUgMzcuOSAtMS4xIDMuNCAtMi4yIDQuNSAuNSAxLjcgLjUgNC41djE2LjdxLTEuMSA2OC42IC03LjggMTA3LjEgMzAuNyA5MS42IDgxLjUgMTMyLjl6TTE3Ny41IDgyN3EyOSAtMTMuNCA3Ni40IC04OC4yIC0yOC41IDIyLjQgLTQ4LjggNDYuOVQxNzcuNSA4Mjd6TTM5OS42IDMxMy42cS04LjQgMjMuNSAtMS4yIDczLjcgLjYgLTMuOSAzLjkgLTI0LjYgMCAtMS43IDQgLTI0IC41IC0yLjIgMi4yIC00LjQgLS42IC0uNiAtLjYgLTEuMiAtLjUgLTEuMSAtLjUgLTEuNiAtLjYgLTEyLjMgLTcuMyAtMjAuMSAwIC41IC0uNSAxLjF2MS4xem0tNjkuMiAzNjguOXE3NS4zIC0zMC4yIDE1OC40IC00NS4yIC0xLjEgLS42IC03LjIgLTUuM3QtOC45IC03LjZxLTQyLjUgLTM3LjMgLTcwLjkgLTk4LjIgLTE1LjEgNDggLTQ2LjMgMTEwIC0xNi44IDMxLjIgLTI1LjEgNDYuM3ptMzYwLjQgLTlxLTEzLjMgLTEzLjMgLTc4LjEgLTEzLjMgNDIuNCAxNS42IDY5LjIgMTUuNiA3LjggMCAxMC4xIC0uNiAwIC0uNSAtMS4yIC0xLjd6Ii8+PC9zdmc+); &:hover, &:focus, &:active{ background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4NTcuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSJyZ2IoNDAsMTA5LDE2OCkiIGQ9Ik04MTkuMiAyMTIuMXExNS42IDE1LjYgMjYuOCA0Mi40dDExLjEgNDkuMXY2NDIuOHEwIDIyLjQgLTE1LjYgMzh0LTM3LjkgMTUuNmgtNzUwcS0yMi4zIDAgLTM4IC0xNS42VDAgOTQ2LjRWNTMuNnEwIC0yMi40IDE1LjYgLTM4VDUzLjYgMGg1MDBxMjIuMyAwIDQ5LjEgMTEuMnQ0Mi40IDI2Ljd6TTU3MS40IDc1Ljl2MjA5LjhoMjA5LjlRNzc1LjcgMjY5LjUgNzY5IDI2Mi44TDU5NC4zIDg4LjJxLTYuNyAtNi43IC0yMi45IC0xMi4zem0yMTQuMyA4NTIuN1YzNTcuMUg1NTMuNnEtMjIuMyAwIC0zOCAtMTUuNlQ1MDAgMzAzLjZWNzEuNEg3MS40djg1Ny4yaDcxNC4zek00OTguOSA1OTcuN3ExOC40IDE0LjUgNDYuOSAzMS4yUTU3OC43IDYyNSA2MTEgNjI1cTgyLjEgMCA5OC44IDI3LjMgOSAxMi4zIDEuMSAyOS4xIDAgLjUgLS41IDEuMWwtMS4xIDEuMXYuNnEtMy40IDIxLjIgLTM5LjcgMjEuMiAtMjYuNyAwIC02NC4xIC0xMS4ydC03Mi42IC0yOS42UTQwOS42IDY3OCAzMTQuMiA3MTAuOSAyMjguOCA4NTcuMSAxNzkuMSA4NTcuMXEtOC4zIDAgLTE1LjYgLTMuOWwtMTMuNCAtNi43cS0uNSAtLjUgLTMuMyAtMi44IC01LjYgLTUuNSAtMy40IC0yMCA1IC0yMi40IDMxLjMgLTUxLjF0NzMuNiAtNTMuOXE3LjggLTUgMTIuOSAzLjQgMS4xIDEuMSAxLjEgMi4yIDI5IC00Ny40IDU5LjcgLTEwOS45IDM3LjkgLTc1LjkgNTggLTE0Ni4yIC0xMy40IC00NS44IC0xNyAtODl0My42IC03MS4ycTYuMiAtMjIuMyAyMy41IC0yMi4zaDEyLjJxMTIuOSAwIDE5LjYgOC40IDEwIDExLjcgNSAzNy45IC0xLjEgMy40IC0yLjIgNC41IC41IDEuNyAuNSA0LjV2MTYuN3EtMS4xIDY4LjYgLTcuOCAxMDcuMSAzMC43IDkxLjYgODEuNSAxMzIuOXpNMTc3LjUgODI3cTI5IC0xMy40IDc2LjQgLTg4LjIgLTI4LjUgMjIuNCAtNDguOCA0Ni45VDE3Ny41IDgyN3pNMzk5LjYgMzEzLjZxLTguNCAyMy41IC0xLjIgNzMuNyAuNiAtMy45IDMuOSAtMjQuNiAwIC0xLjcgNCAtMjQgLjUgLTIuMiAyLjIgLTQuNCAtLjYgLS42IC0uNiAtMS4yIC0uNSAtMS4xIC0uNSAtMS42IC0uNiAtMTIuMyAtNy4zIC0yMC4xIDAgLjUgLS41IDEuMXYxLjF6bS02OS4yIDM2OC45cTc1LjMgLTMwLjIgMTU4LjQgLTQ1LjIgLTEuMSAtLjYgLTcuMiAtNS4zdC04LjkgLTcuNnEtNDIuNSAtMzcuMyAtNzAuOSAtOTguMiAtMTUuMSA0OCAtNDYuMyAxMTAgLTE2LjggMzEuMiAtMjUuMSA0Ni4zem0zNjAuNCAtOXEtMTMuMyAtMTMuMyAtNzguMSAtMTMuMyA0Mi40IDE1LjYgNjkuMiAxNS42IDcuOCAwIDEwLjEgLS42IDAgLS41IC0xLjIgLTEuN3oiLz48L3N2Zz4=); diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 9b7dbb6..1ad7c5a 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -1,155 +1,155 @@ -/** - * This file provides the design styles for the direct / menu jump links. - * - * @author Jana Deutschlaender - */ - - -.nav-usertools { - &.has-bar { - margin-top: @height-context-bar; - padding-top: .5em; - } - - -/* + + + + + icon list + + + + + */ - ul { - float: right; - padding: 0; - margin: .2em -.2rem 0 0; - - li { - .btn-usertools-wrapper(); // uniform li - .btn-usertools-num(); - - float: right; - - > strong, - > a { - display: block; - width: auto; - min-height: 2em; - border: 1px solid @color-border; - border-radius: @border-radius; - color: @color-nav; - text-align: center; - margin: 0; - } - - &.noopentasks { - strong { - background-color: @color-site-bg; - } - - .num { - background-color: @color-border; - color: @color-nav; - } - } - - &.user { - border: 1px solid @color-border; - border-radius: @border-radius; - padding: .3em .25rem; - - bdi { - color: @color-nav; - display: inline-block; - padding-top: 1px; - } - - > bdi:first-of-type { - .fontello(); - .icon-user(); - - &::before { - float: left; - background: @color-nav; - border: 4px solid @color-nav; - border-radius: 50%; - color: #fff; - font-size: .6rem; - margin: -2px 6px -2px 0; - } - } - } // 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(); - } - } // user-task - } // li - - -/* + + + icons + + + */ - a { - .fontello(); - .hide-text-show-before(); - - cursor: pointer; - background-color: #fff; - text-decoration: none; - transition: @transition color, @transition background-color, @transition border-color; - - &:hover, - &:active, - &:focus { - background-color: @button_color; - border-color: @button_background; - //-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); - //box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); - color: @button_background; - } - - &::before { - content: "?"; - display: block; - width: 100%; - box-sizing: border-box; - font-size: 1.4em; - cursor: pointer; - margin: .2em 0 0; - } - - /* icon register new user */ - &.register { - .icon-user(); - } - - /* icon log-out */ - &.logout { - .icon-logout(); - } - - /* icon log-in */ - &.login { - .icon-login(); - } - - /* icon admin */ - &.admin { - .icon-cog(); - - &::before { - margin-top: .18rem; - } - } - } // a - } // ul -} // nav-usertools +/** + * This file provides the design styles for the direct / menu jump links. + * + * @author Jana Deutschlaender + */ + + +.nav-usertools { + &.has-bar { + margin-top: @height-context-bar; + padding-top: .5em; + } + + +/* + + + + + icon list + + + + + */ + ul { + float: right; + padding: 0; + margin: @very-small-spacing -(@very-small-spacing) 0 0; + + li { + .btn-usertools-wrapper(); // uniform li + .btn-usertools-num(); + + float: right; + + > strong, + > a { + display: block; + width: auto; + min-height: 2em; + border: 1px solid @color-border; + border-radius: @border-radius; + color: @color-nav; + text-align: center; + margin: 0; + } + + &.noopentasks { + strong { + background-color: @color-site-bg; + } + + .num { + background-color: @color-border; + color: @color-nav; + } + } + + &.user { + border: 1px solid @color-border; + border-radius: @border-radius; + padding: .3em .25rem; + + bdi { + color: @color-nav; + display: inline-block; + padding-top: 1px; + } + + > bdi:first-of-type { + .fontello(); + .icon-user(); + + &::before { + float: left; + background: @color-nav; + border: 4px solid @color-nav; + border-radius: 50%; + color: #fff; + font-size: @font-size-small; + margin: -2px 6px -2px 0; + } + } + } // 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(); + } + } // user-task + } // li + + +/* + + + icons + + + */ + a { + .fontello(); + .hide-text-show-before(); + + cursor: pointer; + background-color: #fff; + text-decoration: none; + transition: @transition color, @transition background-color, @transition border-color; + + &:hover, + &:active, + &:focus { + background-color: @button_color; + border-color: @button_background; + //-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); + //box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); + color: @button_background; + } + + &::before { + content: "?"; + display: block; + width: 100%; + box-sizing: border-box; + font-size: @font-size-default + (@font-scale-factor * 4); + cursor: pointer; + margin: .2em 0 0; + } + + /* icon register new user */ + &.register { + .icon-user(); + } + + /* icon log-out */ + &.logout { + .icon-logout(); + } + + /* icon log-in */ + &.login { + .icon-login(); + } + + /* icon admin */ + &.admin { + .icon-cog(); + + &::before { + margin-top: .18rem; + } + } + } // a + } // ul +} // nav-usertools diff --git a/css/area_sidetools.less b/css/area_sidetools.less index 63872f5..349c996 100755 --- a/css/area_sidetools.less +++ b/css/area_sidetools.less @@ -6,13 +6,13 @@ .side-tools.main-sidebar { - @icon-size: 2rem; + @icon-size: @margin-default; counter-increment: bar-counter; ul, .trace { - padding-left: (@icon-size + .5); + padding-left: (@margin-big + .5); } ul { @@ -45,7 +45,7 @@ > nav { > ul { margin: 0; - padding: 0 0 0 (@icon-size + .5); + padding: 0 0 0 (@margin-big + .5); li { list-style-type: none; @@ -66,7 +66,7 @@ height: auto; color: @color-nav; font-weight: normal; - padding: .5em 0 .5em (@icon-size + 1.1); + padding: .7em 0 .7em (@margin-big + 1.1); &[class="sr-only"] { border-bottom: solid 1px @color-border; @@ -88,7 +88,7 @@ top: 0; left: 0; height: 100%; - width: 2.5rem; + width: @margin-big; overflow: hidden; text-align: center; margin-top: auto; @@ -103,7 +103,7 @@ top: 15%; bottom: 15%; width: 1px; - left: (@icon-size + .6); + left: (@margin-big + .6); background-color: @color-border; transition: @transition background-color; } @@ -144,7 +144,7 @@ bottom: 1px; left: 0; height: 100%; - width: 2.5rem; + width: @margin-big; overflow: hidden; color: @color-nav; text-align: center; @@ -159,7 +159,7 @@ top: 15%; bottom: 15%; width: 1px; - left: (@icon-size + .5); + left: @margin-big; background-color: @color-border; transition: @transition background-color; } @@ -245,7 +245,7 @@ background-color: @color-content-bg; border: 1px solid @button_background; border-radius: @fix_border-radius; - font-size: .8rem; + font-size: @font-size-small; margin-top: .1rem; padding: .3rem .6em; @@ -295,7 +295,7 @@ @media @screen_min-xlg { .side-tools.main-sidebar { h6 { - font-size: .9rem; + font-size: @font-size-default; * { font-size: inherit; @@ -303,7 +303,7 @@ } li { - font-size: .8rem; + font-size: @font-size-small; padding: .1em 0 .1em .1rem; > * { @@ -320,11 +320,11 @@ @media @screen_max-xlg { .side-tools.main-sidebar { h6 { - font-size: 1rem; + font-size: @font-size-default; } li { - font-size: .9rem; + font-size: @font-size-small; padding: .15em 0 .15em .23rem; > * { @@ -333,7 +333,7 @@ } p { - font-size: .9rem; + font-size: @font-size-small; } } } diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 9b10bc3..6257b4e 100644 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -10,7 +10,7 @@ position: absolute; top: -1px; bottom: -1px; - left: -2rem; + left: -(@margin-default); z-index: 1; a { @@ -18,7 +18,7 @@ .flex-direction(); .justify-content(); - width: 2rem; + width: (@margin-default); height: 100%; background-color: @button_background; border: solid 1px @button_background; diff --git a/css/base.less b/css/base.less index 955cef8..13c05fb 100755 --- a/css/base.less +++ b/css/base.less @@ -43,8 +43,11 @@ @height-context-bar: 50px; @margin-small: 1rem; -@margin-default: 1.5rem; -@margin-big: 2.5rem; +@margin-default: 2rem; +@margin-big: 3.07rem; + +@small-spacing: .3rem; +@very-small-spacing: .2rem; @grid: @margin-small; @@ -54,8 +57,9 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* fonts */ -@font-size-small: .75rem; -@font-size-default: .88rem; +@font-size-very-small: .73rem; +@font-size-small: .88rem; +@font-size-default: 1rem; @font-size-big: 1.5rem; @font-size-bigger: 1.75rem; @@ -63,6 +67,17 @@ @line-height-big: 135%; @line-height-bigger: 140%; +@font-weight-bold: 800; +@font-weight-normal: 400; + +@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); /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* breakpoints */ @@ -141,7 +156,6 @@ html, body { .reset(); - font-size: 100.1%; } diff --git a/css/base_design.less b/css/base_design.less index ca52c10..075db42 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -37,7 +37,7 @@ a { padding: 0.5em 1em 0; span { - font-size: 0.875em; + font-size: @font-size-small; border: solid @ini_background_alt; border-width: 1px 1px 0; background-color: @ini_background; @@ -54,20 +54,20 @@ a { clear: both; background: @color-content-bg; color: inherit; - padding: 1rem 2rem 2rem; + padding: (@margin-default / 2) @margin-default @margin-default; // margin-bottom: .5rem; // no margin: if there is another bg-color, then there is an #fff border overflow: hidden; word-wrap: break-word; } .dokuwiki .docInfo { - font-size: 0.5rem; + font-size: @font-size-small; text-align: right; } /* license note under edit window */ .dokuwiki div.license { - font-size: 93.75%; + font-size: @font-size-small; } [dir=rtl] .dokuwiki .docInfo { @@ -111,38 +111,39 @@ h6 { } h1 { - font-size: 1.4rem; + font-size: @font-size-head1; margin: 0 0 0.444em; padding-top: 1em; } h2 { - font-size: 1.12rem; + font-size: @font-size-head2; margin: 0 0 0.666em; } h3 { - font-size: 1rem; + font-size: @font-size-head3; margin: 0 0 0.888em; } h4 { - font-size: .94rem; + font-size: @font-size-head4; margin: 0 0 1.0em; } h5 { - font-size: .88rem; + font-size: @font-size-head5; margin: 0 0 1.1428em; } h6 { - font-size: .83rem; + font-size: @font-size-head6; + font-weight: @font-weight-bold; margin: 0 0 1.333em; } p { - font-size: .88rem; + font-size: @font-size-default; line-height: 135%; a, @@ -155,7 +156,7 @@ p { label, legend, button { - font-size: .88rem; + font-size: @font-size-default; a, span, @@ -168,7 +169,7 @@ hr, figure, details, address { - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; } @@ -197,7 +198,7 @@ audio { small, .code { - font-size: .75rem; + font-size: @font-size-small; } .code { @@ -209,7 +210,7 @@ small, ul, ol { - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; padding: 0 0 0 1.5em; } @@ -231,7 +232,7 @@ dd { } dl { - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; } @@ -284,7 +285,7 @@ table { empty-cells: show; border-spacing: 0; border: 1px solid @color-border; - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; } @@ -386,7 +387,7 @@ samp, kbd { font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ - font-size: 1em; + font-size: @font-size-default; direction: ltr; text-align: left; background-color: @color-site-bg; @@ -401,7 +402,7 @@ pre { border: 1px solid @color-border; border-radius: @fix_border-radius; box-shadow: inset 0 0 .5em @color-border; - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; padding: .7em 1em; } @@ -409,7 +410,7 @@ pre { blockquote { border: solid @color-border; border-width: 0 0 0 .25em; - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; padding: 0 .5em; } @@ -453,7 +454,7 @@ form { } fieldset { - font-size: .88rem; + font-size: @font-size-default; line-height: 140%; border: 1px solid @ini_text_alt; padding: .7rem 1rem; @@ -498,7 +499,7 @@ select { } textarea.edit { - font-size: .88em; + font-size: @font-size-default; } optgroup { diff --git a/css/base_mixins.less b/css/base_mixins.less index 456ff9d..83a12bd 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -148,12 +148,12 @@ min-width: @elem; box-sizing: border-box; color: @color-nav; - font-size: .8rem; + font-size: @font-size-small; padding: 0; - margin: 0 .2rem; + margin: 0 @very-small-spacing; * { - font-size: .8rem; + font-size: @font-size-small; } } @@ -165,11 +165,11 @@ background-color: @button_background; border-radius: 2px; color: @button_color; - font-size: .6rem; + font-size: @font-size-very-small; font-weight: 400; text-align: center; line-height: 1; - padding: .2em .2rem .1em; + padding: @very-small-spacing @very-small-spacing .1em; transition: @transition color, @transition background-color; } @@ -190,8 +190,8 @@ .hide-text-show-before(); color: inherit; - font-size: 1rem; - margin-top: .2rem; + font-size: @font-size-default; + margin-top: @very-small-spacing; } diff --git a/css/base_structure.less b/css/base_structure.less index 0b99418..4465db6 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -25,25 +25,34 @@ @media @screen_min-sm { .make-grid(sm); + html { + font-size: 100%; //16px + } } @media @screen_min-md { .make-grid(md); + html { + font-size: 81.25%; //13px + } } @media @screen_min-lg { .make-grid(lg); + html { + font-size: 87.5%; //14px + } } @media @screen_min-xlg { html { - font-size: 120%; + font-size: 93.75%; //15px } } @media @screen_min-xxlg { html { - //font-size: 135%; + font-size: 106.25%; //17px } } @@ -173,7 +182,7 @@ &.showSidebar{ .content { .row > .col-xs-12 { - margin-left: 2.5rem; + margin-left: @margin-big; } } } @@ -192,7 +201,7 @@ @media @screen_max-md { .container { - margin: 0 2.5rem 0 1.25rem; + margin: 0 @margin-big 0 1.25rem; } #dokuwiki__usertools { diff --git a/css/plugins/bureaucracy.less b/css/plugins/bureaucracy.less index 6eabdc9..3b705c8 100755 --- a/css/plugins/bureaucracy.less +++ b/css/plugins/bureaucracy.less @@ -1,129 +1,129 @@ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* all media */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - -.dokuwiki form.bureaucracy__plugin { - fieldset { - width: 100%; - max-width: 800px; - box-sizing: border-box; - border: 0 none; - text-align: center; - margin-left: 0; - margin-bottom: (@grid * 2); - padding: @grid 0 0; - - > *:not(button) { - text-align: left; - } - } - - legend { - font-size: 1.12em; - font-weight: bold; - text-align: left; - } - - label { - clear: both; - padding-top: (@grid / 2); - - &::after { - content: ''; - clear: both; - } - - sup { - float: right; - font-size: 1em; - } - - input, - select { - float: left; - width: 50%; - min-height: 2em; - text-align: left; - padding: .1em .2em; - } - - input[type="checkbox"] { - width: 1.5rem; - height: 1.5rem; - background-image: none; - } - - span { - float: left; - width: 50%; - text-align: right; - line-height: @line-height-default; - padding-top: .2em; - padding-right: @grid; - - &:not([class]) { - font-weight: bold; - margin-top: .5em; - - + input, - + select { - margin-top: .3em; - } - - // checkboxes - + input + input { - margin-top: .3em; - } - } - - &.label { - text-align: right; - padding-top: .5em; - } - - &.input { - width: 49%; - text-align: left; - padding-left: 0; - } - } // span - } // label - - button[type="submit"] { - margin-top: (@grid * 2); - } -} - - - - -#icke__page .content ul.autocompletion {} - -ul.autocompletion li {} - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* min-width: 1440px */ - -@media @screen_min-xlg { - .dokuwiki form.bureaucracy__plugin { - p { - font-size: .9rem; - } - } -} - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1439px */ - -@media @screen_max-xlg { - .dokuwiki form.bureaucracy__plugin { - p, - label, - button[type="submit"] { - font-size: 1rem; - } - } -} - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* all media */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + +.dokuwiki form.bureaucracy__plugin { + fieldset { + width: 100%; + max-width: 800px; + box-sizing: border-box; + border: 0 none; + text-align: center; + margin-left: 0; + margin-bottom: (@grid * 2); + padding: @grid 0 0; + + > *:not(button) { + text-align: left; + } + } + + legend { + font-size: @font-size-small; + font-weight: bold; + text-align: left; + } + + label { + clear: both; + padding-top: (@grid / 2); + + &::after { + content: ''; + clear: both; + } + + sup { + float: right; + font-size: 1em; + } + + input, + select { + float: left; + width: 50%; + min-height: 2em; + text-align: left; + padding: .1em .2em; + } + + input[type="checkbox"] { + width: 1.5rem; + height: 1.5rem; + background-image: none; + } + + span { + float: left; + width: 50%; + text-align: right; + line-height: @line-height-default; + padding-top: .2em; + padding-right: @grid; + + &:not([class]) { + font-weight: bold; + margin-top: .5em; + + + input, + + select { + margin-top: .3em; + } + + // checkboxes + + input + input { + margin-top: .3em; + } + } + + &.label { + text-align: right; + padding-top: .5em; + } + + &.input { + width: 49%; + text-align: left; + padding-left: 0; + } + } // span + } // label + + button[type="submit"] { + margin-top: (@grid * 2); + } +} + + + + +#icke__page .content ul.autocompletion {} + +ul.autocompletion li {} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* min-width: 1440px */ + +@media @screen_min-xlg { + .dokuwiki form.bureaucracy__plugin { + p { + font-size: @font-size-default; + } + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1439px */ + +@media @screen_max-xlg { + .dokuwiki form.bureaucracy__plugin { + p, + label, + button[type="submit"] { + font-size: @font-size-default; + } + } +} + diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 9f2a528..b16bd6e 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -1,149 +1,149 @@ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* all media */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - - -/* + + + + + + + + + + + + + + + + + + + + + + + */ -/* magic matcher bar with form on top of page */ - -#dokuwiki_magic-matcher { - position: fixed; - top: 0; - left: 0; - width: 100%; - - #mm__issueselect_chosen { - max-width: 50%; - } - - button[name="toggleSuggestions"] { - position: absolute; - right: 0; - top: 0; - border: 0; - border-bottom: 1px solid @color-border; - border-left: 1px solid @color-border; - color: @color-nav; - background: #fff; - border-radius: 0; - border-bottom-left-radius: 5px; - - &:hover, - &:focus, - &:active { - border-color: @button_background; - color: @button_background; - } - } - - #magicmatcher__context { - position: relative; - z-index: 100; - width: 100%; - min-height: @height-context-bar; - box-sizing: border-box; - box-shadow: __box_shadow__; - background-color: __nav_direct_background__; - border-radius: 0 0 __default_border_radius__ __default_border_radius__; - font-size: .88rem; - padding: .8em 1em .5em; - margin-bottom: 0; - - .chosen-container-single, - .chosen-container-single *, - #mm_issue_loading, - .mm__status, - .toggleSuggestions { - font-size: .88rem; - } - - .chosen-container-single { - .chosen-single span { - line-height: @line-height-bigger; - } - } - - @media @screen_max-md { - padding-top: 1.8rem; - - .chosen-container { - display: block; - min-width: 100%; - max-width: 100%; - margin-bottom: .5rem; - } - } - } -} - -/* + + + + + in content + + + + + */ -a.jiralink { - font-size: @font-size-default; - - img { - float: left; - display: inline-block; - margin-top: .13em; - margin-right: 3px; - } - - span.mm__status { - display: inline-block; - font-size: @font-size-default; - margin-left: 5px; - padding: 1px 4px; - } -} - - -/* + + + + + no js version + + + + + */ -.no-js { - #dokuwiki_magic-matcher { - display: none; - } -} - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1023px */ - -@media @screen_max-lg { - #dokuwiki_magic-matcher { - #magicmatcher__context { - .chosen-container-single { - width: 20% !important; - - + select + .chosen-container-single { - width: 58% !important; - } - } - } - } -} - -@media @screen_max-md { - #dokuwiki_magic-matcher { - position: relative; - - .container { - margin: .8rem 0 -5px; - } - - #magicmatcher__context { - border-radius: 0; - } - } -} - - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* print */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - -@media print { - #dokuwiki_magic-matcher { - display: none; - } -} - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* all media */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + + +/* + + + + + + + + + + + + + + + + + + + + + + + */ +/* magic matcher bar with form on top of page */ + +#dokuwiki_magic-matcher { + position: fixed; + top: 0; + left: 0; + width: 100%; + + #mm__issueselect_chosen { + max-width: 50%; + } + + button[name="toggleSuggestions"] { + position: absolute; + right: 0; + top: 0; + border: 0; + border-bottom: 1px solid @color-border; + border-left: 1px solid @color-border; + color: @color-nav; + background: #fff; + border-radius: 0; + border-bottom-left-radius: 5px; + + &:hover, + &:focus, + &:active { + border-color: @button_background; + color: @button_background; + } + } + + #magicmatcher__context { + position: relative; + z-index: 100; + width: 100%; + min-height: @height-context-bar; + box-sizing: border-box; + box-shadow: __box_shadow__; + background-color: __nav_direct_background__; + border-radius: 0 0 __default_border_radius__ __default_border_radius__; + font-size: @font-size-default; + padding: .8em 1em .5em; + margin-bottom: 0; + + .chosen-container-single, + .chosen-container-single *, + #mm_issue_loading, + .mm__status, + .toggleSuggestions { + font-size: @font-size-default; + } + + .chosen-container-single { + .chosen-single span { + line-height: @line-height-bigger; + } + } + + @media @screen_max-md { + padding-top: @margin-default; + + .chosen-container { + display: block; + min-width: 100%; + max-width: 100%; + margin-bottom: .5rem; + } + } + } +} + +/* + + + + + in content + + + + + */ +a.jiralink { + font-size: @font-size-default; + + img { + float: left; + display: inline-block; + margin-top: .13em; + margin-right: 3px; + } + + span.mm__status { + display: inline-block; + font-size: @font-size-default; + margin-left: 5px; + padding: 1px 4px; + } +} + + +/* + + + + + no js version + + + + + */ +.no-js { + #dokuwiki_magic-matcher { + display: none; + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1023px */ + +@media @screen_max-lg { + #dokuwiki_magic-matcher { + #magicmatcher__context { + .chosen-container-single { + width: 20% !important; + + + select + .chosen-container-single { + width: 58% !important; + } + } + } + } +} + +@media @screen_max-md { + #dokuwiki_magic-matcher { + position: relative; + + .container { + margin: .8rem 0 -5px; + } + + #magicmatcher__context { + border-radius: 0; + } + } +} + + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* print */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + +@media print { + #dokuwiki_magic-matcher { + display: none; + } +} + diff --git a/css/plugins/move.less b/css/plugins/move.less index 5f6224a..885f1b4 100644 --- a/css/plugins/move.less +++ b/css/plugins/move.less @@ -1,6 +1,6 @@ #dokuwiki__site > .plugin_move_dialog{ - font-size: .88rem; + font-size: @font-size-default; *{ - font-size: .88rem; + font-size: @font-size-default; } } diff --git a/css/plugins/popupviewer.less b/css/plugins/popupviewer.less index a5638dc..865ad22 100755 --- a/css/plugins/popupviewer.less +++ b/css/plugins/popupviewer.less @@ -4,15 +4,15 @@ > .controls > .content{ padding: 1.5rem 1rem 1rem; td, th{ - font-size: .88rem; + font-size: @font-size-default; line-height: 125%; a{ - font-size: .88rem; + font-size: @font-size-default; line-height: 125%; } } .li, li{ - font-size: .88rem; + font-size: @font-size-default; line-height: 125%; } } diff --git a/css/plugins/qc.less b/css/plugins/qc.less new file mode 100644 index 0000000..dff5a32 --- /dev/null +++ b/css/plugins/qc.less @@ -0,0 +1,6 @@ +#plugin__qc__wrapper{ + font-size: @font-size-default; + p{ + font-size: @font-size-default; + } +} diff --git a/css/plugins/struct.less b/css/plugins/struct.less index 783e6d4..e0611d1 100755 --- a/css/plugins/struct.less +++ b/css/plugins/struct.less @@ -1,24 +1,27 @@ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* all media */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - -#dokuwiki__content { - .structaggregation { - @link-height: 1.5rem; - - position: relative; - padding-bottom: @link-height; - margin-bottom: @grid; - - .table { - margin-bottom: 0; - } - - > a { - position: absolute; - bottom: 0; - height: @link-height; - margin-bottom: 0; - } - } -} +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* all media */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + +#dokuwiki__content { + .structaggregation { + @link-height: 1.5rem; + + position: relative; + padding-bottom: @link-height; + margin-bottom: @grid; + + .table { + margin-bottom: 0; + } + + > a { + position: absolute; + bottom: 0; + height: @link-height; + margin-bottom: 0; + } + } + #plugin__struct_output{ + margin-right: 0; + } +} diff --git a/css/template_admin.less b/css/template_admin.less index aa2391e..5072f2b 100644 --- a/css/template_admin.less +++ b/css/template_admin.less @@ -1,14 +1,14 @@ .do-admin{ #admin__version{ - font-size: .88rem; + font-size: @font-size-default; } .main-content ul{ > li{ - font-size: .88rem; + font-size: @font-size-default; div.li{ - font-size: .88rem; + font-size: @font-size-default; a{ - font-size: .88rem; + font-size: @font-size-default; line-height: 125%; cursor: pointer; } diff --git a/style.ini b/style.ini index 4a5f687..3c34ba5 100755 --- a/style.ini +++ b/style.ini @@ -84,6 +84,7 @@ css/template_admin.less = all css/plugins/popupviewer.less = all css/plugins/magic-matcher.less = all css/plugins/do_tasks.less = all +css/plugins/qc.less = all css/plugins/struct.less = all css/plugins/bureaucracy.less = all diff --git a/tpl/nav-meta-box.php b/tpl/nav-meta-box.php index 7df5b72..312f06d 100755 --- a/tpl/nav-meta-box.php +++ b/tpl/nav-meta-box.php @@ -5,7 +5,7 @@
    -
    • +
    • diff --git a/tpl/nav-page-tools.php b/tpl/nav-page-tools.php index 177b3e7..fbf4f0c 100755 --- a/tpl/nav-page-tools.php +++ b/tpl/nav-page-tools.php @@ -1,20 +1,22 @@ - - - - - + + + + + diff --git a/tpl/nav-sitetools.php b/tpl/nav-sitetools.php index 3e929f6..cb57c7e 100755 --- a/tpl/nav-sitetools.php +++ b/tpl/nav-sitetools.php @@ -1,14 +1,14 @@ - - - - + + + +