diff --git a/css/area_footer.less b/css/area_footer.less index fac3ee7..a217bf0 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -1,72 +1,87 @@ -/** - * This file provides the design styles for the page footer - * - * @author Jana Deutschlaender - */ - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* no print */ - -@media screen { - .page-footer { - background: @background_page-header; - border-top: 1px solid @color-border; - font-size: @font-size-default; - padding: @margin-small (@margin-big - .5); - text-align: right; - - bdi { - font-weight: bold; - } - } - - #dokuwiki__footer { - .main-footer { - position: relative; - box-sizing: border-box; - } - - p { - font-size: @font-size-default; - margin: 0; - } - } -} - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* min-width: 1024px */ - -@media @screen_min-md { - #dokuwiki__footer { - .col-xs-12 { - float: right; - width: 100%; - } - - .main-footer { - padding: @margin-default 0; - } - } - - .showSidebar { - #dokuwiki__footer { - .col-xs-12 { - width: 73%; - } - } - } -} - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1023px */ - -@media @screen_max-md { - #dokuwiki__footer { - .main-footer { - padding: @margin-default (@margin-big - .5); - } - } -} +/** + * This file provides the design styles for the page footer + * + * @author Jana Deutschlaender + */ + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* no print */ + +@media screen { + .page-footer { + background: @background_page-header; + border-top: 1px solid @color-border; + font-size: @font-size-default; + padding: @margin-small (@margin-big - .5); + text-align: right; + + bdi { + font-weight: bold; + } + } + + #dokuwiki__footer { + .main-footer { + position: relative; + box-sizing: border-box; + } + + p { + font-size: @font-size-default; + margin: 0; + } + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* min-width: 1024px */ + +@media @screen_min-md { + #dokuwiki__footer { + .col-xs-12 { + float: right; + width: 100%; + } + + .main-footer { + padding: @margin-default 0; + } + } + + .showSidebar { + #dokuwiki__footer { + .col-xs-12 { + width: 73%; + } + } + } + .wide-content { + #dokuwiki__footer { + .col-xs-12 { + width: auto; + float: none; + } + } + &.showSidebar{ + #dokuwiki__footer { + .col-xs-12 { + margin-left: 2.5rem; + } + } + } + } +} + + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1023px */ + +@media @screen_max-md { + #dokuwiki__footer { + .main-footer { + padding: @margin-default (@margin-big - .5); + } + } +} diff --git a/css/area_msg.less b/css/area_msg.less new file mode 100644 index 0000000..17a7430 --- /dev/null +++ b/css/area_msg.less @@ -0,0 +1,11 @@ +.msg-area{ + clear: both; + padding-top: 1.6rem; + div{ + font-size: .88rem; + line-height: 135%; + } + &:empty{ + display: none; + } +} diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 8172d05..b8d70a7 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -166,7 +166,7 @@ } } } - + a{ + + .msg-area + a{ clear: right; margin-top: 20px; } diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index 65f0348..0f063fa 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -35,7 +35,7 @@ nav#dokuwiki__pagetools{ } a{ font-size: .8rem; - &.source, &.revs, &.backlink, &.plugin_bookcreator_addtobook, &.export_pdf, &.top, &.edit{ + &.source, &.revs, &.backlink, &.plugin_bookcreator_addtobook, &.export_pdf, &.top, &.edit, &.show{ opacity: .6; color: @color-nav; *{ @@ -106,6 +106,12 @@ nav#dokuwiki__pagetools{ background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4NTcuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBmaWxsPSJyZ2IoNDAsMTA5LDE2OCkiIGQ9Ik04MTkuMiAyMTIuMXExNS42IDE1LjYgMjYuOCA0Mi40dDExLjEgNDkuMXY2NDIuOHEwIDIyLjQgLTE1LjYgMzh0LTM3LjkgMTUuNmgtNzUwcS0yMi4zIDAgLTM4IC0xNS42VDAgOTQ2LjRWNTMuNnEwIC0yMi40IDE1LjYgLTM4VDUzLjYgMGg1MDBxMjIuMyAwIDQ5LjEgMTEuMnQ0Mi40IDI2Ljd6TTU3MS40IDc1Ljl2MjA5LjhoMjA5LjlRNzc1LjcgMjY5LjUgNzY5IDI2Mi44TDU5NC4zIDg4LjJxLTYuNyAtNi43IC0yMi45IC0xMi4zem0yMTQuMyA4NTIuN1YzNTcuMUg1NTMuNnEtMjIuMyAwIC0zOCAtMTUuNlQ1MDAgMzAzLjZWNzEuNEg3MS40djg1Ny4yaDcxNC4zek00OTguOSA1OTcuN3ExOC40IDE0LjUgNDYuOSAzMS4yUTU3OC43IDYyNSA2MTEgNjI1cTgyLjEgMCA5OC44IDI3LjMgOSAxMi4zIDEuMSAyOS4xIDAgLjUgLS41IDEuMWwtMS4xIDEuMXYuNnEtMy40IDIxLjIgLTM5LjcgMjEuMiAtMjYuNyAwIC02NC4xIC0xMS4ydC03Mi42IC0yOS42UTQwOS42IDY3OCAzMTQuMiA3MTAuOSAyMjguOCA4NTcuMSAxNzkuMSA4NTcuMXEtOC4zIDAgLTE1LjYgLTMuOWwtMTMuNCAtNi43cS0uNSAtLjUgLTMuMyAtMi44IC01LjYgLTUuNSAtMy40IC0yMCA1IC0yMi40IDMxLjMgLTUxLjF0NzMuNiAtNTMuOXE3LjggLTUgMTIuOSAzLjQgMS4xIDEuMSAxLjEgMi4yIDI5IC00Ny40IDU5LjcgLTEwOS45IDM3LjkgLTc1LjkgNTggLTE0Ni4yIC0xMy40IC00NS44IC0xNyAtODl0My42IC03MS4ycTYuMiAtMjIuMyAyMy41IC0yMi4zaDEyLjJxMTIuOSAwIDE5LjYgOC40IDEwIDExLjcgNSAzNy45IC0xLjEgMy40IC0yLjIgNC41IC41IDEuNyAuNSA0LjV2MTYuN3EtMS4xIDY4LjYgLTcuOCAxMDcuMSAzMC43IDkxLjYgODEuNSAxMzIuOXpNMTc3LjUgODI3cTI5IC0xMy40IDc2LjQgLTg4LjIgLTI4LjUgMjIuNCAtNDguOCA0Ni45VDE3Ny41IDgyN3pNMzk5LjYgMzEzLjZxLTguNCAyMy41IC0xLjIgNzMuNyAuNiAtMy45IDMuOSAtMjQuNiAwIC0xLjcgNCAtMjQgLjUgLTIuMiAyLjIgLTQuNCAtLjYgLS42IC0uNiAtMS4yIC0uNSAtMS4xIC0uNSAtMS42IC0uNiAtMTIuMyAtNy4zIC0yMC4xIDAgLjUgLS41IDEuMXYxLjF6bS02OS4yIDM2OC45cTc1LjMgLTMwLjIgMTU4LjQgLTQ1LjIgLTEuMSAtLjYgLTcuMiAtNS4zdC04LjkgLTcuNnEtNDIuNSAtMzcuMyAtNzAuOSAtOTguMiAtMTUuMSA0OCAtNDYuMyAxMTAgLTE2LjggMzEuMiAtMjUuMSA0Ni4zem0zNjAuNCAtOXEtMTMuMyAtMTMuMyAtNzguMSAtMTMuMyA0Mi40IDE1LjYgNjkuMiAxNS42IDcuOCAwIDEwLjEgLS42IDAgLS41IC0xLjIgLTEuN3oiLz48L3N2Zz4=); } } + &.show{ + background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4MzAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0icmdiKDEwNSwxMDUsMTA1KSIgZD0iTTc5NSAxMTkuMDY5YzUwIDQ2LjI1IDQzLjc1IDExNy41IC0zLjc1IDE2NWwtNDYuMjUgNDYuMjVzMzUgLTUzLjc1IC0zNy41IC0xMjMuNzVjLTYzLjc1IC02My43NSAtMTIzLjc1IC0zNi4yNSAtMTIzLjc1IC0zNi4yNWw0OC43NSAtNDguNzVjNDMuNzUgLTQ1IDEyMCAtNDUgMTYyLjUgLTIuNXptLTg4Ljc1IDI1MGwtNDkyLjUgNDkyLjUgLTIxMCA1MS4yNSAtMy43NSAtMy43NSA1NSAtMjEwIDQ5Mi41IC00OTBjOC43NSAtMi41IDMwIC04Ljc1IDYwIC0yLjVsLTUyMi41IDUyMi41IC0xNSA1NSA2MCA2MCA1Ni4yNSAtMTUgMjUgLTIzLjc1IDIuNSAtNTYuMjUgLTQwIC00MCA0NzguNzUgLTQ3OC43NWM3LjUgNi4yNSA3LjUgNi4yNSAxNSAxNSA3MS4yNSA3MCAzOC43NSAxMjMuNzUgMzguNzUgMTIzLjc1eiIvPjwvc3ZnPg==); + &:hover, &:focus, &:active{ + background-image: url(data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjEwMDAiIHdpZHRoPSI4MzAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZmlsbD0icmdiKDQwLDEwOSwxNjgpIiBkPSJNNzk1IDExOS4wNjljNTAgNDYuMjUgNDMuNzUgMTE3LjUgLTMuNzUgMTY1bC00Ni4yNSA0Ni4yNXMzNSAtNTMuNzUgLTM3LjUgLTEyMy43NWMtNjMuNzUgLTYzLjc1IC0xMjMuNzUgLTM2LjI1IC0xMjMuNzUgLTM2LjI1bDQ4Ljc1IC00OC43NWM0My43NSAtNDUgMTIwIC00NSAxNjIuNSAtMi41em0tODguNzUgMjUwbC00OTIuNSA0OTIuNSAtMjEwIDUxLjI1IC0zLjc1IC0zLjc1IDU1IC0yMTAgNDkyLjUgLTQ5MGM4Ljc1IC0yLjUgMzAgLTguNzUgNjAgLTIuNWwtNTIyLjUgNTIyLjUgLTE1IDU1IDYwIDYwIDU2LjI1IC0xNSAyNSAtMjMuNzUgMi41IC01Ni4yNSAtNDAgLTQwIDQ3OC43NSAtNDc4Ljc1YzcuNSA2LjI1IDcuNSA2LjI1IDE1IDE1IDcxLjI1IDcwIDM4Ljc1IDEyMy43NSAzOC43NSAxMjMuNzV6Ii8+PC9zdmc+); + } + } } } @@ -117,7 +123,7 @@ nav#dokuwiki__pagetools{ box-shadow: @box-shadow-offset; li{ a{ - &.source, &.revs, &.backlink, &.plugin_bookcreator_addtobook, &.export_pdf, &.top{ + &.source, &.revs, &.backlink, &.plugin_bookcreator_addtobook, &.export_pdf, &.top, &.show { color: @color-nav; background-position: 95% center; opacity: .8; diff --git a/css/base_fonts.less b/css/base_fonts.less index fb460d3..8d867af 100755 --- a/css/base_fonts.less +++ b/css/base_fonts.less @@ -1,286 +1,286 @@ -/** - * This file provides styles for web fonts and icon fonts - * - * @author Jana Deutschlaender - */ - -/* web font */ -.setLocalFontFace('roboto',300,'Roboto Light','Roboto-Light','roboto-light'); /* roboto light */ -.setLocalFontFace('roboto',400,'Roboto','Roboto-Regular','roboto-regular'); /* roboto regular */ -.setLocalFontFace('roboto',500,'Roboto Medium','Roboto-Medium','roboto-medium'); /* roboto medium */ -.setLocalFontFace('roboto',700,'Roboto Bold','Roboto-Bold','roboto-bold'); /* roboto bold */ - -.setLocalFontFace('roboto',400,'Roboto Condensed','RobotoCondensed-Regular','roboto-condensed'); /* roboto condensed */ -.setLocalFontFace('roboto',700,'Roboto Condensed Bold','RobotoCondensed-Bold','roboto-boldcondensed'); /* roboto condensed */ - -/* icon font */ -.setIconFontFace('fontello','fontello'); - -.icon, [class^="icon-"], [class*=" icon-"]{ - .fontello(); -} - -/* custom icon font */ -.icon-user{ - &::before { - content: '\e800'; - } -} -.icon-logout{ - &::before { - content: '\e801'; - } -} - -.icon-login{ - &::before { - content: '\e802'; - } -} - -.icon-clipboard{ - &::before { - content: '\e803'; - } -} - -.icon-emo-happy { - &::before { - content: '\e804'; - } -} - -.icon-emo-wink { - &::before { - content: '\e805'; - } -} - -.icon-emo-unhappy { - &::before { - content: '\e806'; - } -} - -.icon-emo-sleep{ - &::before { - content: '\e807'; - } -} - -.icon-emo-thumbsup { - &::before { - content: '\e808'; - } -} - -.icon-clock{ - &::before { - content: '\e809'; - } -} - -.icon-link{ - &::before { - content: '\e80a'; - } -} -.icon-link-after{ - &::after { - content: '\e80a'; - } -} - -.icon-bell{ - &::before { - content: '\e80b'; - } -} - -.icon-emo-grin{ - :before { - content: '\e80c'; - } -} - -.icon-emo-angry{ - &::before { - content: '\e80d'; - } -} - -.icon-mail{ - &::before { - content: '\e80e'; - } -} - -.icon-emo-cry { - &::before { - content: '\e80f'; - } -} - -.icon-cloud{ - &::before { - content: '\e810'; - } -} - -.icon-emo-squint{ - &::before { - content: '\e811'; - } -} - -.icon-emo-laugh{ - &::before { - content: '\e812'; - } -} - -.icon-emo-wink2{ - &::before { - content: '\e813'; - } -} - -.icon-cloud-1{ - &::before { - content: '\e814'; - } -} - -.icon-home-outline{ - &::before { - content: '\e815'; - } -} - -.icon-home() { - &::before { - content: '\e816'; - } -} - -.icon-search() { - &::before { - content: '\e81f'; - } -} - -.icon-puzzle-1{ - &::before { - content: '\e817'; - } -} - -.icon-cog-alt{ - &::before { - content: '\e818'; - } -} - -.icon-cog{ - &::before { - content: '\e819'; - } -} - -.icon-help{ - &::before { - content: '\e81a'; - } -} - -.icon-bookmark-empty{ - &::before { - content: '\f097'; - } -} - -.icon-menu{ - &::before { - content: '\f0c9'; - } -} - -.icon-sitemap{ - &::before { - content: '\f0e8'; - } -} - -.icon-doc-text{ - &::before { - content: '\f0f6'; - } -} - -.icon-doc-text-after{ - &::after { - content: '\f0f6'; - } -} - -.icon-smile{ - &::before { - content: '\f118'; - } -} - -.icon-frown{ - &::before { - content: '\f119'; - } -} - -.icon-meh { - &::before { - content: '\f11a'; - } -} - -.icon-puzzle { - &::before { - content: '\f12e'; - } -} -.icon-puzzle-after { - &::after { - content: '\f12e'; - } -} - -.icon-file-pdf{ - &::before { - content: '\f1c1'; - } -} - -.icon-doc-new{ - &::before { - content: '\e81d'; - } -} - -.icon-book-open{ - &::before { - content: '\e81c'; - } -} - -.icon-plus{ - &::before { - content: '\e81e'; - } -} - -.icon-doc{ - &::before { - content: '\e81b'; - } -} - - - +/** + * This file provides styles for web fonts and icon fonts + * + * @author Jana Deutschlaender + */ + +/* web font */ +//.setLocalFontFace('roboto',300,'Roboto Light','Roboto-Light','roboto-light'); /* roboto light */ +//.setLocalFontFace('roboto',400,'Roboto','Roboto-Regular','roboto-regular'); /* roboto regular */ +//.setLocalFontFace('roboto',500,'Roboto Medium','Roboto-Medium','roboto-medium'); /* roboto medium */ +//.setLocalFontFace('roboto',700,'Roboto Bold','Roboto-Bold','roboto-bold'); /* roboto bold */ + +//.setLocalFontFace('roboto',400,'Roboto Condensed','RobotoCondensed-Regular','roboto-condensed'); /* roboto condensed */ +//.setLocalFontFace('roboto',700,'Roboto Condensed Bold','RobotoCondensed-Bold','roboto-boldcondensed'); /* roboto condensed */ + +/* icon font */ +.setIconFontFace('fontello','fontello'); + +.icon, [class^="icon-"], [class*=" icon-"]{ + .fontello(); +} + +/* custom icon font */ +.icon-user{ + &::before { + content: '\e800'; + } +} +.icon-logout{ + &::before { + content: '\e801'; + } +} + +.icon-login{ + &::before { + content: '\e802'; + } +} + +.icon-clipboard{ + &::before { + content: '\e803'; + } +} + +.icon-emo-happy { + &::before { + content: '\e804'; + } +} + +.icon-emo-wink { + &::before { + content: '\e805'; + } +} + +.icon-emo-unhappy { + &::before { + content: '\e806'; + } +} + +.icon-emo-sleep{ + &::before { + content: '\e807'; + } +} + +.icon-emo-thumbsup { + &::before { + content: '\e808'; + } +} + +.icon-clock{ + &::before { + content: '\e809'; + } +} + +.icon-link{ + &::before { + content: '\e80a'; + } +} +.icon-link-after{ + &::after { + content: '\e80a'; + } +} + +.icon-bell{ + &::before { + content: '\e80b'; + } +} + +.icon-emo-grin{ + :before { + content: '\e80c'; + } +} + +.icon-emo-angry{ + &::before { + content: '\e80d'; + } +} + +.icon-mail{ + &::before { + content: '\e80e'; + } +} + +.icon-emo-cry { + &::before { + content: '\e80f'; + } +} + +.icon-cloud{ + &::before { + content: '\e810'; + } +} + +.icon-emo-squint{ + &::before { + content: '\e811'; + } +} + +.icon-emo-laugh{ + &::before { + content: '\e812'; + } +} + +.icon-emo-wink2{ + &::before { + content: '\e813'; + } +} + +.icon-cloud-1{ + &::before { + content: '\e814'; + } +} + +.icon-home-outline{ + &::before { + content: '\e815'; + } +} + +.icon-home() { + &::before { + content: '\e816'; + } +} + +.icon-search() { + &::before { + content: '\e81f'; + } +} + +.icon-puzzle-1{ + &::before { + content: '\e817'; + } +} + +.icon-cog-alt{ + &::before { + content: '\e818'; + } +} + +.icon-cog{ + &::before { + content: '\e819'; + } +} + +.icon-help{ + &::before { + content: '\e81a'; + } +} + +.icon-bookmark-empty{ + &::before { + content: '\f097'; + } +} + +.icon-menu{ + &::before { + content: '\f0c9'; + } +} + +.icon-sitemap{ + &::before { + content: '\f0e8'; + } +} + +.icon-doc-text{ + &::before { + content: '\f0f6'; + } +} + +.icon-doc-text-after{ + &::after { + content: '\f0f6'; + } +} + +.icon-smile{ + &::before { + content: '\f118'; + } +} + +.icon-frown{ + &::before { + content: '\f119'; + } +} + +.icon-meh { + &::before { + content: '\f11a'; + } +} + +.icon-puzzle { + &::before { + content: '\f12e'; + } +} +.icon-puzzle-after { + &::after { + content: '\f12e'; + } +} + +.icon-file-pdf{ + &::before { + content: '\f1c1'; + } +} + +.icon-doc-new{ + &::before { + content: '\e81d'; + } +} + +.icon-book-open{ + &::before { + content: '\e81c'; + } +} + +.icon-plus{ + &::before { + content: '\e81e'; + } +} + +.icon-doc{ + &::before { + content: '\e81b'; + } +} + + + diff --git a/css/template_admin.less b/css/template_admin.less new file mode 100644 index 0000000..aa2391e --- /dev/null +++ b/css/template_admin.less @@ -0,0 +1,37 @@ +.do-admin{ + #admin__version{ + font-size: .88rem; + } + .main-content ul{ + > li{ + font-size: .88rem; + div.li{ + font-size: .88rem; + a{ + font-size: .88rem; + line-height: 125%; + cursor: pointer; + } + } + } + } + ul.admin_tasks{ + padding: 0; + li{ + background-size: auto 1rem; + margin: 0 0 .6em 0; + a{ + font-weight: 400; + } + } + } + + @media @screen_max-md{ + ul.admin_tasks{ + float: none; + width: auto; + } + + } +} + diff --git a/main.php b/main.php index c72a5a4..3242a16 100755 --- a/main.php +++ b/main.php @@ -295,6 +295,9 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; tpl_includeFile('pageheader.html') ?> + +
@@ -345,6 +348,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
+