diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..050b5e0 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/.* export-ignore +/_test export-ignore diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml new file mode 100644 index 0000000..f6a72e3 --- /dev/null +++ b/.github/auto-comment.yml @@ -0,0 +1,9 @@ +# auto replies used by probot/auto-comment + +issuesOpened: > + Thank you for opening this issue. + + [CosmoCode](https://www.cosmocode.de) is a software company in Berlin providing services for wiki, app and web development. As such we can't guarantee quick responses for issues opened on our Open Source projects. + + If you require certain features or bugs fixed, you can always hire us. Feel free to contact us at dokuwiki@cosmocode.de for an offer. + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 0bc03db..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -sprintdoc-farm: - environment: sprintdoc-farm - tags: - - locally - only: - - live - script: - - fab deploy - - -cosmocode-farm: - environment: cosmocode-farm - tags: - - locally - only: - - live - script: - - fab deploy \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/LICENSE @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README old mode 100755 new mode 100644 index 89f53df..6cadc0c --- a/README +++ b/README @@ -1,7 +1,27 @@ -sprintDoc Template (FIXME URL) -for DokuWiki [https://www.dokuwiki.org] -by Jana Deutschlaender +sprintdoc template for DokuWiki +modern, responsive template that integrates multiple plugins -Version: see template.info.txt -License: GPL2, see COPYING +All documentation for this template can be found at +https://www.dokuwiki.org/template:sprintdoc + +If you install this template manually, make sure it is installed in +lib/tpl/sprintdoc/ - if the folder is called different it +will not work! + +Please refer to http://www.dokuwiki.org/extensions for additional info +on how to install extensions in DokuWiki. + +---- +Copyright (C) Jana Deutschlaender + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +See the LICENSING file for details diff --git a/README.md b/README.md deleted file mode 100755 index 216f47d..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# sprintDoc Template for dokuwiki diff --git a/Template.php b/Template.php index b2924d9..1cd2739 100644 --- a/Template.php +++ b/Template.php @@ -11,15 +11,19 @@ namespace dokuwiki\template\sprintdoc; */ class Template { - /** - * @var array loaded plugins - */ + /** @var array loaded plugins */ protected $plugins = array( 'sqlite' => null, 'tagging' => null, 'magicmatcher' => null, + 'tplinc' => null, + 'sitemapnavi' => null, ); + /** @var string the type of special navigation to use */ + protected $nav = ''; + + /** * Get the singleton instance * @@ -36,12 +40,26 @@ class Template { */ protected function __construct() { $this->initializePlugins(); + $this->initNavigationCookie(); /** @var \Doku_Event_Handler */ global $EVENT_HANDLER; $EVENT_HANDLER->register_hook('PLUGIN_TPLINC_LOCATIONS_SET', 'BEFORE', $this, 'registerIncludes'); } + /** + * Load all the plugins we support directly + */ + protected function initializePlugins() { + $this->plugins['sqlite'] = plugin_load('helper', 'sqlite'); + if($this->plugins['sqlite']) { + $this->plugins['tagging'] = plugin_load('helper', 'tagging'); + $this->plugins['magicmatcher'] = plugin_load('syntax', 'magicmatcher_issuelist'); + } + $this->plugins['tplinc'] = plugin_load('helper', 'tplinc'); + $this->plugins['sitemapnavi'] = plugin_load('helper', 'sitemapnavi'); + } + /** * Makes include position info available to the tplinc plugin * @@ -51,6 +69,8 @@ class Template { $event->data['footer'] = 'Footer below the page content'; $event->data['sidebarfooter'] = 'Footer below the sidebar'; $event->data['sidebarheader'] = 'Header above the sidebar'; + $event->data['navtop'] = 'Additional navigation items at the top'; + $event->data['navbottom'] = 'Additional navigation items at the bottom'; } /** @@ -71,15 +91,81 @@ class Template { } /** - * Load all the plugins we support directly + * Sets a cookie to remember the requested special navigation */ - protected function initializePlugins() { - $this->plugins['sqlite'] = plugin_load('helper', 'sqlite'); - if($this->plugins['sqlite']) { - $this->plugins['tagging'] = plugin_load('helper', 'tagging'); - $this->plugins['magicmatcher'] = plugin_load('syntax', 'magicmatcher_issuelist'); + protected function initNavigationCookie() { + if ($this->plugins['sitemapnavi'] === null) return; + global $INPUT; + + $nav = $INPUT->str('nav'); + if($nav) { + set_doku_pref('nav', $nav); + $this->nav = $INPUT->str('nav'); + } else { + $this->nav = get_doku_pref('nav', 'sidebar'); } - $this->plugins['tplinc'] = plugin_load('helper', 'tplinc'); + } + + /** + * Return the navigation for the sidebar + * + * Defaults to the standard sidebar mechanism, but supports also the sitemapnavi plugin + * + * @return string + */ + public function getNavigation() { + global $ID; + global $conf; + + // id of the current sidebar, each sidebar must have its own state + $header = sprintf('
', md5(page_findnearest($conf['sidebar']))); + // add tabs if multiple navigation types available + if ($this->plugins['sitemapnavi'] !== null) { + $header .= ''; + } + + // decide what to show + if ($this->nav === 'sitemap') { + // site tree created by sitemapnavi plugin + $nav = ''; + } else { + // main navigation, loaded from standard sidebar, fixed up by javascript + $nav = ''; + } + + return $header . $nav; + } + + /** + * Default class defining is the sidebar should collapse + * + * @return string + */ + public function fullWidthClass() { + global $ACT; + // no auto collapsing? empty class + if (!tpl_getConf('autocollapse')) return ''; + // mode show? empty class + if ($ACT === "show") return ''; + // anything else? wide content + return 'wide-content '; } /** @@ -129,9 +215,10 @@ class Template { * @param array $attributes * @param int $w * @param int $h + * @param bool $crop * @return string */ - public static function getResizedImgTag($tag, $attributes, $w, $h) { + public static function getResizedImgTag($tag, $attributes, $w, $h, $crop = true) { $attr = ''; $medias = array(); @@ -154,7 +241,7 @@ class Template { if($media === '') return ''; // replace the array - $media = ml($media, array('w' => $w, 'h' => $h, 'crop' => 1), true, '&'); + $media = ml($media, array('w' => $w, 'h' => $h, 'crop' => (int) $crop), true, '&'); $attributes[$attr] = $media; // return the full tag @@ -177,32 +264,62 @@ class Template { $title = tpl_getLang('adjunct_start_logo_text') . $conf['title']; } - $desktop = self::getResizedImgTag( - 'img', - array( - 'class' => 'mobile-hide', - 'src' => array('wiki:logo-wide.png', 'wiki:logo.png'), - 'alt' => $title, - ), - 0, 0 - ); - $mobile = self::getResizedImgTag( - 'img', - array( - 'class' => 'mobile-only', - 'src' => array('wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png'), - 'alt' => $title, - ), - 32, 32 - ); + $logo = << +EH22 DEMO +HTML; // homepage logo should not link to itself (BITV accessibility requirement) if($linkit) { - tpl_link(wl(), $desktop, 'accesskey="h" title="[H]"'); - tpl_link(wl(), $mobile, 'accesskey="h" title="[H]"'); + tpl_link(wl(), $logo, 'accesskey="h" title="[H]"'); } else { - echo $desktop; - echo $mobile; + echo $logo; } } + + /** + * Add the current mode information to the hierarchical breadcrumbs + */ + public function breadcrumbSuffix() { + global $ACT; + global $lang; + global $INPUT; + global $ID; + global $conf; + global $IMG; + if($ACT == 'show') return; + + // find an apropriate label for the current mode + if($ACT) { + $label = tpl_getLang('mode_' . $ACT); + if(!$label) { + if(isset($lang['btn_' . $ACT])) { + $label = $lang['btn_' . $ACT]; + } else { + $label = $ACT; + } + } + } else { + // actually we would need to create a proper namespace breadcrumb path here, + // but this is the most simplest thing we can do for now + if(defined('DOKU_MEDIADETAIL')) { + $label = hsc(noNS($IMG)); + } else { + return; + } + } + + if($ACT == 'admin' && $INPUT->has('page')) { + $link = wl($ID, array('do' => 'admin')); + echo ' : ' . $label . ''; + + /** @var \DokuWiki_Admin_Plugin $plugin */ + $plugin = plugin_load('admin', $INPUT->str('page')); + if(!$plugin) return; + + $label = $plugin->getMenuText($conf['lang']); + } + + echo ' : ' . $label . ''; + } } diff --git a/conf/default.php b/conf/default.php index 9f1418e..f666d04 100755 --- a/conf/default.php +++ b/conf/default.php @@ -5,4 +5,7 @@ */ $conf['sidebar_sections'] = 'h1,h2,h3,h4,h5'; - +$conf['header_layout'] = 'header-default'; +$conf['autocollapse'] = 1; +$conf['closedwiki'] = 0; +$conf['copyright'] = ''; diff --git a/conf/metadata.php b/conf/metadata.php index 274f7c5..863b778 100755 --- a/conf/metadata.php +++ b/conf/metadata.php @@ -9,3 +9,15 @@ $meta['sidebar_sections'] = array( 'li.level1 > .li', ), ); + +$meta['header_layout'] = array( + 'multichoice', + '_choices' => array( + 'header-default', + 'header-compact', + ), + ); + +$meta['autocollapse'] = array('onoff'); +$meta['closedwiki'] = array('onoff'); +$meta['copyright'] = array(''); diff --git a/css/area_content.less b/css/area_content.less index 76c8f30..67f2840 100755 --- a/css/area_content.less +++ b/css/area_content.less @@ -1,65 +1,53 @@ /** * This file provides the design styles for the page content. - * - * @author Jana Deutschlaender */ +.picker { + z-index: 2; // position over .content +} + .content .row { > .col-xs-12 { - box-shadow: @box-shadow; + z-index: 1; + + background-color: var(--color-background); + #dokuwiki__content { position: relative; - z-index: 10; - &::before { - content: ''; - position: absolute; - top: 0; - left: 0; - z-index: -1; - height: @page-header_height; - box-sizing: border-box; - width: 100%; - background-color: @ini_background_page_header; - border-bottom: 1px solid @ini_border_light; - } + .page-content { + padding-top: @page-header_height; - .msg-area + * { - clear: both; - padding-top: 1em; // as h1 - } - - #plugin__highlightparent { - clear: none; - display: block; - - + * { + .msg-area + * { clear: both; padding-top: 1em; // as h1 } } } } + @media @screen_min-md { + > .col-xs-12 { + border-left: dashed 0.25em var(--color-shade-4); + border-radius: 0; + } + } } - .main-content > .level2, .main-content > .level1, .main-content > .level3, .main-content > .level4, .main-content > .level5, .main-content > .level6 { - //padding-bottom: 1rem; - - > p, > ul > li .li { + > p, + > ul > li .li { a { font-size: inherit; } } } - .level1, .level2, .level3, diff --git a/css/area_footer.less b/css/area_footer.less index a76bb4b..7e103bd 100755 --- a/css/area_footer.less +++ b/css/area_footer.less @@ -1,20 +1,16 @@ /** * This file provides the design styles for the page footer - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* no print */ - @media screen { .page-footer { min-height: @page-header_height; - background-color: @ini_background_page_header; - border-top: 1px solid @ini_border_light; + background-color: var(--color-background); + border-top: 1px solid var(--color-shade-4); border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius - color: @ini_background_page_footer; + color: var(--color-shade-4); font-size: @font-size-default; text-align: right; padding: @margin-small @margin-default; @@ -38,27 +34,22 @@ #dokuwiki__footer { .main-footer { position: relative; - z-index: 2; box-sizing: border-box; - background-color: @ini_background_site; + background-color: var(--color-background); + margin-top: 5px; // for box-shadow of content + text-align: center; } p { - color: @ini_text_webframe; + color: var(--color-shade-4); font-size: @font-size-default; margin: 0; } - - a { - color: @ini_nav_menu_color; - } } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1024px */ - @media @screen_min-md { #dokuwiki__footer { .col-xs-12 { @@ -91,10 +82,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-md { #dokuwiki__footer { .main-footer { @@ -104,10 +93,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 768px */ - @media @screen_max-xs { .page-footer { padding-left: @margin-small; @@ -124,10 +111,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 480px */ - @media @screen_max-xxs { #dokuwiki__footer { .main-footer { diff --git a/css/area_footnotes.less b/css/area_footnotes.less new file mode 100644 index 0000000..87abded --- /dev/null +++ b/css/area_footnotes.less @@ -0,0 +1,55 @@ +/** + * This file provides the design styles for the footnotes. + */ + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* footnotes section */ +.dokuwiki div.footnotes { + div.fn { + margin-bottom: .2rem; + display: table; + vertical-align: top; + + > sup, + .content { + display: table-cell; + } + + > sup { + vertical-align: top; + + // footnote anchor + a.fn_bot { + font-size: .86em; + padding-right: .2em; + } + } + + .content { + vertical-align: top; + line-height: 135%; + } + + // footnote text + div.content { + line-height: 135%; + } + } +} + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* footnotes in content */ +.main-content sup, +.main-content > div > p sup, +.main-content > div > ul > li .li sup { + a.fn_top { + font-size: .7rem; + font-weight: bold; + padding-right: .2em; + } +} + +.insitu-footnote { + line-height: 130%; + z-index: 100; +} diff --git a/css/area_forms.less b/css/area_forms.less index 996bd68..d7be3cf 100644 --- a/css/area_forms.less +++ b/css/area_forms.less @@ -1,18 +1,13 @@ /** * This file provides the design styles for forms. - * - * @author Jana Deutschlaender */ - /* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */ - form { display: inline; margin: 0; padding: 0; - // multiline label fieldset > label.block > span:first-child { display: inline-block; @@ -64,8 +59,8 @@ meter, progress { font: inherit; font-weight: normal; - color: #333; - background-color: #fff; + color: var(--color-foreground); + background-color: var(--color-background); line-height: normal; margin: 0; vertical-align: middle; @@ -95,8 +90,7 @@ textarea, select, keygen { min-height: @formfield_min-height; - border: 1px solid @ini_border; - box-shadow: inset 0 0 1px #eee; + border: 1px solid var(--color-shade-4); border-radius: @fix_border-radius; padding-left: .3rem; padding-right: .3rem; @@ -115,7 +109,6 @@ input[type="image"] { //box-shadow: none; :in ie picture and checkbox disappear } - input:active, input:focus, textarea:active, @@ -124,7 +117,7 @@ select:active, select:focus, keygen:active, keygen:focus { - border-color: #999; + border-color: var(--color-shade-4); } input[type="file"] { @@ -132,7 +125,6 @@ input[type="file"] { padding-bottom: .1rem; } - /* + + + + + buttons + + + + + */ button { background-color: #eee; @@ -155,7 +147,6 @@ button { } } - /* + + + all types of submit-buttons + + + */ form input[type=submit], // heredity 'adnewpage' a.button, @@ -166,19 +157,21 @@ button[type=submit], cursor: pointer; box-shadow: none; background-image: none; - background-color: @ini_button_background; - border: 1px solid @ini_button_background; - border-radius: @fix_border-radius; - color: @ini_button_color; + background-color: var(--color-shade-1); + border: solid 0.1rem var(--color-shade-2); + border-radius: 0.5rem; + color: var(--color-foreground); vertical-align: top; padding: .3em @grid; - transition: @transition background-color, @transition color; &:hover, &:active, &:focus { - background-color: @ini_button_color; - color: @ini_button_background; + background-color: transparent; + color: var(--color-glow-primary); + border-color: var(--color-glow-primary); + transition: var(--transition-glow); + filter: var(--filter-glow-primary); } } @@ -213,7 +206,6 @@ button[type=submit] { } } - /* + + + all types of buttons not being submit-buttons + + + */ input.button, input[type=button] { @@ -237,7 +229,6 @@ input[type=button] { } } - /* + + + all disabled buttons + + + */ input[disabled], button[disabled], @@ -249,13 +240,11 @@ button[readonly], select[readonly], textarea[readonly] { cursor: auto; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+); - background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%); - background-color: #eee; + background-color: var(--color-background); opacity: .5; border: 1px solid @ini_border; border-radius: @fix_border-radius; - color: #333; + color: var(--color-shade-4); font-weight: normal; padding: .3em @grid; transition: @transition background-color, @transition color; @@ -277,10 +266,8 @@ button::-moz-focus-inner { padding: 0; } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries - Styles for auth forms */ - @media @screen_max-xs { .tpl_sprintdoc { #dw__login, diff --git a/css/area_header.less b/css/area_header.less index eedc601..b041641 100755 --- a/css/area_header.less +++ b/css/area_header.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the page header. - * - * @author Jana Deutschlaender */ - #dokuwiki__header { @header-font-opacity: 1; @@ -12,25 +9,23 @@ min-height: 120px; } - -/* + + + wiki logo + + + */ + /* + + + wiki logo + + + */ @media @screen_min-md { .logo { padding: 1rem 0 .3rem; + text-align: center; img { - height: 4.6rem; + height: 200px; width: auto; - border-style: solid; - border-color: transparent; - border-width: 2px 0; + transition: transform 200ms ease-in-out; } a:hover, a:focus, a:active { img { - border-width: 0; + transform: scale(1.05); } } } @@ -38,7 +33,13 @@ @media @screen_max-md { .logo { - display: table-cell; + //display: table-cell; + text-align: center; + width: 100%; + + img { + max-height: 200px; + } .mobile-only { margin: .8rem 1rem .6rem 0; @@ -46,8 +47,7 @@ } } - -/* + + + + + DESKTOP - wiki title + claim + + + + + */ + /* + + + + + DESKTOP - wiki title + claim + + + + + */ .main-title.desktop-only { @media @screen_min-md { display: table-cell; @@ -76,8 +76,7 @@ } } - -/* + + + + + MOBILE - wiki title wrapper + + + + + */ + /* + + + + + MOBILE - wiki title wrapper + + + + + */ .main-title:not([class*="desktop-only"]) { @media @screen_max-md { display: table-cell; @@ -89,10 +88,9 @@ } } - -/* + + + wiki title + + + */ + /* + + + wiki title + + + */ p.title { - background-color: @ini_background_site; + background-color: var(--color-background); opacity: @header-font-opacity; color: @ini_text_webframe; line-height: @line-height-default; @@ -109,8 +107,7 @@ } } - -/* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */ + /* + + + + + DESKTOP - wiki claim, logo, title wrapper + + + + + */ @media @screen_min-md { div.claim { display: table-cell; @@ -119,8 +116,7 @@ } } - -/* + + + wiki claim + + + */ + /* + + + wiki claim + + + */ p.claim { opacity: @header-font-opacity; color: @ini_text_webframe; @@ -132,48 +128,50 @@ } } - -/* + + + mobile nav togglelink + + + */ + /* + + + mobile nav togglelink + + + */ .menu-togglelink { position: relative; - z-index: 1; margin: @headericons-margin-xxs -(@very-small-spacing) 0 0; a { .fontello(); .icon-menu(); + .btn-hover(); display: block; min-height: @toggle-size; min-width: @toggle-size; box-sizing: border-box; - background-color: #fff; border: 1px solid @ini_border; border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @ini_nav_menu_color; font-size: 1rem; text-align: center; text-decoration: none; line-height: 1; - transition: @transition color, @transition background-color, @transition border-color; &::before { font-size: 1.5rem; margin: .1rem 0 0; } - - &:hover, - &:active, - &:focus { - background-color: @ini_nav_menu_hover_bg; - border-color: @ini_nav_menu_hover_color; - color: @ini_nav_menu_hover_color; - } } } + /* + + + mobile select for doku wiki tools + + + */ + .menu-tool-select { + position: relative; + z-index: 1000; + display: none; + @media @screen_max-xxs { + display: block; + } -/* + + + + + with magic matcher + + + + + */ + select { + display: block; + width:100%; + } + } + + /* + + + + + with magic matcher + + + + + */ &.has-magicmatcher { .logo { @media @screen_min-md { @@ -203,3 +201,82 @@ } } } + +/* + + + + + layout option compact + + + + + */ +.header-compact { + #dokuwiki__header { + min-height: 2.7rem; + margin-bottom: 0.5rem; + + .main-title.desktop-only p.claim, + p.claim { + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + max-width: 35em; + } + + // desktop + @media @screen_min-md { + div.claim { + vertical-align: top; + } + + .main-title.desktop-only { + vertical-align: top; + } + + .main-title.desktop-only, + .logo { + padding-top: 0.4rem; + } + + .logo img { + height: 3.6rem; + } + } + + // mobile middle + @media @screen_max-md { + + .main-title.desktop-only p.claim, + p.claim { + display: none; + } + + .logo { + display: block; + position: absolute; + top: 0; + left: 3rem; + + .mobile-only { + margin: .4rem; + height: 1.75rem; + } + } + + .main-title:not([class*="desktop-only"]) { + display: inline-block; + vertical-align: top; + padding-left: 1.75rem; + } + + p.title { + font-size: 1rem; + } + } + + @media @screen_max-xxs { + min-height: 70px; // needed for menu select toolbar + + .logo { + left: 2rem; + } + + .menu-tool-select { + padding-top: .3rem; + } + } + } +} diff --git a/css/area_main-content-anchor.less b/css/area_main-content-anchor.less new file mode 100644 index 0000000..c5e55dc --- /dev/null +++ b/css/area_main-content-anchor.less @@ -0,0 +1,36 @@ +#dokuwiki__content.main-content { + h1, h2, h3, h4, h5 { + a.anchor { + vertical-align: middle; + margin-left: 0.25em; + display: none; + position: absolute; + + svg { + width: 1em; + height: 1em; + fill: var(--color-foreground); + } + } + + &:hover { + a.anchor { + display: inline-block; + transition-property: filter, border-color; + transition-duration: 200ms; + transition-timing-function: ease-out; + + &:hover { + color: var(--color-glow-primary); + filter: var(--filter-glow-primary); + transition: var(--transition-glow); + + svg { + fill: var(--color-glow-primary); + } + } + + } + } + } +} diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less index 976d752..1d26e34 100644 --- a/css/area_main-content-secedit.less +++ b/css/area_main-content-secedit.less @@ -1,41 +1,32 @@ /** - * This styles the section editing buttons and highlighting + * This styles the "section editing button" (if not added by data-plugin) */ - #dokuwiki__content.main-content { - div.section_highlight { - clear: right; - background: repeating-linear-gradient( - -45deg, - @highlight-odd-ini_text, - @highlight-odd-ini_text 10px, - @highlight-even-ini_text 10px, - @highlight-even-ini_text 20px, - ); - border-color: @ini_background_page_header; - } - - .editbutton_section { + .secedit:not([class*="plugin"]):not([class*="table"]) { position: relative; - z-index: 2; top: 0; float: right; + margin-top: 0; // for best position of edit-tab beneath table form div.no { button { - padding-right: 0; + margin-top: -.4rem; + margin-right: -0.4rem; + padding: 0.2rem 0.4rem; } } + // "section editing button" button { + display: flex; + align-items: center; background-color: transparent; color: transparent; border-color: transparent; &::after { content: ''; - float: right; display: inline-block; background: transparent url("svg.php?svg=pencil.svg&f=existing") center center no-repeat; height: 1em; @@ -45,20 +36,20 @@ border-radius: @ini_default_border_radius; margin-left: @small-spacing; margin-top: -1px; + + color: var(--color-foreground); + mask-size: contain; + mask-position: center; + mask-repeat: no-repeat; + background: currentColor !important; + + mask-image: url('img/pencil.svg'); } &:hover, &:active, &:focus { - //background-color: @ini_existing; - color: @ini_existing; - //border-color: @ini_existing; - - &::after { - background-color: @ini_existing; - background-image: url("svg.php?svg=pencil.svg&f=background_content"); - border-color: @ini_existing; - } + .fnActiveButton(); } } } diff --git a/css/area_main-content.less b/css/area_main-content.less index da0ecd7..6058c8c 100755 --- a/css/area_main-content.less +++ b/css/area_main-content.less @@ -1,15 +1,12 @@ /** * This file provides the design styles for the main-content. - * - * @author Jana Deutschlaender */ - #dokuwiki__content.main-content { - .level2 { + div[class^="level"] { p a.media { img { - border: 1px dotted @ini_background_site; + border: 1px dotted var(--color-background); } &:hover, @@ -23,7 +20,7 @@ } > div, - .section_highlight > div { + div[class^="level"] { > ul, > ol { &:not([class="tabs"]) > li { @@ -42,16 +39,12 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ - -@media @screen_min-xlg { -} - +// @media @screen_min-xlg { +// } /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1199px */ - -@media @screen_max-xlg { -} +// @media @screen_max-xlg { +// } diff --git a/css/area_main-sidebar-content.less b/css/area_main-sidebar-content.less deleted file mode 100644 index 1797837..0000000 --- a/css/area_main-sidebar-content.less +++ /dev/null @@ -1,63 +0,0 @@ -/** - * This file provides the design styles the non-navigational elements in the sidebar - */ - - -#dokuwiki__aside { - ul, - ol { - margin-left: -.4rem; - padding-left: 0; - - ul, - ol { - padding-left: 1.8rem; - - @media @screen_md-lg { - padding-left: @menu-margin-lg; - } - - li { - margin-left: 0; - } - } - } -} - - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1023px */ - -@media @screen_max-md { - #dokuwiki__aside { - display: none; - } - - body.show-mobile-sidebar { - #dokuwiki__aside { - display: block !important; - position: absolute; - left: 1.25rem; //left margin of content container - z-index: 200; // above all - box-shadow: @box-shadow-right-bottom; - min-width: 45%; - max-width: 90%; - height: auto; - - &:after { - content: ""; - position: absolute; - top: 0; - left: 0; - bottom: 0; - right: 0; - width: 100%; - height: 100%; - background: @ini_background_site; - background: -webkit-linear-gradient(left, @ini_background_site, @ini_background); - background: linear-gradient(left, @ini_background_site, @ini_background); - z-index: 0; - } - } - } -} diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less index 61fd70d..8363b35 100755 --- a/css/area_main-sidebar-nav.less +++ b/css/area_main-sidebar-nav.less @@ -1,32 +1,51 @@ /** * This file provides the design styles the navigational elements in the sidebar - * - * @author Jana Deutschlaender - * @author Andreas Gohr */ - #dokuwiki__aside { @icon-size: @font-size-big; @menu-margin: @icon-size + @margin-small * 2; - nav > p, - .mmissuelist li, - .mmissuelist div { - color: @ini_nav_menu_color; + @media @screen_md-lg { + margin-left: -1.25rem; + } - &.noissue { - color: @ini_text_webframe; + @media @screen_max-md { + display: none; + } - * { - color: inherit; - } - } + ul { + padding-left: 0; } nav { + display: flex; + flex-direction: column; + gap: 0.75rem; + + &.nav-main { + margin-bottom: @nav-margin; + } + + > p { + color: var(--color-foreground); + + &.noissue { + color: @ini_text_webframe; + + * { + color: inherit; + } + } + } + + ul, + div.nav { + margin-bottom: 0; + } + li { - color: @ini_nav_menu_color; + color: var(--color-foreground); > div { color: @ini_text_webframe; @@ -41,120 +60,191 @@ li:not([class]), .li { padding: .15em 0; - } - } - /* jira itemlist */ - .mmissuelist { - li { - &.noissue { - list-style-type: none; - margin-left: 0; - } + /* + + + + + active + + + + + */ - a { - display: inline-block; + span.curid { + font-weight: bold; } } - - img { - vertical-align: bottom; - margin-right: .3rem; - } - - .mm__status { - padding-left: .3rem; - padding-right: .3rem; - } - - form { - vertical-align: text-top; - } } - > * { - margin-left: @menu-margin; // moves *all* sidebar content to the right - - @media @screen_md-lg { - margin-left: @menu-margin-lg; - } - } - - a { + a, label { &:link, &:visited { opacity: .9; - color: @ini_nav_menu_color; + color: var(--color-foreground); } * { - color: inherit; + color: var(--color-foreground); } } - // the toggle element - a.nav { - .display-flex(); - .align-items(); + /* + + + the wrapper around the toggle to reserve space + + + */ - cursor: pointer; + div.nav { min-height: @icon-size + @margin-small; - opacity: 1; - border: 1px solid transparent; - border-radius: @fix_border-radius; - color: @ini_nav_menu_color; - font-size: @font-size-head6; - font-weight: normal; - 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; + background-color: var(--color-background); + border-radius: 0.5rem; - @media @screen_md-lg { - margin-left: -(@menu-margin-lg + .8); + &.themeToggle input { + width: 0; + height: 0; + margin: 0; + padding: 0; + display: block; + opacity: 0; } - span { - display: inline-block; - vertical-align: middle; - color: inherit; - } + // the toggle element + a, label { + border-radius: 0.5rem; + background-color: var(--color-shade-1); + transition: background-color 150ms; + color: var(--color-foreground); + font-size: 1.2em; + border: solid 0.1em var(--color-shade-1); + transition-property: filter, border-color; + transition-duration: 200ms; + transition-timing-function: ease-out; - span.lbl { - 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; + cursor: pointer; + display: flex; + align-items: center; + width: 100%; + opacity: 1; + font-weight: normal; + margin: 0 0 @very-small-spacing; + padding: 0.4rem 0.1rem; + text-decoration: none; + + span { + display: inline-block; + vertical-align: middle; + color: inherit; + } + + span.ico { + display: flex; + align-items: center; + justify-content: center; + i[data-icon] { + font-size: 1.5rem; + } + } + + + /* + + + submenu entry is active + + + */ + /* + + + toggle: open + + + */ + + &.is-active, &.is-open { + background-color: var(--color-shade-2); + border-color: var(--color-shade-4); + color: var(--color-foreground); + + span.ico { + &:after { + background-color: currentColor; + } + + strong { + border-color: currentColor; + } + + svg { + path { + fill: currentColor; + } + } + } } } - span.ico { - .flex(0 0 auto); + &:hover, + &:focus-within { + position: relative; // always show label, even with collapsed sidebar + z-index: 100; - width: @menu-margin; + a, label { + + width: 100%; + background-color: transparent; + border: solid 0.1em var(--color-glow-primary); + text-decoration: none; + color: var(--color-glow-primary); + filter: var(--filter-glow-primary); + transition: var(--transition-glow); + + + span.ico { + &:after { + background-color: currentColor; + } + + strong { + border-color: inherit; + } + + svg { + path { + fill: currentColor; + } + } + } + } + + } + + span.ico { + position: relative; + display: table-cell; + width: (@menu-margin - .1); + min-width: (@menu-margin - .1); height: @icon-size; - border-right: 1px solid @ini_nav_menu_color; text-align: center; - margin-right: 4%; + vertical-align: middle; color: inherit; + &::after { + @border-height: 1.5rem; + + content: ''; + position: absolute; + right: 0; + top: 50%; + bottom: auto; + height: @border-height; + width: 1px; + background-color: currentColor; + margin-top: -(@border-height / 2); + + // wordbreak too late in IE 10 + @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) { + top: 0; + bottom: .5rem; + height: 100%; + margin: 0; + } + } + // simple fake icon strong { display: inline-block; - font-size: @icon-size * 0.5; - width: @icon-size * 0.9; - height: @icon-size * 0.9; - line-height: @icon-size * 0.9; - margin: @icon-size * 0.05; - vertical-align: baseline; - text-align: center; - color: inherit; - border: 2px solid @ini_nav_menu_color; + width: @icon-size * 0.98; + height: @icon-size * 0.98; + border: 2px solid currentColor; border-top-right-radius: 50%; border-bottom-left-radius: 50%; - transition: @transition border-color; + color: inherit; + font-size: @icon-size * 0.5; + line-height: @icon-size * 0.9; + vertical-align: baseline; + text-align: center; + margin: @icon-size * 0.05; + padding: 0 .05em .05em; } // real icon @@ -163,99 +253,43 @@ height: @icon-size; path { - fill: @ini_nav_menu_color; + fill: currentColor; transition: @transition all; } } } - &:hover, - &:focus, - &:active { - background-color: @ini_nav_menu_hover_bg; - border-color: @ini_nav_menu_hover_color; - color: @ini_nav_menu_hover_color; - text-decoration: none; - - span.ico { - border-color: inherit; - - strong { - border-color: inherit; - } - - svg { - path { - fill: @ini_nav_menu_hover_color; - } - } - } + span.lbl { + display: table-cell; + font-size: inherit; + padding-left: .5rem; } } - // without wrapping UL - nav > a.nav { - margin-left: -3.5rem; + /* + + + + + the panel (hidden by default) + + + + + */ - @media @screen_md-lg { - margin-left: -2.5rem; - } - } - - -/* + + + + + active + + + + + */ - span.curid a { - font-weight: bold; - } - - -/* + + + + + the panel (hidden by default) + + + + + */ div.nav-panel { display: none; margin-top: .5rem; + margin-left: @margin-small; ul { margin-bottom: 1rem; ul { margin-bottom: 0; + margin-left: 16px; } } + + ul.toollist li { + margin-left: 0; + } } } - -/* + + + + + + wide page content border-bottom between a.nav (short width) + + + + + -.wide-content { - #dokuwiki__aside { - a.nav { - position: relative; - - &::after { - content: ''; - position: absolute; - bottom: -1px; - left: 0; - width: 100%; - height: 1px; - border-bottom: solid 1px @ini_border; - } - - &:hover, - &:focus, - &:active { - &::after { - display: none; - } - } - } - } -} */ - - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ - @media @screen_min-xlg { #dokuwiki__aside { nav { @@ -276,34 +310,51 @@ } } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1440px */ +@media @screen_max-xlg { + #dokuwiki__aside { + div.nav { + a { + margin-left: 0; + } + } + } +} /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-md { - // show when toggled - body.show-mobile-sidebar { - .search.main-sidebar { - display: block !important; - position: relative; - - form { - margin-bottom: 1rem; - - .no { - display: block; - } + #dokuwiki__aside { + div.nav { + a { + margin-left: 0; } } + } + body.show-mobile-sidebar { #dokuwiki__aside { + display: block !important; + position: absolute; + left: 1.25rem; // left margin of content container + box-shadow: @box-shadow-right-bottom; + min-width: 45%; + max-width: 90%; + height: auto; + background: var(--color-background); + > nav { position: relative; - z-index: 2; &:first-child { margin-top: 1.2rem; } + + a, + label { + font-size: @font-size-small; + } } a.nav { @@ -312,28 +363,44 @@ border-left-width: 0; } - .nav-panel, + div.nav-panel, a.nav { + margin-top: 0; padding-right: .8em; } } } } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 768px */ +@media @screen_max-xs { + body.show-mobile-sidebar { + .page-wrapper > .tools { + top: 2.5rem; + } + + #dokuwiki__aside { + left: 1.25rem; + right: 1.25rem; + width: auto; + max-width: 100%; + margin-top: -1rem; + } + } +} /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* max-width: 1439px */ +/* max-width: 480px */ +@media @screen_max-xxs { + body.show-mobile-sidebar { + #dokuwiki__aside { + left: 4px; + right: 4px; -@media @screen_max-xlg { - #dokuwiki__aside { - nav { - li:not([class]), - .li { - font-size: @font-size-default; - - * { - font-size: inherit; - font-weight: inherit; + > nav { + a { + font-size: @font-size-default; } } } diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less index eeef1b3..a14fbc6 100644 --- a/css/area_main-sidebar-search.less +++ b/css/area_main-sidebar-search.less @@ -1,7 +1,5 @@ /** * This file provides the design styles for the quick search. - * - * @author Jana Deutschlaender */ .search.main-sidebar { @@ -15,9 +13,7 @@ p.toggleSearch a, button[type="submit"] { - .fontello(); .hide-text-show-before(); - .icon-search(); position: relative; width: @icon-size; @@ -28,60 +24,65 @@ border: solid 1px transparent; padding: 0; transition: @transition color, @transition background-color, @transition border-color; + display: flex; + align-items: center; &:hover, &:focus, &:active { - min-height: @icon-size; - background-color: @ini_button_color; - border: solid 1px @ini_button_background; + .fnActiveButton(); - &::after { - background-color: @ini_button_background; + &::after{ + background-color: var(--color-glow-primary); } } &::before { - width: 100%; - color: inherit; + width: @icon-size; + height: 0.8em; font-size: @icon-search_font-size; text-align: center; margin: 0; + color: var(--color-foreground); + content: ''; + display: block; + mask-size: contain; + mask-position: center; + mask-repeat: no-repeat; + background-color: currentColor; + + + mask-image: url('img/search.svg'); } } 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; + border-radius: 0.5rem 0 0 0.5rem; + border-right: none; + background-color: var(--color-shade-1); + color: var(--color-foreground); text-decoration: none; box-sizing: border-box; &::before { - position: absolute; - top: 50%; - left: 0; + width: 100%; 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; + border-right: none; + background-color: transparent; + border-color: var(--color-glow-primary); + color: var(--color-glow-primary); } } } @@ -94,21 +95,9 @@ 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 + + + */ form { position: relative; display: block; @@ -131,7 +120,6 @@ button[type="submit"] { border: solid 1px transparent; - border-right-color: @ini_border; margin-left: -(@icon-size); &::after { @@ -141,36 +129,46 @@ bottom: 15%; width: 1px; left: -1px; - background-color: @ini_border; + background-color: var(--color-shade-4); transition: @transition background-color; } } div.ajax_qsearch { box-shadow: none; - background-color: #FFF; + background-color: var(--color-shade-1); padding: 0; + z-index: 300; // otherwise hidden behind sidebar in mobile view + border: solid 0.1em var(--color-shade-4); + border-radius: 0.5rem; - strong, - ul li { - color: @quicksearch-button-color; - padding: .25rem .5rem; - - * { - color: inherit; - } + > strong { + color: var(--color-foreground); + padding: 0.25rem 0.5rem; + border-bottom: solid 0.1em var(--color-shade-4); } ul li { - &:nth-child(odd) { - background-color: @suggestion-zebra; + color: var(--color-foreground); + + a { + display: block; + padding: 0.25rem 0.5rem; + overflow: hidden; + color: inherit; + text-overflow: ellipsis; + + &:hover, + &:focus, + &:active { + background-color: var(--color-shade-2); + } } } } } - -/* + + + + + suggestionlist + + + + + */ + /* + + + + + suggestionlist + + + + + */ #qsearch__out { left: auto; top: auto; @@ -179,34 +177,65 @@ } } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* min-width: 1024px */ +@media @screen_min-md { -/* + + + + + 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; + // wide page content + .wide-content { + .search.main-sidebar { + p.toggleSearch { + position: relative; + display: block; + float: left; + width: auto; } - .no { - #qsearch__in { - width: 0; - padding: 0; - margin: 0; + form { + input { + border: 0 none; } - button[type="submit"] { - display: none; + .no { + #qsearch__in { + width: 0; + padding: 0; + margin: 0; + } + + button[type="submit"] { + display: none; + } } } } } } + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1023px */ +@media @screen_max-md { + + // show when toggled + body.show-mobile-sidebar { + #dokuwiki__aside { + padding: 0 1rem; + border-radius: 0.5rem; + } + + p.toggleSearch { + display: none !important; + } + + .search.main-sidebar { + display: block !important; + position: relative; + margin-left: -1px; + margin-right: -1px; + + form { + margin-bottom: 1rem; + } + } + } +} diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less new file mode 100644 index 0000000..f2fdefd --- /dev/null +++ b/css/area_main-sidebar-tabs.less @@ -0,0 +1,33 @@ +/** + * This file provides the design styles for tab list in sidebar + */ + +/* default view */ +#dokuwiki__aside ul.sidebar-tabs { + margin-top: 0; + margin-bottom: @nav-margin; + + border-bottom: 1px solid @ini_nav_menu_color; + + white-space: nowrap; + + li { + display: inline-block; + border: 1px solid @ini_nav_menu_color; + padding: 0.25em 0.5em; + margin-bottom: -1px; + margin-left: 0.5em; + border-top-right-radius: @fix_border-radius; + border-top-left-radius: @fix_border-radius; + + &.active { + border-bottom: 1px solid var(--color-background); + font-weight: bold; + } + } +} + +/* wide content view */ +.wide-content #dokuwiki__aside ul.sidebar-tabs { + visibility: hidden; +} diff --git a/css/area_msg.less b/css/area_msg.less index 6edc5c7..8697293 100644 --- a/css/area_msg.less +++ b/css/area_msg.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for message block - * - * @author Jana Deutschlaender */ - .msg-area { clear: both; padding-top: 1.6rem; @@ -18,23 +15,65 @@ } } -/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */ div.success, div.error, div.info, div.notify { - background-repeat: no-repeat; - background-position: 8px 50%; - border: 1px solid #eeb; - font-size: 90%; - margin: 0 0 .5em; - padding: .4em; - padding-left: 32px; - overflow: hidden; - border-radius: @fix_border-radius; + display: block; + border: none; + border-left: solid 0.5rem var(--color-shade-4); + border-radius: 0.5rem; + padding: 1em; + background-image: none; + background-color: var(--color-shade-1); - * { - color: inherit; + &::before { + display: inline-block; + content: ""; + margin: 0.3em 0.2em 0 0; + width: 1em; + height: 1em; + mask-size: contain; + mask-position: center top; + mask-repeat: no-repeat; + background-color: currentColor; + vertical-align: top; + } + + &.success { + color: var(--color-success); + + &::before { + mask-image: url(img/tick_small.svg); + } + } + + &.error { + border-left-color: var(--color-error); + color: var(--color-foreground); + + &::before { + background-color: var(--color-error); + mask-image: url(img/power.svg); + } + } + + &.info { + color: var(--color-foreground); + + &::before { + mask-image: url(img/info.svg); + } + } + + &.notify { + border-left-color: var(--color-warning); + color: var(--color-foreground); + + &::before { + background-color: var(--color-warning); + mask-image: url(img/warning.svg); + } } a { diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less index 1c3818c..4200172 100755 --- a/css/area_nav-breadcrumb.less +++ b/css/area_nav-breadcrumb.less @@ -1,37 +1,26 @@ /** * This file provides the design styles for the breadcrumb - * - * @author Jana Deutschlaender */ - .breadcrumbs { position: relative; min-height: @page-header_height; box-sizing: border-box; - background-color: @ini_background; - border-bottom: 1px solid @ini_border_light; + background-color: var(--color-background); + border-bottom: 1px solid var(--color-shade-4); padding: 1rem 1.8rem .2rem; - @media @screen_max-md { - background-color: @ini_background_page_header; - } - @media @screen_max-xs { padding-left: @margin-small; padding-right: .75rem; } - @media @screen_xs-lg { - background-color: @ini_background; - } - > p { font-size: @font-size-small; margin: 0; @media @screen_max-xs{ - width: 1px; + width: 0; position: relative; overflow: hidden; height: 1.6rem; @@ -61,14 +50,16 @@ min-width: 1.9em; width: auto; box-sizing: border-box; - border: solid 1px transparent; - border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius + background-color: var(--color-shade-1); + border: solid .1em transparent; + border-radius: 0.5rem; vertical-align: middle; text-decoration: none; margin-top: -.2em; - transition: @transition border-color; + transition: var(--transition-glow); &:before { + color: var(--color-foreground); font-size: @font-size-default + (@font-scale-factor * 2); margin-top: .17rem; } @@ -76,7 +67,14 @@ &:hover, &:focus, &:active { - border-color: @ini_existing; + &:before { + color: var(--color-glow-primary); + } + + background-color: transparent; + border-color: var(--color-glow-primary); + color: var(--color-glow-primary); + filter: var(--filter-glow-primary); } } } diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less index 5defc3b..62bbe63 100755 --- a/css/area_nav-direct.less +++ b/css/area_nav-direct.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the direct / menu jump links. - * - * @author Jana Deutschlaender */ - .nav-direct { background-color: @nav_direct_background; margin-top: -1px; diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less index 211dea3..1e16a28 100755 --- a/css/area_nav-metabox.less +++ b/css/area_nav-metabox.less @@ -1,26 +1,28 @@ /** * This file provides the design styles for the metatabbox - * - * @author Jana Deutschlaender */ - #spr__meta-box { .display-flex(); .flex-direction(); .justify-content(flex-end); + clear: none; + display: block; position: relative; - z-index: 10; float: right; + + box-sizing: border-box; max-width: 40%; - margin-top: -(@page_padding-top); // reverse padding-top of .page container - margin-right: -1px; + padding-bottom: 0.5rem; + height: 4rem !important; + + color: var(--color-foreground); // >= 1024 @media @screen_min-md { height: @page-header_height; - border: 1px solid transparent; + border: 0 none; } // < 1024 @@ -29,13 +31,34 @@ top: .2rem; right: auto; float: none; - display: block; max-width: 100%; min-height: @page-header_height; height: auto; border: 0 none; } + &.sticky { + position: fixed; + top: 0; + + ul.meta-tabs > li > a { + border-top-color: var(--color-background); + border-bottom-color: var(--color-shade-4); + border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius; + + } + + .meta-content .tab-pane.active { + max-height: 80vh; + overflow: auto; + } + } + + + .msg-area + a { + clear: right; + margin-top: 20px; + } + .tab-container { display: table; @@ -52,7 +75,7 @@ } -/* + + + + + tab controlls + + + + + */ + /* + + + + + tab controls + + + + + */ ul.meta-tabs { list-style: none; line-height: 160%; @@ -98,31 +121,23 @@ position: relative; display: block; font-size: @font-size-small; - line-height: 1.42857143; - transition: @transition background-color, @transition border-color, @transition color; - - @media @screen_min-md { - background-color: @ini_background_site; - border: 1px solid @noopentasks-border; - 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 - color: @ini_nav_menu_color; - margin-left: 4px; - padding: .3em 1rem .1em; - } + transition: var(--transition-glow); + background-color: var(--color-shade-1); + border: solid 0.1em transparent; + border-radius: 0.5rem; + color: var(--color-foreground); + padding: .25em; + margin-left: 0; @media @screen_max-md { top: 0; - border: 1px solid @ini_existing; - color: @ini_existing; margin-top: .2rem; - margin-left: 0; - padding: .2em .3rem; } * { cursor: pointer; color: inherit; + font-size: inherit; } .prefix { @@ -135,44 +150,22 @@ &:focus, &:active { text-decoration: none; - - @media @screen_min-md { - background-color: @ini_background; - border-color: @ini_existing; - color: @ini_existing; - } - - @media @screen_max-md { - background-color: @ini_existing; - border-color: @ini_background; - color: @ini_background; - } + background-color: transparent; + border-color: var(--color-glow-secondary); + color: var(--color-glow-secondary); + filter: var(--filter-glow-secondary); } } &.active { - z-index: 1; - > a { cursor: default; - background-color: @ini_background; - border-color: @ini_existing; - border-bottom-color: @ini_background; - color: @ini_existing; - - @media @screen_max-md { - background-color: @ini_existing; - border-bottom-color: @ini_existing; - border-radius: 0; - color: @ini_background; - } } } } } - -/* + + + + + toggle content + + + + + */ + /* + + + + + toggle content + + + + + */ .meta-content { margin-top: -1px; @@ -187,24 +180,24 @@ right: 0; display: none; width: 100%; - background-color: @ini_background; - border: 1px solid @ini_existing; + background-color: var(--color-shade-1); + border: solid .1em transparent; + border-radius: 0.5rem; @media @screen_min-xs { min-width: 20em; } @media @screen_min-md { - border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius + margin-top: 0.5rem; } &.active { display: block; - overflow: hidden; } a { - color: @ini_existing; + color: var(--color-foreground); } > div { @@ -222,11 +215,12 @@ ul { list-style: none; padding-left: 0; + } - li { - margin-left: 0; - padding-left: 1em; - } + li { + list-style-image: none; // overwrite universally styles + margin-left: 0; + padding-left: 1em; } } @@ -245,8 +239,10 @@ float: none; margin: 0; padding: .6rem .5rem .5rem .8rem; - background: transparent; - border: 0 none; + background-color: transparent; + color: var(--color-foreground); + border: solid .1em var(--color-shade-4); + border-radius: 0.5rem; h3 { display: none; @@ -280,7 +276,7 @@ width: 4px; height: 4px; overflow: hidden; - background-color: @ini_existing; + background-color: var(--color-shade-4); } } } @@ -292,8 +288,113 @@ } } - + .msg-area + a { - clear: right; - margin-top: 20px; + /* + + + + + tab issues + + + + + */ + #spr__tab-issues { + ul.mmissuelist { + padding-left: 0; + margin-top: 1rem; + + li { + &.noissue { + font-size: @font-size-small; + list-style-type: none; + margin-left: 0; + + .li { + font-size: @font-size-small; + margin-left: .5rem; + } + } + + a { + display: inline-block; + } + } + + img { + vertical-align: bottom; + margin-right: .3rem; + } + + .mm__status { + padding-left: .3rem; + padding-right: .3rem; + } + + form { + vertical-align: text-top; + } + } + } + + /* + + + + + tab issues + + + + + */ + /* see plugins/magic-matcher.less */ + #spr__tab-issues { + ul.mmissuelist { + padding-left: 0; + margin-top: .5rem; + margin-bottom: .6rem; + + li { + list-style-type: none; + margin-top: .3rem; + margin-left: .5rem; + + &.noissue { + list-style-type: none; + margin-left: 0; + } + } + + a { + display: inline-block; + font-size: @font-size-small; + + * { + font-size: inherit; + } + } + + img { + vertical-align: bottom; + margin-right: .3rem; + } + + .mm__status { + display: inline-block; + text-decoration: none; + padding-left: .3rem; + padding-right: .3rem; + } + + form { + vertical-align: text-top; + + button { + background: @ini_button_background; + border-color: @ini_button_background; + color: @ini_button_color; + font-size: @font-size-small; + padding: .2em .3em; + + &[name="removeIssue"] { + min-width: 20px; + font-size: .94rem; + font-weight: bold; + line-height: 95%; + text-align: center; + padding: 0 .1rem .1rem; + margin-left: .5rem; + } + + &:hover, + &:focus, + &:active { + background: @ini_button_color; + color: @ini_button_background; + } + } + } + } } } diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less index b7ab433..2d24c75 100644 --- a/css/area_nav-page-attributes.less +++ b/css/area_nav-page-attributes.less @@ -1,75 +1,54 @@ /** * Page Attribute Icons in the breadcrumb bar */ - - -/* + + + + + icons in breadcrumb area + + + + + */ - .page-attributes { list-style: none; float: right; - display: inline-block; - max-width: 30%; - margin: -.45em 0 0; + margin: -.45em 0 0; // FIXME sourrounding CSS should be fixed so negative margin is not needed padding: 0; - - @media @screen_max-xs { - max-width: 90%; - } + display: flex; + gap: 0.5rem; > li { - .btn-usertools-wrapper(); // uniform li - .btn-usertools-num(); - + margin: 0; + padding: 0; + border: 1px solid @wikiicons-border; + border-radius: @ini_default_border_radius; position: relative; - float: left; - display: block; - width: auto; - min-height: @toggle-size; - text-align: center; - margin: 0 .25rem; + display: flex; + align-items: center; + justify-content: center; + transition: @transition background-color, @transition border-color, @transition color; - strong { + // override any plugin element styles + * { + margin: 0; + padding: 0; + line-height: normal; display: block; - min-height: 1.64rem; - border: 1px solid @wikiicons-border; - border-radius: @ini_default_border_radius; } - a { - display: block; - width: auto; - min-height: 1.64rem; - background-color: @ini_nav_menu_hover_bg; - border: 1px solid @wikiicons-border; - border-radius: @ini_default_border_radius; - transition: @transition background-color, @transition border-color, @transition color; + // number badge + .btn-usertools-num(); - &:hover, - &:focus, - &:active { - background-color: @ini_nav_menu_hover_color; - border-color: @ini_nav_menu_hover_color; - color: @ini_nav_menu_hover_bg; + // icon + svg { + height: 1.5em; + width: 1.5em; - span { - fill: @ini_nav_menu_hover_bg; - color: @ini_nav_menu_hover_bg; - } + path { + fill: @ini_nav_menu_color; } } - .prefix { - .btn-prefix(.26rem); - .icon-clipboard(); + // adjust colors on hover + &:hover { + background-color: @ini_nav_menu_hover_color; + border-color: @ini_nav_menu_hover_color; - display: block; - font-size: 1.2rem; - line-height: 1; - } - - .num { - top: -.6em; + svg path { + fill: @ini_nav_menu_hover_bg; + } } } } diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less index d86af60..7172ae1 100755 --- a/css/area_nav-pagetools.less +++ b/css/area_nav-pagetools.less @@ -1,7 +1,5 @@ /** * This file provides the design styles for the page specific tool bar. - * - * @author Jana Deutschlaender */ /* @@ -30,8 +28,15 @@ nav#dokuwiki__pagetools { @toolbox-size: 30px; + @page-tools_svg-size: 25px; + @page-tools_svg-space: (@toolbox-size - @page-tools_svg-size) / 2; + @item-width: (@page-tools_svg-size + @page-tools_svg-space + @page-tools_svg-space); + @item-height: (@page-tools_svg-size + @page-tools_svg-space); + top: 3.05rem; - z-index: 100; + position: absolute; + + width: @item-width; @media @screen_min-md { right: -2.5rem; @@ -41,24 +46,40 @@ nav#dokuwiki__pagetools { right: 8px; } - ul { - li { - @page-tools_svg-size: 25px; - @page-tools_svg-space: (@toolbox-size - @page-tools_svg-size) / 2; + @media @screen_max-xxs { + display: none; + } + div.tools { + position: fixed; + width: @item-width; + } - * { - font-size: @font-size-default; - } + ul { + position: absolute; + right: 0; + text-align: right; + margin: 0; + padding: 0; + /* add transparent border to prevent jumping when proper border is added on hover */ + border: 1px solid transparent; + + li { + padding: 0; + margin: 0; + list-style: none; a { - .fontello-double(); + display: inline-table; + /* add transparent border to prevent jumping when proper border is added on focus */ + border: 1px solid transparent; + white-space: nowrap; + vertical-align: middle; + height: @item-height; position: relative; - height: auto; - min-height: @toolbox-size; // for nav:hover - width: @toolbox-size; // for nav:hover + line-height: 20px; font-size: @font-size-default; - padding: 2px @toolbox-size 2px 2px; + padding: 2px 0 2px 2px; @media @screen_min-md { color: @ini_nav_menu_color; @@ -68,10 +89,6 @@ nav#dokuwiki__pagetools { color: @ini_existing; } - * { - color: inherit; - } - &::before { display: none; } @@ -82,6 +99,25 @@ nav#dokuwiki__pagetools { background-color: transparent; } + &:focus { + box-shadow: none; + background-image: none; + color: var(--color-glow-primary); + transition: var(--transition-glow); + filter: var(--filter-glow-primary); + + span { + position: relative; + display: inline; + width: auto; + height: auto; + } + + svg { + fill: var(--color-glow-primary); + } + } + span { .sr-only(); @@ -96,14 +132,7 @@ nav#dokuwiki__pagetools { vertical-align: middle; border: solid 1px transparent; margin: @page-tools_svg-space; - - @media @screen_min-md { - fill: @ini_nav_menu_color; - } - - @media @screen_max-md { - fill: @ini_existing; - } + fill: var(--color-foreground); } &.top { @@ -116,33 +145,37 @@ nav#dokuwiki__pagetools { &:hover { ul { box-shadow: @box-shadow; // @box-shadow-offset; - background-color: @ini_background; - border-color: @wikiicons-border; + background-color: var(--color-shade-1); + border-color: var(--color-shade-4); + border-radius: 0.5rem; li { - color: @ini_existing; + color: var(--color-foreground); a { box-shadow: none; background-image: none; border-color: transparent; color: inherit; - padding: 2px 0 2px 2px; svg { border: solid 1px transparent; border-radius: @ini_default_border_radius; - fill: @ini_existing; + fill: var(--color-foreground); transition: @transition background-color, @transition border-color, @transition fill; } &:hover, &:focus, &:active { + color: var(--color-glow-primary); + transition: var(--transition-glow); + filter: var(--filter-glow-primary); + svg { - background-color: @ini_existing; - border-color: @ini_existing; - fill: @ini_background; + background-color: transparent; + border: none; + fill: var(--color-glow-primary); } } diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less index 26f5a1a..2762329 100755 --- a/css/area_nav-usertools.less +++ b/css/area_nav-usertools.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the direct / menu jump links. - * - * @author Jana Deutschlaender */ - #dokuwiki__usertools.nav-usertools { @media @screen_min-md { right: 1.25rem; @@ -26,30 +23,43 @@ } } - -/* + + + + + icon list + + + + + */ + /* + + + + + icon list + + + + + */ ul { float: right; padding: 0; margin: (@very-small-spacing * 2) -.25rem 0 0; + @media @screen_max-md { + margin-right: .5rem; + } + + @media @screen_max-xxs { + margin-right: -.3rem; + } + li { .btn-usertools-wrapper(); // uniform li .btn-usertools-num(); float: right; - min-height: 28px; @media @screen_max-xs { display: block; float: none; + margin-bottom: @headericons-margin-xxs; } + @media @screen_max-xxs { + margin-bottom: (@headericons-margin-xxs - .2); + display: none; + } + > span, > a { display: block; width: auto; + min-width: (@toggle-size + .25); min-height: @toggle-size; overflow: hidden; border: 1px solid @wikiicons-border; @@ -60,55 +70,26 @@ @media @screen_md-xlg { padding-top: .14rem; } - - @media @screen_max-xxlg { - min-height: 28px; - } - - @media @screen_max-md { - min-height: @toggle-size; - } - - @media @screen_only-lg { - min-width: 2rem; - } } + /* !!! &.user-task FIND in plugins/do_tasks.less !!! */ &.user { - @space-min-xxlg: .35rem; - @space-max-xxlg: .4rem; - @space-max-xlg: .5rem; - @space-max-md: .35rem; - position: relative; display: table-cell; - background-color: @ini_background_site; - border: solid 1px @wikiicons-border; // @ini_border_light; + background-color: var(--color-shade-1); + border: solid 1px var(--color-shade-2); border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @ini_text_webframe; + color: var(--color-foreground); padding-right: .3rem; - @media @screen_min-xxlg { - padding-top: @space-min-xxlg; - } - - @media @screen_max-xxlg { - padding-top: @space-max-xxlg; - } - - @media @screen_max-xlg { - padding-top: @space-max-xlg; - } - @media @screen_max-md { min-height: @toggle-size; - padding-top: @space-max-md; } @media @screen_max-xs { position: absolute; top: @headericons-margin-xxs; - right: (@toggle-size + @headericons-margin-xxs); + right: (@toggle-size + @headericons-margin-xxs + 1); // 1.75rem + 1 + (button login/out margin-right) overflow: hidden; white-space: nowrap; margin: -1px 0 0; @@ -116,6 +97,7 @@ @media @screen_max-xxs { left: -10px; + right: 0; width: auto; } @@ -124,40 +106,37 @@ .align-items(); position: relative; - min-height: 26px; height: 1rem; // for IE11 overflow: visible; - background: @ini_nav_menu_hover_bg; // for removing bg-image + background: var(--color-shade-1); // for removing bg-image border: 0 none; - color: @ini_nav_menu_hover_color; + color: var(--color-foreground); text-indent: 0; font-size: inherit; margin-right: -.3rem; padding: 0 .2em 0 0; - @media @screen_only-xlg { - padding-bottom: .1em; - } - @media @screen_min-xxlg { - margin-top: -(@space-min-xxlg); + min-height: (@toggle-size - .1); + margin-top: -.4rem; } @media @screen_max-xxlg { - margin-top: -(@space-max-xxlg); - } - - @media @screen_max-xlg { - margin-top: -(@space-max-xlg); + min-height: (@toggle-size - .15); + margin-top: -.35rem; } @media @screen_max-md { min-height: (@toggle-size - .1); - margin-top: -(@space-max-md); + margin-top: -.35rem; } - @media @screen_max-xxs { - min-height: (@toggle-size - .15); + @media @screen_max-sm { + margin-top: -.35rem; + } + + @media @screen_max-xs { + margin-top: -.4rem; } &::before { @@ -168,7 +147,7 @@ right: -1px; width: auto; opacity: 0; - border: solid 1px @ini_nav_menu_hover_color; + border: solid 1px var(--color-shade-2); border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius color: inherit; transform: none; @@ -177,12 +156,15 @@ &:hover, &:focus, &:active { - background-color: @ini_nav_menu_hover_color; - border-color: @ini_nav_menu_hover_color; - color: @ini_nav_menu_hover_bg; + background-color: transparent; + color: var(--color-glow-secondary); + filter: var(--filter-glow-secondary); + transition: var(--transition-glow); &::before { opacity: 1; + filter: var(--filter-glow-secondary); + border-color: var(--color-glow-secondary); } bdi, @@ -207,43 +189,61 @@ &::before { position: absolute; + top: 2px; left: -2px; - font-size: 1.4rem; + font-size: @font-size-default + (@font-scale-factor * 4); margin: 0; - - @media @screen_min-xxlg { - top: -.25rem; - } - - @media @screen_max-xxlg { - top: -.2rem; - } - - @media @screen_max-xs { - top: -.25rem; - - } } } } // user } // li + /* + + + icons + + + */ + .menuitem, button { + padding: 2px 0 0 2px; + min-height: @toggle-size; // overrides button[type="submit"] styles + background-color: var(--color-shade-1); + color: var(--color-foreground); + border: solid 1px var(--color-shade-2); // overrides button[type="submit"] styles + .btn-hover(); -/* + + + icons + + + */ - a { + &:hover, + &:active, + &:focus { + background-color: transparent; + border-color: var(--color-glow-secondary); + color: var(--color-glow-secondary); + filter: var(--filter-glow-secondary); + } + + &:hover svg, + &:active svg, + &:focus svg { + transition: @transition fill; + fill: var(--color-glow-secondary); + } + + svg { + fill: var(--color-shade-1); + height: @font-size-default + (@font-scale-factor * 4); + } + + span { + display: none; + } + } + + a { // Pre-Greebo backwards compatibility, remove after transitioning to Greebo .fontello(); .hide-text-show-before(); .btn-hover(); + background-color: var(--color-shade-1); cursor: pointer; position: relative; line-height: 1; text-decoration: none; - @media @screen_md-xlg { - min-width: 2rem; - } - &::before { .center-middle(); @@ -281,4 +281,72 @@ } } // a } // ul -} // nav-usertools \ No newline at end of file +} // nav-usertools + +/* + + + + + layout option compact + + + + + */ +.header-compact { + #dokuwiki__usertools.nav-usertools { + + // mobile + @media @screen_max-md { + left: 6rem; + + ul { + overflow: hidden; + + li.user { + color: var(--color-background); + + bdi { + position: absolute; + width: 0; + padding: 0; + text-indent: -10000px; + + &:before { + transition: @transition background-color; + background-color: var(--color-shade-1); + color: var(--color-foreground); + text-indent: 0; + } + } + + > a { + padding: 0 .2em; + color: @ini_nav_menu_hover_bg; + + bdi { + &:before { + background-color: var(--color-shade-1); + color: var(--color-foreground); + } + } + + &:hover { + color: var(--color-glow-secondary); + + bdi { + &:before { + background-color: transparent; + color: var(--color-glow-secondary); + } + } + } + } + + bdi + bdi { + display: none; + } + } + } + } + + @media @screen_max-sm { + ul li { + position: static; + float: right; + top: 0; right: 0; + } + } + } +} diff --git a/css/area_recent.less b/css/area_recent.less index 0722639..9583da8 100644 --- a/css/area_recent.less +++ b/css/area_recent.less @@ -1,24 +1,23 @@ /** * This file provides the design styles for page revisions - * - * @author Jana Deutschlaender */ - .dokuwiki { -/* + + + + + list of changes + + + + + */ + /* + + + + + list of changes + + + + + */ form.changes { li { .sizechange { color: @color-editBox; &.positive { - background-color: #cfc; + background-color: var(--color-success); + color: var(--color-background); } &.negative { - background-color: #fdd; + background-color: var(--color-error); + color: var(--color-foreground); } } } @@ -59,8 +58,7 @@ } } - -/* + + + + + view of differents + + + + + */ + /* + + + + + view of differents + + + + + */ a.difflink { color: @ini_existing; @@ -71,11 +69,10 @@ .diffnav { a { - background-color: @ini_background_site; - border: solid 1px @ini_background_site; - border-radius: @ini_default_border_radius; - color: @ini_nav_menu_color; - transition: @transition background-color, @transition color, @transition border-color; + background-color: var(--color-background); + border: solid 1px var(--color-background); + border-radius: 0.5rem; + color: var(--color-foreground); &::before { background-color: inherit; @@ -86,9 +83,11 @@ &:hover, &:focus, &:active { - background-color: @ini_nav_menu_color; - border: solid 1px @ini_nav_menu_color; - color: @ini_background_site; + background-color: transparent; + border-color: var(--color-glow-primary); + color: var(--color-glow-primary); + transition: var(--transition-glow); + filter: var(--filter-glow-primary); &::before { background-color: inherit; @@ -99,10 +98,8 @@ } table.diff { - background-color: #fff; - border: solid 1px #fff; - border-top-width: 10px; - border-bottom-width: 10px; + background-color: var(--color-background); + border: none; &.diff_inline { border-top-width: 0; @@ -114,8 +111,8 @@ } th { - background-color: @ini_background; - color: @ini_text; + background-color: var(--color-background); + color: var(--color-foreground); padding-top: 10px; padding-bottom: 10px; @@ -125,30 +122,33 @@ } td { + background-color: transparent; + color: var(--color-text-1); + &.diff-blockheader { - background-color: #cfc; - color: @color-editBox; + background-color: transparent; + color: var(--color-foreground); } &.diff-context { - background-color: #eee; - color: @color-editBox; + background-color: transparent; + color: var(--color-text-1); } } .diff-addedline { - background-color: #cfc; - color: @color-editBox; + background-color: var(--color-success-highlight); + color: var(--color-foreground); strong { background-color: transparent; - color: #f00; + color: var(--color-success) !important; } } .diff-deletedline { - background-color: #fdd; - color: @color-editBox; + background-color: var(--color-error-highlight); + color: var(--color-foreground); * { color: inherit; @@ -156,8 +156,12 @@ strong { background-color: transparent; - color: #f00; + color: var(--color-error) !important; } } + + .diff-lineheader { + background-color: transparent; + } } } diff --git a/css/area_search.less b/css/area_search.less index 9fddb00..503570e 100644 --- a/css/area_search.less +++ b/css/area_search.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the search results - * - * @author Jana Deutschlaender */ - /* search hit in normal text */ .dokuwiki .search_hit { background-color: @ini_highlight; diff --git a/css/area_tabs.less b/css/area_tabs.less index 6574645..8b98f02 100644 --- a/css/area_tabs.less +++ b/css/area_tabs.less @@ -2,22 +2,28 @@ * This file provides styles for tab boxes */ - /* + + + + + tabs + + + + + */ - #dokuwiki__content { ul.tabs { li:not([class~="active"]) { strong, a { - color: @ini_text_neu; transition: @transition background-color, @transition color; } + a { + background-color: var(--color-shade-2); + color: var(--color-accent-1); + } + strong { + background-color: var(--color-shade-3); + color: inherit; + } + a:hover, a:focus, a:active { - color: @ini_text; + color: var(--color-accent-3); } } } diff --git a/css/area_togglelink.less b/css/area_togglelink.less index 816799e..9a12b47 100755 --- a/css/area_togglelink.less +++ b/css/area_togglelink.less @@ -1,63 +1,51 @@ /** * This file provides the design styles for the sidebar (navmain). - * - * @author Jana Deutschlaender */ - .togglelink { &.page_main-content { position: absolute; top: 0; bottom: -1px; width: 2rem; - left: -(@margin-default); - z-index: 1; + left: -(@margin-default + 0.25rem); @media @screen_max-md { display: none; } a { - .fontello-double(); - .icon-right-bold(); - .icon-left-bold(); - - .display-flex(); - .flex-direction(); - .justify-content(); + position: absolute; + inset: 0; width: @margin-default; height: 100%; - background-color: @ini_button_background; - border: solid 1px @ini_button_background; - border-radius: @ini_default_border_radius 0 0 @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - color: @ini_button_color; + background-color: transparent; + border: solid 1px var(--color-shade-4); + border-right-style: none; + border-radius: 0.5rem 0 0 0.5rem; + color: var(--color-shade-4); text-decoration: none; transition: @transition color, @transition background-color, @transition border-color; - &::before, - &::after { - width: 100%; - opacity: .6; - font-size: 1rem; - line-height: 1; - text-align: center; - margin: 0; - transition: @transition opacity; - } - &::before { - opacity: 1; - font-size: 1.25rem; + content: ''; + display: block; + position: absolute; + inset: 0.3rem; + mask-size: contain; + mask-position: center; + mask-repeat: no-repeat; + background-color: currentColor; + mask-image: url('img/arrow_left.svg'); + } &:hover, &:focus, &:active { - background-color: @ini_button_color; - border-color: @ini_button_background; - color: @ini_button_background; + border-color: var(--color-glow-primary); + color: var(--color-glow-primary); text-decoration: none; * { @@ -65,43 +53,24 @@ text-decoration: none; } - &::after { - opacity: 0; - } + filter: var(--filter-glow-primary); + transition: var(--transition-glow); + } } -/* + + + toggle out + + + */ + /* + + + toggle out + + + */ + .wide-content & { - left: -1px; + left: 0; a { - background-color: @ini_button_background; - border-color: @ini_button_background; - border-radius: 0 @ini_default_border_radius @ini_default_border_radius 0; // @ini_default_border_radius vs. @fix_border-radius + border-radius: 0 0.5rem 0.5rem 0; + border-style: solid; + border-left-style: none; &::before { - opacity: .6; - font-size: 1rem; - } - - &::after { - opacity: 1; - font-size: 1.25rem; - } - - &:hover, - &:focus, - &:active { - background-color: @ini_button_color; - - &::before { - opacity: 0; - } - - &::after { - opacity: 1; - } + mask-image: url('img/arrow_right.svg'); } } } diff --git a/css/base.less b/css/base.less index e757f62..5b50fb6 100755 --- a/css/base.less +++ b/css/base.less @@ -1,20 +1,17 @@ /** - * This file provides the basic vars and reset styles. - * - * @author Jana Deutschlaender + * This file provides the basic/reset styles. */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* global vars */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@font_family_screen: "Athiti", ui-sans, sans-serif; +@font_family_print: "Athiti", ui-sans, sans-serif; -@font_family_screen: arial, sans-serif; -@font_family_print: "Times New Roman", serif; - -@nav_direct_background: @ini_background; +@nav_direct_background: var(--color-background); @nav_direct_color: @ini_existing; +@background_darker: rgba(230,230,230, .2); @ini_sidebar_width: (100 - @ini_site_width) - 4; @height-context-bar: 50px; @@ -22,6 +19,7 @@ @margin-small: 1rem; @margin-default: 2rem; @margin-big: 3.07rem; +@nav-margin: 1.3rem; @small-spacing: .3rem; @very-small-spacing: .2rem; @@ -37,12 +35,10 @@ @box-shadow-right-bottom: .1em .3rem .5em rgba(153,153,153,.5); @box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor - /* + + + for programmers customizing + + + */ +@fix_border-radius: 0.5rem; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg -@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.47rem; // shown sidebar after toggle @headericons-margin-xxs: .45rem; // screen xxs margin-top for header icons @@ -55,35 +51,29 @@ @code-background: #F6F6F6; /* code, pre, samp, kbd */ - /* icons */ @noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude */ @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 */ @menu-margin-lg: 1.3rem; @quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */ @suggestion-zebra: #EEE; - /* edit mode */ @highlight-odd-ini_text: fade(@ini_background, 95%); @highlight-even-ini_text: fade(@ini_text, 5%); -@color-editBox: #252525; // editmode for tables, revision states - +@color-editBox: var(--color-foreground); // editmode for tables, revision states //@nolinkedicon-ini_background: fade(@ini_background_site, 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; @@ -106,10 +96,9 @@ @font-size-head2: @font-size-default + (@font-scale-factor * 7); @font-size-head1: @font-size-default + (@font-scale-factor * 9); - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* breakpoints */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @break-min-xxs: 480; @break-max-xxs: (@break-min-xxs - 1); @@ -131,10 +120,9 @@ @break-min-xxlg: 1600; @break-max-xxlg: (@break-min-xxlg - 1); - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries for breakpoints */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)"; @screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)"; @@ -162,10 +150,9 @@ @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)"; - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* col width */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @c12: 100%; @c11: 91.66666667%; @c10: 83.33333333%; @@ -182,10 +169,104 @@ @grid-columns: 12; + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* fonts */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + +@font-face { + font-family: "Athiti"; + font-weight: 700; + src: url("fonts/athiti/Athiti-Bold.woff2") format("woff2"); +} + +@font-face { + font-family: "Athiti"; + font-weight: 600; + src: url("fonts/athiti/Athiti-SemiBold.woff2") format("woff2"); +} + +@font-face { + font-family: "Athiti"; + font-weight: 500; + src: url("fonts/athiti/Athiti-Medium.woff2") format("woff2"); +} + +@font-face { + font-family: "Athiti"; + font-weight: 400; + src: url("fonts/athiti/Athiti-Regular.woff2") format("woff2"); +} + +@font-face { + font-family: "Athiti"; + font-weight: 300; + src: url("fonts/athiti/Athiti-Light.woff2") format("woff2"); +} + +@font-face { + font-family: "Athiti"; + font-weight: 200; + src: url("fonts/athiti/Athiti-ExtraLight.woff2") format("woff2"); +} + +@font-face { + font-family: "Departure Mono"; + src: url("fonts/departuremono/DepartureMono-Regular.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 100; + src: url("fonts/argonglow/ArgonGlow-Thin.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 200; + src: url("fonts/argonglow/ArgonGlow-ExtraLight.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 300; + src: url("fonts/argonglow/ArgonGlow-Light.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 400; + src: url("fonts/argonglow/ArgonGlow-Regular.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 500; + src: url("fonts/argonglow/ArgonGlow-Medium.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 600; + src: url("fonts/argonglow/ArgonGlow-SemiBold.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + font-weight: 700; + src: url("fonts/argonglow/ArgonGlow-Bold.woff2") format("woff2"); +} + +@font-face { + font-family: "Argon Glow"; + src: url("fonts/argonglow/ArgonGlow-VariableVF.woff2") format("woff2"); + font-weight: 100 900; +} + + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* all media */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - html, body { .reset(); @@ -197,18 +278,6 @@ header, .elementsReset(); } -div, span, object, -h1, h2, h3, h4, h5, h6, p, blockquote, -a, abbr, em,acronym, img, strong, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -input, select, option, textarea, button { - font-size: 1rem; - line-height: 100%; -} - - ol, ul { list-style: none outside none; @@ -269,10 +338,9 @@ nav > ul { } } - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* css behaviour */ - +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ .sr-out { .sr-out(); } @@ -314,12 +382,303 @@ nav > ul { } } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* variables */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + +:root { + --color-neutral-50: #F2F0F5; + --color-neutral-100: #D1C6E0; + --color-neutral-200: #B2A0CB; + --color-neutral-300: #957EB5; + --color-neutral-400: #7A60A0; + --color-neutral-500: #61468B; + --color-neutral-600: #4B3176; + --color-neutral-700: #371F60; + --color-neutral-800: #26114B; + --color-neutral-900: #180736; + --color-neutral-950: #0C011F; + --color-argon-50: #E1ABC9; + --color-argon-100: #DA87B5; + --color-argon-200: #D464A1; + --color-argon-300: #CD448F; + --color-argon-400: #C6257D; + --color-argon-500: #B0166F; + --color-argon-600: #9A0A61; + --color-argon-700: #830755; + --color-argon-800: #6D0449; + --color-argon-900: #56023C; + --color-argon-950: #3F012D; + --color-krypton-50: #B2D9EA; + --color-krypton-100: #8CC9E4; + --color-krypton-200: #69BADE; + --color-krypton-300: #4BADD8; + --color-krypton-400: #2493C2; + --color-krypton-500: #167FAC; + --color-krypton-600: #0A6C96; + --color-krypton-700: #075C81; + --color-krypton-800: #044C6B; + --color-krypton-900: #023C55; + --color-krypton-950: #012C3F; + --color-green-50: #C0F49A; + --color-green-100: #A7E57A; + --color-green-200: #8FD75D; + --color-green-300: #7AC843; + --color-green-400: #66B92D; + --color-green-500: #54AA18; + --color-green-600: #47990F; + --color-green-700: #397E0A; + --color-green-800: #2B6206; + --color-green-900: #1F4703; + --color-green-950: #122B01; + --color-red-50: #E6AFAF; + --color-red-100: #DD9090; + --color-red-200: #D57272; + --color-red-300: #CC5757; + --color-red-400: #C33D3D; + --color-red-500: #BB2626; + --color-red-600: #B21010; + --color-red-700: #950808; + --color-red-800: #780404; + --color-red-900: #5C0202; + --color-red-950: #3F0101; + + --color-white: #FFFFFF; + + --color-dark-foreground: var(--color-neutral-50); + --color-dark-background: var(--color-neutral-950); + --color-dark-shade-1: var(--color-neutral-900); + --color-dark-shade-2: var(--color-neutral-800); + --color-dark-shade-3: var(--color-neutral-700); + --color-dark-shade-4: var(--color-neutral-600); + --color-dark-text-1: var(--color-neutral-200); + --color-dark-text-2: var(--color-neutral-300); + --color-dark-text-3: var(--color-neutral-400); + --color-dark-text-4: var(--color-neutral-500); + --color-dark-primary: var(--color-argon-400); + --color-dark-secondary: var(--color-krypton-300); + --color-dark-error: var(--color-red-500); + --color-dark-error-highlight: var(--color-red-950); + --color-dark-success: var(--color-green-500); + --color-dark-success-highlight: var(--color-green-950); + --color-dark-warning: #efb100; + --color-dark-highlight: #efb10060; + --color-dark-accent-1: #60a5f9; + --color-dark-accent-2: #d381f7; + --color-dark-accent-3: #ff7975; + + --color-light-foreground: var(--color-neutral-950); + --color-light-background: var(--color-neutral-50); + --color-light-shade-1: var(--color-neutral-100); + --color-light-shade-2: var(--color-neutral-200); + --color-light-shade-3: var(--color-neutral-300); + --color-light-shade-4: var(--color-neutral-400); + --color-light-text-1: var(--color-neutral-800); + --color-light-text-2: var(--color-neutral-700); + --color-light-text-3: var(--color-neutral-600); + --color-light-text-4: var(--color-neutral-500); + --color-light-primary: var(--color-argon-600); + --color-light-secondary: var(--color-krypton-500); + --color-light-error: var(--color-red-600); + --color-light-error-highlight: var(--color-red-50); + --color-light-success: var(--color-green-600); + --color-light-success-highlight: var(--color-green-50); + --color-light-warning: #d08700; + --color-light-highlight: #d0870060; + --color-light-accent-1: #303EC0; + --color-light-accent-2: #6c366c; + --color-light-accent-3: #932f0a; + + --color-cmyk-primary: var(--color-dark-primary); + --color-cmyk-secondary: var(--color-dark-secondary); + + --text-xs: 0.75rem; + --text-sm: 0.875rem; + --text-base: 1rem; + --text-lg: 1.125rem; + --text-xl: 1.25rem; + --text-2xl: 1.5rem; + --text-3xl: 1.875rem; + --text-4xl: 2.25rem; + --text-5xl: 3rem; + + --container-3xs: 16rem; + --container-2xs: 18rem; + --container-xs: 20rem; + --container-sm: 24rem; + --container-md: 28rem; + --container-lg: 32rem; + --container-xl: 36rem; + --container-2xl: 42rem; + --container-3xl: 48rem; + --container-4xl: 56rem; + --container-5xl: 64rem; + --container-6xl: 72rem; + --container-7xl: 80rem; +} + +.fnButton { + border-radius: 0.5rem; + background-color: var(--color-shade-1); + transition: background-color 150ms; + color: var(--color-foreground); + font-size: 1.2em; + border: solid 0.1em var(--color-shade-1); + transition-property: filter, border-color; + transition-duration: 200ms; + transition-timing-function: ease-out; + + &:hover, &.active{ + .fnActiveButton(); + } +} + +.fnButtonSecondary { + &:hover, &.active{ + .fnActiveButtonSecondary(); + } +} + +.fnActiveButton { + background-color: transparent; + border: solid 0.1em var(--color-glow-primary); + text-decoration: none; + color: var(--color-glow-primary); + filter: var(--filter-glow-primary); + transition: var(--transition-glow); +} + +.fnActiveButtonSecondary { + background-color: transparent; + border: solid 0.1em var(--color-glow-secondary); + text-decoration: none; + color: var(--color-glow-secondary); + filter: var(--filter-glow-secondary); + transition: var(--transition-glow); +} + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* screen only */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @media screen { + + .dark { + + --color-foreground: var(--color-dark-foreground); + --color-background: var(--color-dark-background); + --color-shade-1: var(--color-dark-shade-1); + --color-shade-2: var(--color-dark-shade-2); + --color-shade-3: var(--color-dark-shade-3); + --color-shade-4: var(--color-dark-shade-4); + --color-text-1: var(--color-dark-text-1); + --color-text-2: var(--color-dark-text-2); + --color-text-3: var(--color-dark-text-3); + --color-text-4: var(--color-dark-text-4); + --color-primary: var(--color-dark-primary); + --color-secondary: var(--color-dark-secondary); + --color-error: var(--color-dark-error); + --color-error-highlight: var(--color-dark-error-highlight); + --color-success: var(--color-dark-success); + --color-success-highlight: var(--color-dark-success-highlight); + --color-warning: var(--color-dark-warning); + --color-highlight: var(--color-dark-highlight); + --color-accent-1: var(--color-dark-accent-1); + --color-accent-2: var(--color-dark-accent-2); + --color-accent-3: var(--color-dark-accent-3); + + --filter-glow-primary: drop-shadow(0 0 0.0625em var(--color-white)) drop-shadow(0 0 0.125em var(--color-primary)) drop-shadow(0 0 0.25em var(--color-primary)); + --filter-glow-secondary: drop-shadow(0 0 0.0625em var(--color-white)) drop-shadow(0 0 0.125em var(--color-secondary)) drop-shadow(0 0 0.25em var(--color-secondary)); + --color-glow-primary: var(--color-white); + --color-glow-secondary: var(--color-white); + --transition-glow: filter 150ms cubic-bezier(0,1.7,1,-0.3) 50ms, + border-color 150ms cubic-bezier(0,1.7,1,-0.3) 50ms; + + @media (prefers-reduced-motion) { + --transition-glow: filter 150ms, border-color 150ms; + } + + .light-only { + display: none; + } + + .dark-only { + display: initial; + } + } + + .light { + --color-foreground: var(--color-light-foreground); + --color-background: var(--color-light-background); + --color-shade-1: var(--color-light-shade-1); + --color-shade-2: var(--color-light-shade-2); + --color-shade-3: var(--color-light-shade-3); + --color-shade-4: var(--color-light-shade-4); + --color-text-1: var(--color-light-text-1); + --color-text-2: var(--color-light-text-2); + --color-text-3: var(--color-light-text-3); + --color-text-4: var(--color-light-text-4); + --color-primary: var(--color-light-primary); + --color-secondary: var(--color-light-secondary); + --color-error: var(--color-light-error); + --color-error-highlight: var(--color-light-error-highlight); + --color-success: var(--color-light-success); + --color-success-highlight: var(--color-light-success-highlight); + --color-warning: var(--color-light-warning); + --color-highlight: var(--color-light-highlight); + --color-accent-1: var(--color-light-accent-1); + --color-accent-2: var(--color-light-accent-2); + --color-accent-3: var(--color-light-accent-3); + + --filter-glow-primary: drop-shadow(0 0 0.0625em var(--color-argon-400)); + --filter-glow-secondary: drop-shadow(0 0 0.0625em var(--color-krypton-400)); + --color-glow-primary: var(--color-argon-950); + --color-glow-secondary: var(--color-krypton-950); + --transition-glow: filter 150ms cubic-bezier(0, 2, 1, -0.7) 50ms, + border-color 150ms cubic-bezier(0, 2, 1, -0.7) 50ms; + + @media (prefers-reduced-motion) { + --transition-glow: filter 150ms, border-color 150ms; + } + + .light-only { + display: initial; + } + + .dark-only { + display: none; + } + } + + @media (prefers-color-scheme: dark) { + html { + .dark(); + + &:has(#themeLight:checked) { + .light(); + } + } + #themeToggleDark { + display: none !important; + } + } + + @media (prefers-color-scheme: light) { + html { + .light(); + + &:has(#themeDark:checked) { + .dark(); + } + } + #themeToggleLight { + display: none !important; + } + } + + + html { -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; @@ -348,9 +707,28 @@ nav > ul { display: none; } - a:active, - a:hover { - outline: 0; + a { + color: var(--color-accent-1); + text-decoration: underline; + + &:hover, + &:active, + &:focus { + color: var(--color-accent-3); + text-decoration: none; + } + + &:visited { + color: var(--color-accent-2); + text-decoration: underline; + + &:hover, + &:active, + &:focus { + color: var(--color-accent-3); + text-decoration: none; + } + } } abbr[title] { @@ -361,22 +739,6 @@ nav > ul { font-size: 80%; } - sub, - sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; - } - - sup { - top: -0.5em; - } - - sub { - bottom: -0.25em; - } - svg:not(:root) { overflow: hidden; } @@ -394,7 +756,7 @@ nav > ul { kbd, pre, samp { - font-family: monospace, monospace; + font-family: "Departure Mono", ui-monospace, monospace; font-size: 1em; } @@ -463,15 +825,13 @@ nav > ul { html, body { font-family: @font_family_screen; - color: @ini_text; + color: var(--color-foreground); } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* print only */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - @media print { body { font-size: 12pt; diff --git a/css/base_design.less b/css/base_design.less index 28155df..2dfc1f1 100755 --- a/css/base_design.less +++ b/css/base_design.less @@ -1,18 +1,14 @@ /** * This file provides the main design styles * across all template elements (typo, colors etc.) - * - * @author Jana Deutschlaender */ html, body { - background-color: @ini_background_site; + background-color: var(--color-background); } - /* highlight selected tool */ - .mode_admin a.action.admin, .mode_login a.action.login, .mode_register a.action.register, @@ -27,10 +23,23 @@ html, body { } .dokuwiki { + .tabs > ul li a, + ul.tabs li strong, + ul.tabs li a { + border-color: var(--color-shade-4); + } + ul.tabs::after { + border-color: var(--color-shade-4); + } + .page ol li, .page ul li, .aside ul li { - color: @ini_text; + color: var(--color-foreground); + + .li { + color: var(--color-foreground); + } } .pageId { @@ -45,7 +54,7 @@ html, body { font-size: @font-size-small; border: solid @ini_background_alt; border-width: 1px 1px 0; - background-color: @ini_background_site; + background-color: var(--color-background); color: @ini_text_alt; padding: .1em .35em; border-top-left-radius: 2px; @@ -59,7 +68,7 @@ html, body { clear: both; overflow: hidden; word-wrap: break-word; - background: @ini_background; + background: var(--color-background); color: inherit; padding: @page_padding-top @margin-default @margin-default; @@ -70,6 +79,10 @@ html, body { @media @screen_max-xs { padding-left: @margin-small; } + + @media @screen_max-xxs { + padding-right: @margin-small; + } } .content #dokuwiki__pagetools { @@ -84,6 +97,7 @@ html, body { } /* license note under edit window */ + div.license { font-size: @font-size-small; line-height: @line-height-default; @@ -153,64 +167,24 @@ h2 { font-size: @font-size-head2; margin: 0 0 @font-size-head2; padding-top: (@font-size-head2 / 2); - - .secedit + &, - div[class^="level"] + &, - .section_highlight &:first-child { - padding-top: 0; - } - - .section_highlight + & { - padding-top: (@font-size-head2 / 2); - } } h3 { font-size: @font-size-head3; margin: 0 0 @font-size-head3; padding-top: (@font-size-head3 / 2); - - .secedit + &, - div[class^="level"] + &, - .section_highlight &:first-child { - padding-top: 0; - } - - .section_highlight + & { - padding-top: (@font-size-head3 / 2); - } } h4 { font-size: @font-size-head4; margin: 0 0 @font-size-head4; padding-top: (@font-size-head4 / 2); - - .secedit + &, - div[class^="level"] + &, - .section_highlight &:first-child { - padding-top: 0; - } - - .section_highlight + & { - padding-top: (@font-size-head4 / 2); - } } h5 { font-size: @font-size-head5; margin: 0 0 @font-size-head5; padding-top: (@font-size-head5 / 2); - - .secedit + &, - div[class^="level"] + &, - .section_highlight &:first-child { - padding-top: 0; - } - - .section_highlight + & { - padding-top: (@font-size-head5 / 2); - } } h6 { @@ -218,16 +192,6 @@ h6 { font-weight: @font-weight-bold; margin: 0 0 @font-size-head6; padding-top: (@font-size-head6 / 2); - - .secedit + &, - div[class^="level"] + &, - .section_highlight &:first-child { - padding-top: 0; - } - - .section_highlight + & { - padding-top: (@font-size-head6 / 2); - } } p { @@ -342,9 +306,7 @@ small, } } - -/*____________ lists ____________*/ - +/* + + + lists + + + */ ul, ol { font-size: @font-size-default; @@ -422,22 +384,15 @@ ol ol ol ol ol { list-style-type: lower-roman; } - -/*____________ tables ____________*/ - +/* + + + tables + + + */ .dokuwiki { table.inline tr:hover { th { - background-color: fade(@ini_background_alt, 50%); + background-color: var(--color-shade-3); } td { - background-color: fade(@ini_background_alt, 80%); - color: @ini_text_alt; - - *:not(button,a) { - color: @ini_text_alt; - } + background-color: var(--color-shade-2); } } } @@ -446,7 +401,7 @@ table { border-collapse: collapse; empty-cells: show; border-spacing: 0; - border: 1px solid @ini_border; + border: 1px solid var(--color-shade-4); font-size: @font-size-default; line-height: 140%; } @@ -465,36 +420,24 @@ td { padding: .3em .5em; margin: 0; vertical-align: top; - border: 1px solid @ini_border; + border: 1px solid var(--color-shade-4); } th { font-weight: bold; - background-color: @ini_background_alt; - color: @ini_text_alt; + background-color: var(--color-shade-1); + color: var(--color-foreground); text-align: left; + + a { + color: @ini_link_alt; + } } [dir=rtl] th { text-align: right; } -a { - outline: none; - - &:link, - &:visited { - text-decoration: none; - color: @ini_link; // links to non wikipages (external links) - } - - &:hover, - &:focus, - &:active { - text-decoration: underline; - } -} - img { display: inline-block; border-width: 0; @@ -520,7 +463,7 @@ button img { hr { border-top: solid @ini_border; - border-bottom: solid @ini_background_site; + border-bottom: solid var(--color-background); border-width: 1px 0; height: 0; text-align: center; @@ -548,14 +491,13 @@ pre, code, samp, kbd { - font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace; + font-family: "Departure Mono", ui-monospace, monospace; /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */ font-size: @font-size-default; direction: ltr; text-align: left; - background-color: @code-background; - color: @noopentasks-color; - box-shadow: inset 0 0 .3em @noopentasks-border; + background-color: var(--color-shade-1); + color: var(--color-foreground); border-radius: @fix_border-radius; padding-left: @small-spacing; padding-right: @small-spacing; @@ -568,26 +510,11 @@ kbd { span { color: inherit; } - - a { - &:link, - &:visited { - color: inherit; - text-decoration: underline; - } - - &:hover, - &:focus, - &:active { - text-decoration: none; - } - } } pre { overflow: auto; word-wrap: normal; - border: 1px solid @noopentasks-border; font-size: @font-size-default; line-height: 140%; padding: .7em 1em; diff --git a/css/base_fontello-icons.less b/css/base_fontello-icons.less index bb31646..2bd1a37 100644 --- a/css/base_fontello-icons.less +++ b/css/base_fontello-icons.less @@ -1,10 +1,8 @@ /** * This file provides styles for web fonts and icon fonts - * - * @author Jana Deutschlaender + * (If you add new icons in the fontello set you have to add the icon class and associated character encoding here) */ - /* icon font */ .setIconFontFace('fontello','fontello'); @@ -12,12 +10,7 @@ .fontello(); } - /* + + + + + fontello codes + + + + + */ -/** - * If in the Fontello-Packet an icon is added, the code should be supplemented here: -*/ - .icon-emo-happy { &::before { content: '\e804'; } } /* '' */ .icon-emo-wink { &::before { content: '\e805'; } } /* '' */ .icon-emo-unhappy { &::before { content: '\e806'; } } /* '' */ @@ -94,7 +87,6 @@ /* + + + + + additional "after" for nav-pagetools + + + + + */ - .icon-pencil { &::before, &::after { content: '\e840'; } diff --git a/css/base_mixins.less b/css/base_mixins.less index e17ee37..e664bf3 100755 --- a/css/base_mixins.less +++ b/css/base_mixins.less @@ -1,14 +1,10 @@ /** * This file provides less mixins for all other style modules - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Fonts */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename) { @font-face { font-family: @fontFamily; @@ -102,11 +98,9 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Screenreader / Hide */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .sr-out() { display: block; width: 1px; @@ -140,19 +134,20 @@ } } - /* + + + + + small icon-buttons (breadcrumb, page-header) + + + + + */ .btn-hover { - background-color: @ini_nav_menu_hover_bg; - color: @ini_nav_menu_hover_color; - transition: @transition color, @transition background-color, @transition border-color; + background-color: var(--color-shade-1); + border-color: var(--color-shade-2); + color: var(--color-foreground); + transition: var(--transition-glow); &:hover, &:active, &:focus { - background-color: @ini_nav_menu_hover_color; - border-color: @ini_nav_menu_hover_color; - color: @ini_nav_menu_hover_bg; + background-color: transparent; + border-color: var(--color-glow-secondary); + color: var(--color-glow-secondary); + filter: var(--filter-glow-secondary); .prefix { color: inherit; @@ -288,10 +283,8 @@ -ms-flex-wrap: wrap; } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* positioning */ - .center-middle() { position: absolute; top: 50%; @@ -301,11 +294,9 @@ -webkit-transform: translateX(-50%) translateY(-50%); } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Screenreader / Hide */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .reset() { background: transparent; border: none 0; outline: 0; vertical-align: baseline; @@ -329,22 +320,42 @@ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Col Grid */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .make-grid(@class) { .float-grid-columns(@class); - .loop-grid-columns(@grid-columns, @class, width); + .grid-columns(1, @class, width); + .grid-columns(2, @class, width); + .grid-columns(3, @class, width); + .grid-columns(4, @class, width); + .grid-columns(5, @class, width); + .grid-columns(6, @class, width); + .grid-columns(7, @class, width); + .grid-columns(8, @class, width); + .grid-columns(9, @class, width); + .grid-columns(10, @class, width); + .grid-columns(11, @class, width); + .grid-columns(12, @class, width); } .float-grid-columns(@class) { - .col-@{class}-1, .col-@{class}-2, .col-@{class}-3, .col-@{class}-4, .col-@{class}-5, .col-@{class}-6, .col-@{class}-7, .col-@{class}-8, .col-@{class}-9, .col-@{class}-10, .col-@{class}-11, .col-@{class}-12 { + .col-@{class}-1, + .col-@{class}-2, + .col-@{class}-3, + .col-@{class}-4, + .col-@{class}-5, + .col-@{class}-6, + .col-@{class}-7, + .col-@{class}-8, + .col-@{class}-9, + .col-@{class}-10, + .col-@{class}-11, + .col-@{class}-12 { float: left; } } -.loop-grid-columns(@index, @class, @type) when (@index >= 0) { +// todo: no recusion - fix it !!! +.grid-columns(@index, @class, @type) { .calc-grid-column(@index, @class, @type); - // next iteration - .loop-grid-columns((@index - 1), @class, @type); } .calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) { diff --git a/css/base_structure.less b/css/base_structure.less index 1725630..344cfa4 100755 --- a/css/base_structure.less +++ b/css/base_structure.less @@ -1,14 +1,10 @@ /** * This file provides styles for the general layout structure. - * - * @author Jana Deutschlaender */ - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* Col Grid */ +/* col grid */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - .make-grid(xs); @media screen { @@ -17,15 +13,18 @@ } } +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* font sizing */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ @media @screen_min-xxs { html { - font-size: 114%; //16px + font-size: 100%; //16px } } @media @screen_min-xs { html { - font-size: 114%; //16px + font-size: 100%; //16px } } @@ -40,7 +39,6 @@ .make-grid(md); html { font-size: 87.5%; //14px - //font-size: 81.25%; //13px } } @@ -63,41 +61,87 @@ } } -/* + + + + + z-indeces + + + + + */ -@media @screen_min-md { +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* z-indices */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@media screen { .nav-direct p { - z-index: 1000; + z-index: 1000; // keyboard-navigation overlays always on top } .top-header { - z-index: 900; + z-index: 2; // put MagicMatcher-Dropdowns above .content and metabox-tabs } -/* if z-index is needed for .tools col, then use this: - - .tools .row > .col-xs-12 { - z-index: 5; // SPR-945 sometimes too small space for suggestionlist + #dokuwiki__aside div.nav a { + &:hover, &:focus, &:active { + z-index: 100; // show label/link above content on hover etc. + } } - .wide-content .tools .row > .col-xs-12 { - z-index: 1; + .qc-output { + z-index: 1; // put qc-output above meta-box } -*/ - .header .row > .col-xs-12 { - z-index: 2; + #spr__meta-box { + z-index: 10; // put meta-box above positioned content-elements such as aggregations, edit-buttons + ul.meta-tabs > li.active { + z-index: 1; // put the active tab above the meta-content in .tab-pane.active + } } + nav#dokuwiki__pagetools { + z-index: 100; // put labels of the pagetools above content on hover etc. + } + + #dokuwiki__detail .img-link a::before { + z-index: 2; // put 'view original file'-overlay above image + } + + /* plug-in do_tasks */ + .plugin__do_usertasks_list { + z-index: 200; // put tasks-list above pagetools + } + + /* plug-in editable */ + #dokuwiki__content.main-content div.editbutton_table { + z-index: 1; // for IE + } + + /* plug-in tabinclude */ + div#dwpl-ti-container li.dwpl-ti-tab div.selected { + z-index: 1; // put .slected tab above div.dwpl-ti-content-box + } +} + +@media @screen_min-md { + .wide-content .search.main-sidebar p.toggleSearch { + z-index: 1; // put search-toggle-button above #dw__search + } +} + +@media @screen_max-md { + body.show-mobile-sidebar #dokuwiki__aside { + z-index: 200; // mobile sidebar above all except nav-direct + } +} + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* screen sizing */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + +// >= 1024 +@media @screen_min-md { + .content .row > .col-xs-12 { - z-index: 3; border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius } .top-header { position: absolute; top: 0; - left: 0; - width: 100%; + right: 0; + width: 50%; } .header, @@ -127,6 +171,16 @@ } } + /* + + + + + layout option compact + + + + + */ + .header-compact { + .header { + .row > .col-xs-12 { + height: auto; + min-height: auto; + } + } + } + .tools { .row > .col-xs-12 { position: absolute; @@ -177,18 +231,17 @@ } } - +// > 1024 @media @screen_md-lg { .wide-content.showSidebar { .content { .row > .col-xs-12 { - margin-left: 2.1rem; + margin-left: 2.3rem; } } } } - @media @screen_max-md { .container { margin: 0 1.25rem; diff --git a/css/base_vars.less b/css/base_vars.less new file mode 100644 index 0000000..60c46f2 --- /dev/null +++ b/css/base_vars.less @@ -0,0 +1,165 @@ +/** + * This file provides the basic vars + */ + +@font_family_screen: arial, sans-serif; +@font_family_print: "Times New Roman", serif; + +@nav_direct_background: @ini_background; +@nav_direct_color: @ini_existing; + +@background_darker: rgba(230,230,230, .2); +@ini_sidebar_width: (100 - @ini_site_width) - 4; + +@height-context-bar: 50px; + +@margin-small: 1rem; +@margin-default: 2rem; +@margin-big: 3.07rem; +@nav-margin: 1.3rem; + +@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); // tabinclude +@box-shadow: 0 0 .5em rgba(153,153,153,.5); // pagetoolbox hover +@box-shadow-colored: 0 0 .5em fade(@ini_existing, 50%); +@box-shadow-right-bottom: .1em .3rem .5em rgba(153,153,153,.5); +@box-shadow-bottom: 0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* for programmers customizing */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@fix_border-radius: 3px; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg + +@toggle-showsidebar_width: 3.47rem; // 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-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 + +@code-background: #F6F6F6; /* code, pre, samp, kbd */ + +/* icons */ +@noopentasks-background: #ECECEC; /* metabox tabs + num in icons + tabinclude */ +@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 */ +@menu-margin-lg: 1.3rem; + +@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */ +@suggestion-zebra: #EEE; + +/* edit mode */ +@highlight-odd-ini_text: fade(@ini_background, 95%); +@highlight-even-ini_text: fade(@ini_text, 5%); +@color-editBox: #252525; // editmode for tables, revision states + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* fonts */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@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%; + +@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 * 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 */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@break-min-xxs: 480; +@break-max-xxs: (@break-min-xxs - 1); + +@break-min-xs: 768; +@break-max-xs: (@break-min-xs - 1); + +@break-min-sm: 992; +@break-max-sm: (@break-min-sm - 1); + +@break-min-md: 1024; +@break-max-md: (@break-min-md - 1); + +@break-min-lg: 1200; +@break-max-lg: (@break-min-lg - 1); + +@break-min-xlg: 1440; +@break-max-xlg: (@break-min-xlg - 1); + +@break-min-xxlg: 1600; +@break-max-xxlg: (@break-min-xxlg - 1); + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* media queries for breakpoints */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)"; +@screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)"; + +@screen_min-xs: ~"only screen and (min-width: " ~"@{break-min-xs}px)"; +@screen_max-xs: ~"only screen and (max-width: " ~"@{break-max-xs}px)"; + +@screen_min-sm: ~"only screen and (min-width: " ~"@{break-min-sm}px)"; +@screen_max-sm: ~"only screen and (max-width: " ~"@{break-max-sm}px)"; + +@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_min-lg: ~"only screen and (min-width: " ~"@{break-min-lg}px)"; +@screen_max-lg: ~"only screen and (max-width: " ~"@{break-max-lg}px)"; + +@screen_min-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px)"; +@screen_max-xlg: ~"only screen and (max-width: " ~"@{break-max-xlg}px)"; + +@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-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)"; + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* col width */ +/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ +@c12: 100%; +@c11: 91.66666667%; +@c10: 83.33333333%; +@c9: 75%; +@c8: 66.66666667%; +@c7: 58.33333333%; +@c6: 50%; +@c5: 41.66666667%; +@c4: 33.33333333%; +@c3: 25%; +@c2: 16.66666667%; +@c1: 8.33333333%; + +@grid-columns: 12; diff --git a/css/icons.less b/css/icons.less new file mode 100644 index 0000000..cc0087d --- /dev/null +++ b/css/icons.less @@ -0,0 +1,60 @@ + +i[data-icon] { + display: inline-block; + width: 1em; + height: 1em; + flex-shrink: 0; + position: relative; + box-sizing: content-box; + + &::before { + content: ''; + display: block; + width: 100%; + height: 100%; + mask-size: contain; + mask-position: center; + mask-repeat: no-repeat; + background-color: currentColor; + } + + &[data-icon='arrow-left']::before { + mask-image: url('img/arrow_left.svg'); + } + + &[data-icon='arrow-up']::before { + mask-image: url('img/arrow_up.svg'); + } + + &[data-icon='arrow-right']::before { + mask-image: url('img/arrow_right.svg'); + } + + &[data-icon='arrow-down']::before { + mask-image: url('img/arrow_down.svg'); + } + + &[data-icon='info']::before { + mask-image: url('img/info.svg'); + } + + &[data-icon='home']::before { + mask-image: url('img/home.svg'); + } + + &[data-icon='menu-small']::before { + mask-image: url('img/menu_small.svg'); + } + + &[data-icon='light']::before { + mask-image: url('img/lightbulb.svg'); + } + + &[data-icon='warning']::before { + mask-image: url('img/warning.svg'); + } + + &[data-icon='creature']::before { + mask-image: url('img/creature.svg'); + } +} \ No newline at end of file diff --git a/css/plugins/bureaucracy.less b/css/plugins/bureaucracy.less index 3ba0143..678e902 100755 --- a/css/plugins/bureaucracy.less +++ b/css/plugins/bureaucracy.less @@ -2,9 +2,7 @@ * This file provides styles for bureaucracy plugin */ - /* + + + + + global + + + + + */ - .dokuwiki form.bureaucracy__plugin { fieldset { width: 100%; @@ -57,7 +55,6 @@ span { float: left; - width: 50%; text-align: right; line-height: @line-height-default; padding-top: .2em; @@ -96,10 +93,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* min-width: 1440px */ - @media @screen_min-xlg { .dokuwiki form.bureaucracy__plugin { p { @@ -108,10 +103,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1439px */ - @media @screen_max-xlg { .dokuwiki form.bureaucracy__plugin { p, @@ -121,4 +114,3 @@ } } } - diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less index 97f6948..972744d 100644 --- a/css/plugins/configmanager.less +++ b/css/plugins/configmanager.less @@ -2,26 +2,173 @@ * This file provides styles for config manager */ - /* + + + + + config__manager + + + + + */ - #dokuwiki__content { #config__manager { + fieldset { + min-width: 100%; + overflow-x: auto; + box-sizing: border-box; + background-color: var(--color-background); + margin-left: 0; + margin-right: 0; + color: var(--color-foreground) + } + .selectiondefault { background-color: transparent; + color: inherit; } tr { + a { + color: var(--color-shade-4); + } + .input { background-color: transparent; color: inherit; } + + input, select, textarea { + background-color: var(--color-background); + color: var(--color-foreground); + } + + select.edit { + padding: 0 0.3em; + } + + &:hover { + td { + color: inherit; + } + } } tr.default { .input { background-color: transparent; } + + input, select, textarea { + background-color: var(--color-shade-1); + } + } + + td.label { + padding: .8em 0 1.2em 1em; + + span.outkey { + background-color: var(--color-background); + color: inherit; + font-size: (@font-size-small - .06); + font-weight: bold; + padding: 0 @very-small-spacing; + + a { + font-size: inherit; + } + } + + label { + line-height: @line-height-big; + } + } + } +} + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 1024px */ +@media @screen_max-md { + #dokuwiki__content { + #config__manager { + td { + &.label { + label, + span { + font-size: @font-size-small; + } + } + + &.label + td { + font-size: @font-size-small; + + span { + font-size: inherit; + } + } + + select, + input.edit { + font-size: @font-size-small; + } + } + + .selectiondefault { + label { + font-size: @font-size-small; + } + } + } + } +} + +/* + + + + + + + + + + + + + + + + + + + + + + + + + + */ +/* max-width: 768px */ +@media @screen_max-sm { + #dokuwiki__content { + #config__manager { + table { + border-top: 0 none; + } + + td { + padding-top: 0; + + &.label { + display: block; + width: 100%; + border: 0 none; + border-top: 1px solid @ini_border; + border-bottom: 0 none; + padding: .8em .5em .3em; + + + span.outkey { + margin-left: 0; + } + } + + .input { + width: 100%; + } + + + &.value, + &.label + td { + display: block; + width: 100%; + border: 0 none; + margin-bottom: 1.2rem; + } + + select, + input.edit { + width: 100%; + text-overflow: ellipsis; + } + } + + .selectiondefault { + float: none; + max-width: 100%; + width: auto; + + label { + width: 90%; + } + } } } } diff --git a/css/plugins/data.less b/css/plugins/data.less index 56b264a..561c488 100644 --- a/css/plugins/data.less +++ b/css/plugins/data.less @@ -1,48 +1,46 @@ /** - * This file provides styles for old data plugin + * This file provides styles for "data plugin" * after importing struct data this can be deleted */ - /* + + + + + global + + + + + */ - #dokuwiki__content { - .dataplugin_entry.mitarbeiter.sectionedit2 { + .dataplugin_entry { 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; + .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; + form { + button { + min-height: 1rem; + height: 1.8em; + background-color: var(--color-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; - } + &:hover, + &:focus, + &:active { + background-color: @ini_existing; + border-color: @ini_existing; + color: var(--color-background); } } } diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less index f9fbe34..2fa828b 100755 --- a/css/plugins/do_tasks.less +++ b/css/plugins/do_tasks.less @@ -2,66 +2,65 @@ * This file provides styles for do-task plugin */ -/* + + + + + global + + + + + */ - -ul.page-attributes { - .plugin_do_pagetasks { - position: relative; - border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius - - strong { - overflow: hidden; - background-color: @ini_background_site; - border-color: @noopentasks-border; - color: @ini_text_webframe; - } - - &.do_none { - .num { - background-color: @noopentasks-border; // fix - color: @noopentasks-color; // fix - } - } - } -} +/* + + + + + usertool icon in header + + + + + */ #dokuwiki__usertools.nav-usertools { ul { li { &.user-task { + .btn-usertools-wrapper(); + .btn-usertools-num(); + position: relative; - a { - overflow: visible; - white-space: normal; // Is this still needed? - text-indent: 0; + .plugin__do_usertasks { + width: 100%; + min-width: (@toggle-size + .25); + min-height: @toggle-size; + border-radius: @ini_default_border_radius; + border: 1px solid @wikiicons-border; + padding: .14rem 0 0 0; &::before { content: ''; // remove when fontello is removed from usertools } - } - svg { - width: 20px; - margin-top: 2px; + &:hover, + &:focus, + &:active { + background-color: @ini_nav_menu_hover_color; + border: none; - @media @screen_max-md { - margin-top: 4px; - } - } - - &:hover { - :not(.noopentasks) { svg path { - fill: @ini_background; + fill: @ini_nav_menu_hover_bg; } } } + button { + background-color: @ini_nav_menu_hover_bg; + } + + svg { + width: 1.2rem; + height: 1.2rem; // for IE 11 + margin-bottom: 2px; + + path { + fill: @ini_nav_menu_hover_color; + } + } + .noopentasks { - background-color: @ini_background; + span { + background-color: var(--color-background); border-color: @noopentasks-border; color: @ini_text_webframe; + } + + svg path { + fill: @ini_text_webframe; + } .num { background-color: @noopentasks-border; // fix @@ -70,7 +69,7 @@ ul.page-attributes { } } - @media @screen_max-sm { + @media @screen_max-xs { display: none; } } // user-task @@ -79,5 +78,19 @@ ul.page-attributes { } .plugin__do_usertasks_list { - z-index: 5; + background-color: transparent; + + @media @screen_max-sm { + right: 1.25rem !important; + left: 1.25rem !important; + } + + table.inline { + background-color: var(--color-background); + margin-top: .5rem; + + @media @screen_max-sm { + width: 100%; + } + } } diff --git a/css/plugins/edit.less b/css/plugins/edit.less index a07fe4a..b3092d7 100644 --- a/css/plugins/edit.less +++ b/css/plugins/edit.less @@ -1,42 +1,71 @@ /** * This file provides styles for the edit view (?do=edit), preview - * and section edit buttons. + * and "section edit button" and "editbutton_table edit button". */ - /* + + + + + edit view + + + + + */ - #dokuwiki__content { div.section_highlight { clear: right; - padding-top: 0 !important; // heredity + background: repeating-linear-gradient(-45deg, + var(--color-shade-1), + var(--color-shade-1) 10px, + var(--color-background) 10px, + var(--color-background) 20px,); + border-color: var(--color-background); } + // "section edit button" and "editbutton_table edit button" .secedit button { clear: both; font-size: 100%; margin-top: .5rem; margin-bottom: .5rem; + + &::after { + + } + + &:hover { + &::after { + border: none; + } + } } div.editBox { - background-color: #FFF; - border: solid 2px #FFF; + background-color: var(--color-background); + border: solid 2px var(--color-shade-4); + border-radius: @fix_border-radius; + padding: 0.5rem; .editButtons { display: inline-block; padding-bottom: 1rem; } - * { - &:not(button) { - color: @color-editBox; + @media @screen_max-xs { + div.summary { + label[for=edit__summary] { + white-space: normal; + display: block; + width: 100%; + + span { + display: inline-block; + padding-bottom: .4rem; + } + + input#edit__summary { + max-width: 100%; + box-sizing: border-box; + } + } } } } } - .mode_edit { .content { .msg-area { diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less index ea979c7..144270b 100644 --- a/css/plugins/edittable.less +++ b/css/plugins/edittable.less @@ -1,37 +1,59 @@ /** - * This file provides styles for qc edittable plugin + * This file provides styles for "edittable plugin" */ - /* + + + + + global + + + + + */ - #dokuwiki__content.main-content { + #edittable__editor { + th, + .handsontable th { + border-color: var(--color-shade-4); + background-color: var(--color-shade-1); + color: var(--color-foreground); + + &.ht__highlight { + background-color: var(--color-shade-2); + } + } + + td { + border-color: var(--color-shade-4); + background-color: var(--color-background); + color: var(--color-foreground); + + &.current { + background-color: var(--color-shade-1); + } + } + } + div.editbutton_table { position: relative; // for IE - z-index: 1; // for IE float: left; - margin-top: -1.46rem !important; // overwrite inline stales + margin-top: -1.4em !important; // overwrite inline styles form div.no { button, input.button { min-height: 1rem; - 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; + background-color: var(--color-shade-1); + border: solid 0.1em var(--color-shade-2); + border-radius: 0.5rem; + color: var(--color-foreground); font-size: @font-size-small; - margin-top: 0; - padding-right: .3em; - transition: @transition background-color, @transition border-color, @transition color; + margin: 0; + margin-top: 0.5rem; + padding: 0.2rem 0.4rem; + height: auto; &:hover, &:focus, &:active { - background-color: @ini_existing; - border-color: @ini_existing; - color: @ini_background; + background-color: transparent; + color: var(--color-glow-primary); + border-color: var(--color-glow-primary); + transition: var(--transition-glow); + filter: var(--filter-glow-primary); } } } diff --git a/css/plugins/extension__manager.less b/css/plugins/extension__manager.less index 3d3b80d..1199b74 100644 --- a/css/plugins/extension__manager.less +++ b/css/plugins/extension__manager.less @@ -2,18 +2,65 @@ * This file provides styles for extension manager */ - /* + + + + + global + + + + + */ +.dokuwiki { + #extension__manager { + .actions { + font-size: 0; -.dokuwiki #extension__manager { - .actions { - font-size: 0; + > button { + font-size: .92rem; + margin-left: .3rem; + padding-left: .3rem; + padding-right: .3rem; + } - > button { - font-size: .92rem; - margin-left: .3rem; - padding-left: .3rem; - padding-right: .3rem; + p.permerror { + @media @screen_max-md { + flex-direction: column; + } + + display: flex; + align-items: start; + gap: 0.5rem; + background: none; + + &::before { + content: ""; + flex-shrink: 0; + margin-top: 0.3em; + width: 1em; + height: 1em; + mask-size: contain; + mask-position: center top; + mask-repeat: no-repeat; + mask-image: url(img/warning.svg); + background-color: var(--color-warning); + } + } + } + + ul.tabs { + li.active { + a { + background-color: var(--color-shade-3); + color: var(--color-foreground); + border-color: var(--color-shade-4); + } + } + } + + .panelHeader { + background-color: var(--color-shade-2); + } + } + + #extension__list { + .extensionList { + + li { + color: var(--color-foreground); + } } } } diff --git a/css/plugins/fastwiki.less b/css/plugins/fastwiki.less new file mode 100644 index 0000000..c8f3016 --- /dev/null +++ b/css/plugins/fastwiki.less @@ -0,0 +1,7 @@ +/** + * This file provides styles for "fastwiki" plugin + */ + +.mode_edit .content .row > .col-xs-12 #dokuwiki__content::before { + display: none; +} diff --git a/css/plugins/folded.less b/css/plugins/folded.less index 0402618..660d4a5 100644 --- a/css/plugins/folded.less +++ b/css/plugins/folded.less @@ -2,9 +2,7 @@ * This file provides styles for the toggle "folded" */ - /* + + + + + global + + + + + */ - #dokuwiki__content { a.folder { background: transparent url("svg.php?svg=down.svg&f=existing") right center no-repeat; diff --git a/css/plugins/hightlight_parent.less b/css/plugins/highlight_parent.less similarity index 55% rename from css/plugins/hightlight_parent.less rename to css/plugins/highlight_parent.less index a59a4df..73822fb 100644 --- a/css/plugins/hightlight_parent.less +++ b/css/plugins/highlight_parent.less @@ -2,8 +2,17 @@ * This file provides styles for highlight plugin */ - /* + + + + + global + + + + + */ +#plugin__highlightparent { + clear: none; + display: block; + position: relative; + + + * { + clear: both; + padding-top: 1em; // as h1 + } +} @media @screen_max-md { #plugin__highlightparent { diff --git a/css/plugins/include.less b/css/plugins/include.less deleted file mode 100644 index f793a80..0000000 --- a/css/plugins/include.less +++ /dev/null @@ -1,33 +0,0 @@ -/** - * This file provides the main design styles - * across all template elements (typo, colors etc.) - * - * @author Jana Deutschlaender - */ - -#dokuwiki__content .plugin_include_content { - > h1, - > .section_highlight h1 { - padding-top: @font-size-head1; - } - > h2, - > .section_highlight h2 { - padding-top: @font-size-head2; - } - > h3, - > .section_highlight h3 { - padding-top: @font-size-head3; - } - > h4, - > .section_highlight h4 { - padding-top: @font-size-head4; - } - > h5, - > .section_highlight h5 { - padding-top: @font-size-head5; - } - > h6, - > .section_highlight h6 { - padding-top: @font-size-head6; - } -} diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less index 3b1687e..865897f 100755 --- a/css/plugins/magic-matcher.less +++ b/css/plugins/magic-matcher.less @@ -2,10 +2,8 @@ * This file provides styles for magic matcher plugin */ - /* + + + + + + + + + + + + + + + + + + + + + + + */ /* magic matcher bar with form on top of page */ - #spr__magic-matcher { position: fixed; top: 0; @@ -22,6 +20,10 @@ max-width: 50%; } + select[name="mmissues"] + div.chosen-container { + max-width: 67%; + } + button[name="toggleSuggestions"] { position: absolute; right: 0; @@ -44,12 +46,11 @@ #magicmatcher__context { position: relative; - z-index: 100; width: 100%; min-height: @height-context-bar; box-sizing: border-box; box-shadow: @box-shadow; - background-color: @ini_background; + background-color: var(--color-background); border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius; font-size: @font-size-default; padding: .8em 1em .5em; @@ -82,16 +83,6 @@ } } - -/* + + + + + in meta box + + + + + */ -#spr__tab-issues { - ul.mmissuelist { - padding-left: 0; - margin-top: 1rem; - } -} - - /* + + + + + in content + + + + + */ a.jiralink { font-size: @font-size-default; @@ -111,6 +102,58 @@ a.jiralink { } } +/* + + + + + tooltip in metabox + + + + + */ +.dokuwiki { + .serverToolTip { + box-shadow: @box-shadow; + border-radius: @fix_border-radius; + font-size: @font-size-default; + + h1.issueTitle { + font-size: @font-size-default; + } + + h2 { + font-size: @font-size-small; + } + + ul { + margin-top: @small-spacing; + } + + p, + li { + font-size: (@font-size-small - .06); + + * { + font-size: inherit; + } + } + + p { + margin-top: @small-spacing; + margin-bottom: @small-spacing; + } + + .components { + .component { + font-size: (@font-size-small - .06); + } + } + + .labels { + .label { + font-size: (@font-size-small - .06); + } + } + + .descriptionTeaser { + font-size: (@font-size-small - .06); + margin-top: (@small-spacing * 2); + margin-bottom: (@small-spacing * 2); + } + } +} /* + + + + + no js version + + + + + */ .no-js { @@ -119,10 +162,29 @@ a.jiralink { } } +.do-admin #dokuwiki__content { + #magicmatcher__repoadmin, + #magicmatcher_adminimport { + .tabs li { + a { + cursor: pointer; + } + &.active { + a { + cursor: default; + } + } + } + + .service_wrapper > a{ + display: inline-block; + margin-top: 20px; + } + } +} /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* max-width: 1023px */ - @media @screen_max-lg { #spr__magic-matcher { #magicmatcher__context { @@ -143,14 +205,11 @@ a.jiralink { } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* print */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - @media print { #spr__magic-matcher { display: none; } } - diff --git a/css/plugins/mediamanager.less b/css/plugins/mediamanager.less index 33515fb..e591949 100644 --- a/css/plugins/mediamanager.less +++ b/css/plugins/mediamanager.less @@ -2,14 +2,20 @@ * This file provides styles for mediamanager */ - /* + + + + + global + + + + + */ - #mediamanager__page { - .namespaces h2 { - bottom: 0; - line-height: 100%; - margin-bottom: -1px; + .namespaces{ + h2 { + bottom: 0; + line-height: 100%; + margin-bottom: -1px; + background-color: var(--color-shade-3); + color: var(--color-foreground); + border-color: var(--color-shade-4); + } + .panelHeader { + border-color: var(--color-shade-4); + } } #media__tree ul li img { @@ -19,12 +25,42 @@ ul.tabs li a { border-bottom-color: transparent; } -} + #page__revisions { + > .no > ul > li input[type="checkbox"] { + margin-left: 0; + } + } + + .panelHeader { + background-color: var(--color-shade-2); + } + + .filelist .panelContent ul li{ + background-color: var(--color-shade-2); + color: var(--color-foreground); + + &:hover { + background-color: var(--color-shade-4); + border: none; + } + } + + .file dl { + dt{ + background-color: var(--color-shade-2); + padding: 0.2em; + } + + dd{ + background-color: var(--color-shade-1); + padding: 0.2em; + } + } +} /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries */ - @media @screen_max-md { #mediamanager__page { min-width: 100%; diff --git a/css/plugins/move.less b/css/plugins/move.less index 3863e28..c512c54 100644 --- a/css/plugins/move.less +++ b/css/plugins/move.less @@ -2,9 +2,7 @@ * This file provides styles for move plugin */ - /* + + + + + global + + + + + */ - #dokuwiki__site > .plugin_move_dialog { font-size: @font-size-default; diff --git a/css/plugins/popupviewer.less b/css/plugins/popupviewer.less index afa3119..a9c32d8 100755 --- a/css/plugins/popupviewer.less +++ b/css/plugins/popupviewer.less @@ -2,12 +2,9 @@ * This file provides styles for popupviewer plugin */ - /* + + + + + global + + + + + */ - #popupviewer { > .controls > .content { - padding: 1.5rem 1rem 1rem; td, @@ -19,6 +16,7 @@ line-height: @line-height-default; } } + .li, li { font-size: @font-size-default; diff --git a/css/plugins/qc.less b/css/plugins/qc.less index 25688b9..c26c734 100644 --- a/css/plugins/qc.less +++ b/css/plugins/qc.less @@ -2,51 +2,31 @@ * Styles for the QC plugin */ - -/* + + + + + icon in breadcrumb + + + + + */ - -.page-attributes .plugin_qc { - .qc_icon { - margin: 0; - - svg { - margin-top: .1em; - width: 1.6em; - height: 1.6em; - font-size: (@font-size-small - .06); - } - } -} - - /* + + + + + slideout output + + + + + */ .qc-output { + position: relative; min-width: 100%; width: auto; + background-color: @ini_background !important; font-size: 90%; box-shadow: @box-shadow-bottom; + border-bottom: solid 1px @ini_border_light; margin-bottom: 0; - - h2 { - font-size: 1.3rem; - } - h3 { - font-size: 1.1rem; - } - h4, h5, h6 { - font-size: 1rem; - } - + padding-top: 0 !important; // for JS overwrite @media @screen_min-xxs { - margin-top: -(@margin-default + 1); margin-right: -(@margin-default); margin-left: -(@margin-default); padding-left: @margin-default; padding-right: @margin-default; } + @media @screen_min-md { + top: -(@margin-small); + } + @media @screen_max-md { + top: 0; margin-top: -(@page_padding-top + 2); margin-right: -(@margin-default * 1.6); margin-left: -(@margin-default); @@ -59,6 +39,26 @@ padding-right: @margin-default; } + h1 { + @media @screen_min-md { + padding-top: 0; + } + } + + h2 { + font-size: 1.3rem; + } + + h3 { + font-size: 1.1rem; + } + + h4, + h5, + h6 { + font-size: 1rem; + } + div, p { margin-left: 0; @@ -87,3 +87,17 @@ padding: .1rem; } } + +/* + + + + + admin settings + + + + + */ +.do-admin #dokuwiki__content { + #plugin__qc_admin { + table .centeralign { + .qc_icon svg + span { + min-width: 2em; + padding-left: .2em; + text-align: left; + display: inline-block; + } + } + } +} diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less new file mode 100644 index 0000000..23978f4 --- /dev/null +++ b/css/plugins/sitemapnavi.less @@ -0,0 +1,25 @@ +/** + * This file provides styles for the sitemapnavi plugin + */ + +#plugin__sitemapnavi { + padding-bottom: @nav-margin; + margin-bottom: @nav-margin; + border-bottom: 1px solid @ini_nav_menu_color; + + label { + padding-left: 0.5em; + } + + li { + line-height: @line-height-bigger; + + li { + margin-left: 0.75em; + } + } +} + +.wide-content #plugin__sitemapnavi { + display: none; +} diff --git a/css/plugins/starred.less b/css/plugins/starred.less index 057a04c..26426d6 100644 --- a/css/plugins/starred.less +++ b/css/plugins/starred.less @@ -1,38 +1,16 @@ /** * This file provides styles for starred plugin */ - -.page-attributes { - li.plugin_starred { - .starred svg { - margin-top: .1em; - width: 1.6em; - height: 1.6em; - font-size: 0.82rem; - fill: @ini_nav_menu_color; - } - - .starred.on svg { - fill: @ini_link; - } - - a:hover, - a:active { - .starred svg { - fill: @ini_nav_menu_hover_bg; - } - } - - } -} - nav.nav-starred { ul { list-style: none; + li { margin-left: 0; + svg { - vertical-align: middle; + vertical-align: text-top; + fill: @ini_nav_menu_color; } } } diff --git a/css/plugins/struct.less b/css/plugins/struct.less index e6df066..6742bf3 100755 --- a/css/plugins/struct.less +++ b/css/plugins/struct.less @@ -2,9 +2,7 @@ * This file provides styles for struct plugin */ - /* + + + + + global + + + + + */ - #dokuwiki__content { .structaggregation { @link-height: 1.5rem; @@ -18,11 +16,17 @@ line-height: @line-height-default; a { - color: @ini_existing; + //color: @ini_existing; line-height: @line-height-default; } } + th { + a { + color: @ini_link_alt; + } + } + // search button in table (f.i. "All products") table th input { &:not(:focus) { @@ -63,17 +67,21 @@ &:focus, &:active { background-color: @ini_existing; - background-image: url("svg.php?svg=file-export.svg&f=background_content"); + background-image: url("svg.php?svg=file-export.svg&f=background"); border-color: @ini_existing; - color: @ini_background; + //color: var(--color-background); text-decoration: none; } } } } - #plugin__struct_output{ + #plugin__struct_output { margin-right: 0; + + th { + background-color: @ini_background_alt; + } } .struct_entry_form { @@ -97,15 +105,12 @@ } } - /* + + + + + struct inline-editor + + + + + */ .dokuwiki { .struct_inlineditor { - z-index: 3; box-shadow: @box-shadow-bottom; - .hint p { - color: @color-editBox; + p.hint { margin-top: @small-spacing; margin-bottom: @margin-small; } @@ -116,6 +121,27 @@ margin-left: @small-spacing; } } + + /* struct fields for bureaucracy forms */ + .bureaucracy__plugin { + .field { + clear: both; + + label { + padding: 0; + + .label { + text-align: right; + font-weight: bold; + padding: 0; + } + } + + .input { + line-height: 2.5em; + } + } + } } @@ -165,6 +191,6 @@ form { padding-top: 1rem; } } - } + } // fieldset } -} +} // form diff --git a/css/plugins/structstatus.less b/css/plugins/structstatus.less index 4dfb2cb..0bfd143 100644 --- a/css/plugins/structstatus.less +++ b/css/plugins/structstatus.less @@ -2,9 +2,7 @@ * This file provides styles for structstatus plugin */ - /* + + + + + global + + + + + */ - #dokuwiki__content { .struct_status { border-color: @ini_border; diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less index c1f3b12..b8ef834 100644 --- a/css/plugins/tabinclude.less +++ b/css/plugins/tabinclude.less @@ -2,9 +2,7 @@ * This file provides styles for the tabinclude */ - /* + + + + + plugin tabinclude + + + + + */ - div#dwpl-ti-container { li.dwpl-ti-tab { box-shadow: none; @@ -34,31 +32,26 @@ div#dwpl-ti-container { &.selected { position: relative; - z-index: 1; - background-color: @ini_background; + background-color: var(--color-background); color: @ini_text; } } } - /* + + + content box + + + */ div.dwpl-ti-content-box { position: relative; - z-index: 0; overflow: auto; box-shadow: @box-shadow; - background-color: @ini_background; + background-color: var(--color-background); border: solid 1px @ini_border; border-radius: 0; margin-top: -1px; } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries */ - @media @screen_max-md { div#dwpl-ti-container { } } diff --git a/css/plugins/tablelayout.less b/css/plugins/tablelayout.less new file mode 100644 index 0000000..9e69a36 --- /dev/null +++ b/css/plugins/tablelayout.less @@ -0,0 +1,19 @@ +/** + * This file provides styles for "tablelayout plugin" + */ + + +/* + + + + + global + + + + + */ + +#dokuwiki__content.main-content .secedit.editbutton_table{ + a.button.print { + min-height: 1rem; + background-color: var(--color-background); + border-radius: 0 @ini_default_border_radius; + border-top: solid 1px; + border-color: @ini_border; + font-size: .88rem; + margin-top: -1px; + padding-right: .3em; + } +} diff --git a/css/plugins/tagging.less b/css/plugins/tagging.less index a15cdfb..d20a77f 100644 --- a/css/plugins/tagging.less +++ b/css/plugins/tagging.less @@ -2,9 +2,7 @@ * This file provides styles for the form in tagcloud */ - /* + + + + + plugin tagging + + + + + */ - #spr__meta-box { ul.tagging_cloud { width: 100%; @@ -12,35 +10,45 @@ li { &.t0 a { - font-size: .9rem; + font-size: .88rem; } + &.t1 a { font-size: 1rem; } + &.t2 a { font-size: 1.1rem; } + &.t3 a { font-size: 1.2rem; } + &.t4 a { font-size: 1.3rem; } + &.t5 a { font-size: 1.4rem; } + &.t6 a { font-size: 1.5rem; } + &.t7 a { font-size: 1.6rem; } + &.t8 a { font-size: 1.7rem; } + &.t9 a { font-size: 1.8rem; } + &.t10 a { font-size: 1.9rem; } @@ -61,10 +69,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* media queries */ - @media @screen_max-md { #spr__meta-box { form { diff --git a/css/plugins/tplinc.less b/css/plugins/tplinc.less new file mode 100644 index 0000000..986b145 --- /dev/null +++ b/css/plugins/tplinc.less @@ -0,0 +1,6 @@ +.wide-content { + .sidebarheader, + .sidebarfooter { + visibility: hidden; + } +} diff --git a/css/plugins/translation.less b/css/plugins/translation.less new file mode 100644 index 0000000..eb6a464 --- /dev/null +++ b/css/plugins/translation.less @@ -0,0 +1,57 @@ +/** + * This file provides styles for the translation plugin + */ +@import "../base"; + + +.dokuwiki div.plugin_translation { + clear: none; + display: block; + position: relative; + float: none; + + box-sizing: border-box; + width: 100%; + padding-bottom: 0.5rem; + height: 4rem; + + + * { + clear: both; + padding-top: 1em; // as h1 + } + + ul li { + margin-top: 0; + + // active language + span.wikilink1 { + .fnButton(); + .fnActiveButton(); + cursor: default; + } + + a.wikilink1{ + .fnButton(); + } + + span.wikilink2{ + .fnButton(); + .fnButtonSecondary(); + .fnActiveButtonSecondary() + } + + a.wikilink2, + a.wikilink2:visited{ + .fnButton(); + .fnButtonSecondary(); + background-color: var(--color-shade-4); + } + } +} + +@media @screen_max-md { + .dokuwiki div.plugin_translation { + clear: both; + margin-top: 1rem; + } +} diff --git a/css/plugins/wrap.less b/css/plugins/wrap.less new file mode 100644 index 0000000..0c0948c --- /dev/null +++ b/css/plugins/wrap.less @@ -0,0 +1,119 @@ +.dokuwiki { + span.wrap_em { + color: var(--color-error); + } + + span.wrap_hi { + background-color: var(--color-highlight); + color: var(--color-foreground); + } + + span.wrap_lo { + color: var(--color-text-2); + } + + div.plugin_wrap { + &.wrap_box { + background-color: var(--color-shade-1); + color: var(--color-foreground); + } + + &.wrap_info, + &.wrap_tip, + &.wrap_important, + &.wrap_alert, + &.wrap_help, + &.wrap_download, + &.wrap_todo { + @media @screen_max-md { + flex-direction: column; + } + + display: flex; + align-items: start; + gap: 1rem; + border: none; + border-left: solid 0.5rem var(--color-shade-4); + border-radius: 0.5rem; + padding: 1em; + background-image: none; + background-color: var(--color-shade-1); + + &::before { + content: ""; + flex-shrink: 0; + margin-top: 0.3em; + width: 2em; + height: 2em; + mask-size: contain; + mask-position: center top; + mask-repeat: no-repeat; + background-color: currentColor; + } + } + + &.wrap_info { + color: var(--color-foreground); + + &::before { + mask-image: url(img/info.svg); + } + } + + &.wrap_tip { + color: var(--color-foreground); + + &::before { + mask-image: url(img/lightbulb.svg); + } + } + + &.wrap_important { + border-left-color: var(--color-warning); + color: var(--color-foreground); + + &::before { + background-color: var(--color-warning); + mask-image: url(img/warning.svg); + } + } + + &.wrap_alert { + border-left-color: var(--color-error); + color: var(--color-foreground); + + &::before { + background-color: var(--color-error); + mask-image: url(img/power.svg); + } + } + + &.wrap_help { + border-left-color: var(--color-accent-1); + color: var(--color-foreground); + + &::before { + background-color: var(--color-accent-1); + mask-image: url(img/question.svg); + } + } + + &.wrap_download { + border-left-color: var(--color-success); + color: var(--color-foreground); + + &::before { + background-color: var(--color-success); + mask-image: url(img/arrow_down.svg); + } + } + + &.wrap_todo { + color: var(--color-foreground); + + &::before { + mask-image: url(img/tick_small.svg); + } + } + } +} diff --git a/css/print.less b/css/print.less index d655956..1c475ac 100755 --- a/css/print.less +++ b/css/print.less @@ -1,6 +1,517 @@ /** * This file provides the styles for printing. - * - * @author Jana Deutschlaender */ +/* + + + + + variables + + + + + */ +@color-print: #000; +@background-print: transparent; +@border-color-print: #ccc; +@border-dark-print: #777; + +/* + + + + + print styles + + + + + */ +html, +body { + background: @background-print; +} + +a:link, +a:visited { + background: @background-print !important; + color: @color-print !important; + text-decoration: underline; +} + +/* lightbox is shown: */ #dokuwiki__top[style="overflow: hidden;"] .page-wrapper, +#spr__direct, +.top-header, +.main-footer, +.menu-togglelink, +.main-title.desktop-only, +#spr__meta-box, +.content .row > .col-xs-12 #dokuwiki__content::before, +.page-wrapper > .tools, +.breadcrumbs, +.wikilink1[href*="id=pagefooter"], +.structaggregation > a.export, +#dokuwiki__content .structaggregation > a, +#dokuwiki__content a.folder { + display: none !important; +} + +.content .row > .col-xs-12 { + box-shadow: none; +} + +.dokuwiki div.page, +.main-sidebar.claim, +.page-footer { + padding: 20pt 20pt 0; +} + +#dokuwiki__header .logo img { + height: 4rem; + width: auto; +} + + +/* + + + + + + + + + + + + + + */ +/* + + + + + admin + + + + + */ + +/* + + + acl_manager + + + */ +#acl__tree { + display: none; +} + +#acl__detail { + .aclpage { + display: block; + font-size: 110%; + margin-top: 13pt; + padding-bottom: 13pt; + } +} + +/* + + + Extension Manager + + + */ +#extension__manager { + form.search { + display: inline-block; + margin-bottom: 20pt; + } + form.install { + display: none; + } + ul.tabs { + li.active { + a { + font-weight: bold; + text-decoration: none; + } + } + } +} + +#extension__list { + .extensionList { + border-bottom: 1pt solid @border-color-print; + padding: 0; + + li { + list-style-type: none; + border-top: 1pt solid @border-color-print; + margin-left: 0; + + &::after { + content: ''; + clear: both; + display: table; + height: 10pt; + } + + a.info, + .actions.col { + display: none; + } + + .screenshot { + float: left; + border: 1pt solid @border-color-print; + margin: 0 10pt 5pt 0; + } + + h2, h2 * { + font-size: 100%; + } + } + } +} + +#user__manager { + table input, + .import_users input{ + display: none !important; + } +} +#acl__detail #acl__user { + display: none; +} + +.do-admin #dokuwiki__content { + + #confmanager { + .popup, + .confmanager_singleLine#local, + button, + .button.saveButton { + display: none !important; + } + + .confmanager_singleLine { + div.defaultValue { + word-break: break-all; + } + } + + } + + > form > fieldset { + + border-color: @border-color-print; + + > textarea.edit[readonly] { + border: 0 none; + min-height: 2250pt; + overflow:visible; + display: block; + page-break-inside: auto; + + + br + label[for="autosubmit"] { + margin-top: 20pt; + + input { + margin-right: 5pt; + } + } + } + } + + #magicmatcher__repoadmin { + + button { + display: none; + } + .service-wrapper { + padding-top: 1rem; + } + } + + .plugin_move_form { + legend { + display: none; + } + } + + #plugin__qc_admin { + table .centeralign { + .qc_icon svg + span { + vertical-align: top; + } + } + } + + .doku_form.struct_newschema { + button { + display: none; + } + } + form.plugin_tagging { + display: none; + } + + #plugin__upgrade_meter { + ol li .stage { + padding-left: .4em; + } + } + + #plugin__upgrade { + code { + word-break: break-all; + font-size: .82rem; + } + } +} + +/* + + + Configuration Settings + + + */ +#dokuwiki__content #config__manager { + fieldset { + padding: 0; + + legend { + padding: 0 .5em; + text-align: center; + background-color: #fff; + } + > .table > table { + border: 0 solid @border-color-print; + width: 100%; + tr { + border-top: 1pt solid @border-color-print; + + &:first-child { + border-top-width: 0; + } + td { + border-width: 0; + } + } + } + } + td.value, + td.label { + font-size: 100%; + padding: .6em 0 .8em 1em; + } + td.label { + width: 35%; + span.outkey, span.outkey * { + font-size: 100%; + } + label { + display: block; + } + span.outkey, label { + padding-left: .2rem; + } + } + + td.value { + input[type="text"] { + border: 0 none; + } + + select { + max-width: 80%; + box-sizing: border-box; + border: 1px solid transparent; + background: transparent; + } + .selectiondefault { + position: relative; + + input.checkbox { + position: absolute; + top:0; + left: 0; + } + + label, input[type="text"] { + position: relative; + top:0; + left: 0; + margin-left: 20pt; + margin-top: .5em; + padding-left: 0; + background-color: transparent; + } + } + } + +} + +.do-admin div.ui-admin ul.admin_tasks, +.do-admin div.ui-admin ul.admin_plugins { + li { + list-style-type: none; + min-height: 2em; + + a { + span.icon { + float: left; + clear: left; + display: inline-block; + width: 22pt; + height: 22pt; + border: 1pt solid @border-color-print; + margin: 0 10pt 0 0; + + &:empty { + &::before { + content: "?"; + display: inline-block; + padding-top: 1pt; + } + } + + svg { + width: 20pt; + height: 20pt; + + path { + fill: @color-print; + } + } + } + + span.prompt { + min-height: 26pt; + display: inline-block; + margin: 0; + padding-top: 4pt; + } + } + } +} + +/* + + + + + + + + + + + + + + + + + + + + + + + */ +/* + + + + + Template Style Settings + + + + + */ +.page-footer { + border-top: 1pt solid @border-color-print; + margin-top: 13pt; +} + +#dokuwiki__content #plugin__styling { + + button { + display: none !important; + } + + .styling input[type="text"] { + border: 0 none; + } +} + +/* + + + data plugin + + + */ +.dataplugin_entry dl { + border: 1pt solid @border-color-print; + padding: 7pt; + margin: 7pt 0; + + dt { + clear: left; + float: left; + width: 22%; + font-weight: bold; + text-align: right; + margin-right: 5pt; + } +} + +#dokuwiki__detail { + div.img_detail dl { + dt { + display: inline-block; + width: 20%; + background-color: transparent; + } + dd { + display: inline-block; + width: 75%; + } + } +} + +/* + + + tabbox + + + */ +div#dwpl-ti-container .dwpl-ti, +.dwpl-ti-permalink-header, +.dwpl-ti-permalink-footer { + display: none !important; +} + +div#dwpl-ti-container div.dwpl-ti-content-box { + box-shadow: none; + border: 0 none; +} + +/* + + + media nmanager + + + */ +#mediamanager__page { + .namespaces, + .filelist .tabs, + .panelHeader form { + display: none; + } + + ul.rows { + width: auto; + padding: 0; + } + + .filelist li { + clear: both; + list-style-type: none; + margin: 7pt 0 0; + + dl { + position: relative; + display: table; + border-top: solid 1pt @border-color-print; + padding-top: 2rem; + } + + dt { + display: table-cell; + width: 10%; + height: 40px; + + .size, + .filesize { + width: 15%; + } + + .date { + width: 20%; + } + } + + dd { + display: table-cell; + + &.name { + position: absolute; + top: .5rem; + left: 0; + display: block; + font-weight: bold; + margin: 0; + } + } + } +} + +/* + + + forms + + + */ +form { + button { + &[type="submit"], + &[type="reset"] { + display: none; + } + } + + fieldset { + label, + label.block { + display: block; + text-align: left; + } + + br + br { + display: none; + } + + label { + clear: both; + + > input { + &:first-child { + float: left; + } + + + span { + float: left; + display: inline-block; + padding-left: 7pt; + padding-bottom: 13pt; + } + } + } + + label.block { + display: block; + text-align: left; + + > span { + float: none; + padding-bottom: 0; + + &:first-child { + display: block; + } + } + } + } + + input, + textarea, + select { + border: 1pt solid @border-dark-print; + } +} diff --git a/css/template_admin.less b/css/template_admin.less index 6f4659d..f085a35 100644 --- a/css/template_admin.less +++ b/css/template_admin.less @@ -1,10 +1,7 @@ /** * This file provides the design styles for the admin tools - * - * @author Jana Deutschlaender */ - .do-admin { #admin__version { font-size: @font-size-default; @@ -52,7 +49,7 @@ svg { width: 26px; height: 26px; - border: solid 1px @ini_background; + border: solid 1px var(--color-background); border-radius: @ini_default_border_radius; fill: @ini_existing; transition: @transition background-color, @transition border-color, @transition fill; @@ -71,10 +68,10 @@ svg { background-color: @ini_existing; border-color: @ini_existing; - fill: @ini_background; + fill: var(--color-background); path { - fill: @ini_background; + fill: var(--color-background); } } } @@ -85,10 +82,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* 1024px */ - @media @screen_max-md { .do-admin { div.ui-admin { @@ -113,10 +108,8 @@ } } - /* + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* 768px */ - @media @screen_max-xs { .do-admin { div.ui-admin { diff --git a/css/template_detail.less b/css/template_detail.less index d73eb28..0e06a5a 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -1,103 +1,106 @@ /** * This file provides the design styles for the the detail template * (media details) - * - * @author Jana Deutschlaender */ - #dokuwiki__detail { -/* + + + + + linked image + + + + + */ - .img-link { - text-align: center; + /* + + + + + linked image + + + + + */ + @media screen { + .img-link { + text-align: center; - a { - position: relative; - left: 0; - display: inline-block; - max-width: 100%; - color: @ini_button_color; - margin: 0 auto 1.4em; - - &::before { - position: absolute; - top: 0; - left: 0; - z-index: 2; - display: block; - width: 100%; - box-sizing: border-box; - background: @ini_button_background; - line-height: @line-height-default; - padding: @margin-small; - } - - img { - margin: 0; - display: block; - border: 1px dotted @ini_background_site; + a { position: relative; - z-index: 1; - } - - &:hover, - &:focus, - &:active { - text-decoration: none; + left: 0; + display: inline-block; + max-width: 100%; + color: var(--color-foreground); + margin: 0 auto 1.4em; &::before { - content: attr(title); + position: absolute; + top: 0; + left: 0; + display: block; + width: 100%; + box-sizing: border-box; + background: var(--color-background); + line-height: @line-height-default; + padding: @margin-small; } img { - border: 1px solid @ini_button_background; + margin: 0; + display: block; + border: solid 0.1rem transparent; + position: relative; + } + + &:hover, + &:focus, + &:active { + text-decoration: none; + + &::before { + content: attr(title); + border: solid 0.1rem var(--color-glow-primary); + transition: var(--transition-glow); + filter: var(--filter-glow-primary); + } + + img { + border: solid 0.1rem var(--color-shade-4); + } } } } } -/* + + + + + meta data + + + + + */ + /* + + + + + meta data + + + + + */ div.img_detail { + @media screen { + /* vertical minus margin of .img-detail corresponds to the padding of .page */ + background-color: var(--color-shade-1); + border: solid 0.1em var(--color-shade-4); + margin: @margin-default -(@margin-default); + color: var(--color-foreground); - /* vertical minus margin of .img-detail corresponds to the padding of .page */ - background-color: @ini_background_page_header; - border: solid @ini_border_light; - border-width: 1px 0; - margin: @margin-default -(@margin-default); + h1, + h2, + h3, + h4, + h5, + h6, + p { + padding-left: @margin-default; + padding-right: @margin-default; + } - h1, - h2, - h3, - h4, - h5, - h6, - p { - padding-left: @margin-default; - padding-right: @margin-default; - } - - > h4 { - padding-top: (@margin-default / 2); + > h4 { + padding-top: (@margin-default / 2); + } } dl { - .display-flex(); - .flex-wrap(); + @media screen { + .display-flex(); + .flex-wrap(); - width: 100%; + width: 100%; - dt, - dd { - box-sizing: border-box; - margin: .2em 0; - padding: (@small-spacing * 2) @small-spacing; + dt, + dd { + box-sizing: border-box; + margin: .2em 0; + padding: (@small-spacing * 2) @small-spacing; + } } dt { - background-color: @ini_highlight; - color: @ini_highlight_text; + background-color: none; + color: var(--color-foreground); @media @screen_min-xs { width: 33.3%; diff --git a/css/toollist.less b/css/toollist.less new file mode 100644 index 0000000..e9d5b14 --- /dev/null +++ b/css/toollist.less @@ -0,0 +1,29 @@ +/** + * Styles for site tools and user tools in sidebar + * Using BEM methodology as far as possible + */ + +//.toollist { +//} + +.toollist__listitem { + list-style: none; + + a { + display: inline-flex; + flex-direction: row-reverse; + flex-wrap: nowrap; + align-items: center; + } + + span { + font-size: @font-size-default; + } + + svg { + width: @font-size-default; + vertical-align: middle; + fill: var(--color-foreground); + margin-right: .2em; + } +} diff --git a/deleted.files b/deleted.files new file mode 100644 index 0000000..3a43b3d --- /dev/null +++ b/deleted.files @@ -0,0 +1,102 @@ +# This is a list of files that were present in previous releases +# but were removed later. They should not exist in your installation. +.gitlab-ci.yml +css/area_main-sidebar-content.less +css/area_main-sidebar.less +css/area_sidebar-search.less +css/area_sidetools.less +css/base_fonts.less +css/basic.css +css/content.css +css/design.css +css/includes.css +css/mobile.css +css/plugins/hightlight_parent.less +css/print.css +css/structure.css +fabfile.py +fonts/Google Android License.txt +fonts/icons/fontello-1a5d199c.zip +fonts/icons/svg/index.css +fonts/roboto-black.eot +fonts/roboto-black.svg +fonts/roboto-black.ttf +fonts/roboto-black.woff +fonts/roboto-blackItalic.eot +fonts/roboto-blackItalic.svg +fonts/roboto-blackItalic.ttf +fonts/roboto-blackItalic.woff +fonts/roboto-bold.eot +fonts/roboto-bold.svg +fonts/roboto-bold.ttf +fonts/roboto-bold.woff +fonts/roboto-boldcondensed.eot +fonts/roboto-boldcondensed.svg +fonts/roboto-boldcondensed.ttf +fonts/roboto-boldcondensed.woff +fonts/roboto-boldcondenseditalic.eot +fonts/roboto-boldcondenseditalic.svg +fonts/roboto-boldcondenseditalic.ttf +fonts/roboto-boldcondenseditalic.woff +fonts/roboto-bolditalic.eot +fonts/roboto-bolditalic.svg +fonts/roboto-bolditalic.ttf +fonts/roboto-bolditalic.woff +fonts/roboto-condensed.eot +fonts/roboto-condensed.svg +fonts/roboto-condensed.ttf +fonts/roboto-condensed.woff +fonts/roboto-condenseditalic.eot +fonts/roboto-condenseditalic.svg +fonts/roboto-condenseditalic.ttf +fonts/roboto-condenseditalic.woff +fonts/roboto-italic.eot +fonts/roboto-italic.svg +fonts/roboto-italic.ttf +fonts/roboto-italic.woff.textClipping +fonts/roboto-italic2.woff +fonts/roboto-light.eot +fonts/roboto-light.svg +fonts/roboto-light.ttf +fonts/roboto-light.woff +fonts/roboto-lightItalic.eot +fonts/roboto-lightItalic.svg +fonts/roboto-lightItalic.ttf +fonts/roboto-lightItalic.woff +fonts/roboto-medium.eot +fonts/roboto-medium.svg +fonts/roboto-medium.ttf +fonts/roboto-medium.woff +fonts/roboto-mediumItalic.eot +fonts/roboto-mediumItalic.svg +fonts/roboto-mediumItalic.ttf +fonts/roboto-mediumItalic.woff +fonts/roboto-regular.eot +fonts/roboto-regular.svg +fonts/roboto-regular.ttf +fonts/roboto-regular.woff +fonts/roboto-thin.eot +fonts/roboto-thin.svg +fonts/roboto-thin.ttf +fonts/roboto-thin.woff +fonts/roboto-thinItalic.eot +fonts/roboto-thinItalic.svg +fonts/roboto-thinItalic.ttf +fonts/roboto-thinItalic.woff +images/apple-touch-icon.png +images/logo.png +js/base/helper.js +js/base/rem.min.js +js/base/spc.js +js/base/velocity.min.js +js/legacy/html5shiv.js +js/legacy/respond.min.js +js/breadcrumb.js +js/sidebar-menu.js +tpl/nav-main.php +tpl/nav-page-quality-tasks.php +tpl/nav-sitetools.php +tpl/nav-trace.php +tpl/nav-usermenu.php +tpl/nav-usertools.php +tpl_functions.php diff --git a/detail.php b/detail.php index e1df231..49de8c8 100755 --- a/detail.php +++ b/detail.php @@ -1,4 +1,3 @@ - + - +
- + + + +
+ + + ?>
+
+
+ +
+ +
+
@@ -153,8 +166,6 @@ include('tpl/favicon_tiles.php');
- -
@@ -173,19 +184,35 @@ include('tpl/favicon_tiles.php'); /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* Include Hook: sidebarheader.html */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - tpl_includeFile('sidebarheader.html') + tpl_includeFile('sidebarheader.html') ?>
-
+ + getInclude( + 'sidebarheader', + '
', + '
' + ); + ?> + + + getInclude( + 'sidebarfooter', + '
', + '
' + ); ?>
@@ -194,6 +221,7 @@ include('tpl/favicon_tiles.php');
+
@@ -232,7 +260,7 @@ include('tpl/favicon_tiles.php');
- +
@@ -316,8 +344,8 @@ include('tpl/favicon_tiles.php'); /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* open street maps if geo data is available */ -/** @var helper_plugin_spatialhelper_index $spatial */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ + /** @var \helper_plugin_spatialhelper_index $spatial */ $spatial = plugin_load('helper', 'spatialhelper_index'); if ($spatial && plugin_load('helper', 'geophp')) { global $IMG; @@ -359,16 +387,7 @@ include('tpl/favicon_tiles.php');
-

- -

+
diff --git a/fabfile.py b/fabfile.py deleted file mode 100644 index b1e5fa0..0000000 --- a/fabfile.py +++ /dev/null @@ -1,61 +0,0 @@ -import os -import sys -import json -from fabric.api import run, env, cd - -config = { - 'TARGET_PORT': 6589, - 'TARGET_USER': 'www-data', -} - -try: - TARGET_CONF = json.loads(os.getenv('TARGET_CONF')) -except (SyntaxError, ValueError) as e: - print 'Could not parse configuration: %s' % e - sys.exit(1) - -BUILD_JOB_NAME = os.getenv('CI_BUILD_NAME') - -if BUILD_JOB_NAME not in TARGET_CONF: - print 'Could not find job configuration for %s' % BUILD_JOB_NAME - sys.exit(1) -else: - config.update(TARGET_CONF[BUILD_JOB_NAME]) - -BRANCH = os.getenv('CI_BUILD_REF_NAME') - -if not BRANCH: - print 'Could not get branch name from configuration: Please specify CI_BUILD_REF_NAME env var' - sys.exit(1) - -for option in ['TARGET_HOST', 'TARGET_PATH']: - if not config.get(option): - print 'Could not get %s from configuration!' % option - sys.exit(1) - -env.hosts = [config.get('TARGET_HOST')] -env.port = config.get('TARGET_PORT') -env.user = config.get('TARGET_USER') - - -def pre(): - if config.get('PRE_CMDS'): - [run(cmd) for cmd in config.get('PRE_CMDS')] - - -def git_pull(): - run('git fetch --all') - run('git checkout --force %s' % BRANCH) - run('git reset --hard origin/%s' % BRANCH) - - -def post(): - if config.get('POST_CMDS'): - [run(cmd) for cmd in config.get('POST_CMDS')] - - -def deploy(): - with cd(config.get('TARGET_PATH')): - pre() - git_pull() - post() \ No newline at end of file diff --git a/fonts/argonglow/ArgonGlow-Bold.woff2 b/fonts/argonglow/ArgonGlow-Bold.woff2 new file mode 100644 index 0000000..caf6ff6 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-Bold.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-ExtraLight.woff2 b/fonts/argonglow/ArgonGlow-ExtraLight.woff2 new file mode 100644 index 0000000..7dc6448 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-ExtraLight.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-Light.woff2 b/fonts/argonglow/ArgonGlow-Light.woff2 new file mode 100644 index 0000000..08a6637 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-Light.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-Medium.woff2 b/fonts/argonglow/ArgonGlow-Medium.woff2 new file mode 100644 index 0000000..83bb0d9 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-Medium.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-Regular.woff2 b/fonts/argonglow/ArgonGlow-Regular.woff2 new file mode 100644 index 0000000..601d465 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-Regular.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-SemiBold.woff2 b/fonts/argonglow/ArgonGlow-SemiBold.woff2 new file mode 100644 index 0000000..a88f939 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-SemiBold.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-Thin.woff2 b/fonts/argonglow/ArgonGlow-Thin.woff2 new file mode 100644 index 0000000..dc950fe Binary files /dev/null and b/fonts/argonglow/ArgonGlow-Thin.woff2 differ diff --git a/fonts/argonglow/ArgonGlow-VariableVF.woff2 b/fonts/argonglow/ArgonGlow-VariableVF.woff2 new file mode 100644 index 0000000..7d3aaf4 Binary files /dev/null and b/fonts/argonglow/ArgonGlow-VariableVF.woff2 differ diff --git a/fonts/argonglow/OFL b/fonts/argonglow/OFL new file mode 100644 index 0000000..1cdb289 --- /dev/null +++ b/fonts/argonglow/OFL @@ -0,0 +1,96 @@ +Copyright (c) 2025, The Argon Glow Project Authors (https://codeberg.org/kritzl/argon-glow), +Copyright (c) 2025, kritzl (kritzl@kritzl.dev), +Copyright (c) 2025, traumweh (traumweh@lyx.sh), +with Reserved Font Name "Argon Glow". + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting - in part or in whole - any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/athiti/Athiti-Bold.woff2 b/fonts/athiti/Athiti-Bold.woff2 new file mode 100644 index 0000000..4cc5810 Binary files /dev/null and b/fonts/athiti/Athiti-Bold.woff2 differ diff --git a/fonts/athiti/Athiti-ExtraLight.woff2 b/fonts/athiti/Athiti-ExtraLight.woff2 new file mode 100644 index 0000000..9bb6cea Binary files /dev/null and b/fonts/athiti/Athiti-ExtraLight.woff2 differ diff --git a/fonts/athiti/Athiti-Light.woff2 b/fonts/athiti/Athiti-Light.woff2 new file mode 100644 index 0000000..51f9e72 Binary files /dev/null and b/fonts/athiti/Athiti-Light.woff2 differ diff --git a/fonts/athiti/Athiti-Medium.woff2 b/fonts/athiti/Athiti-Medium.woff2 new file mode 100644 index 0000000..bc8b50a Binary files /dev/null and b/fonts/athiti/Athiti-Medium.woff2 differ diff --git a/fonts/athiti/Athiti-Regular.woff2 b/fonts/athiti/Athiti-Regular.woff2 new file mode 100644 index 0000000..c69c128 Binary files /dev/null and b/fonts/athiti/Athiti-Regular.woff2 differ diff --git a/fonts/athiti/Athiti-SemiBold.woff2 b/fonts/athiti/Athiti-SemiBold.woff2 new file mode 100644 index 0000000..726a075 Binary files /dev/null and b/fonts/athiti/Athiti-SemiBold.woff2 differ diff --git a/fonts/athiti/OFL b/fonts/athiti/OFL new file mode 100644 index 0000000..b0f4597 --- /dev/null +++ b/fonts/athiti/OFL @@ -0,0 +1,93 @@ +Copyright (c) 2015, Cadson Demak (info@cadsondemak.com) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/fonts/departuremono/DepartureMono-Regular.woff2 b/fonts/departuremono/DepartureMono-Regular.woff2 new file mode 100644 index 0000000..7d8b33b Binary files /dev/null and b/fonts/departuremono/DepartureMono-Regular.woff2 differ diff --git a/fonts/departuremono/LICENSE b/fonts/departuremono/LICENSE new file mode 100644 index 0000000..de52476 --- /dev/null +++ b/fonts/departuremono/LICENSE @@ -0,0 +1,93 @@ +Copyright 2022–2024 Helena Zhang (helenazhang.com). + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/img/LICENSE b/img/LICENSE new file mode 100644 index 0000000..7d4f96c --- /dev/null +++ b/img/LICENSE @@ -0,0 +1,427 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/img/arrow_down.svg b/img/arrow_down.svg new file mode 100644 index 0000000..56b4a9b --- /dev/null +++ b/img/arrow_down.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_down_left.svg b/img/arrow_down_left.svg new file mode 100644 index 0000000..e1b3007 --- /dev/null +++ b/img/arrow_down_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_down_right.svg b/img/arrow_down_right.svg new file mode 100644 index 0000000..56f308a --- /dev/null +++ b/img/arrow_down_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_left.svg b/img/arrow_left.svg new file mode 100644 index 0000000..1a35060 --- /dev/null +++ b/img/arrow_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_right.svg b/img/arrow_right.svg new file mode 100644 index 0000000..23fba2c --- /dev/null +++ b/img/arrow_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_up.svg b/img/arrow_up.svg new file mode 100644 index 0000000..34ec6cd --- /dev/null +++ b/img/arrow_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_up_left.svg b/img/arrow_up_left.svg new file mode 100644 index 0000000..923c5dd --- /dev/null +++ b/img/arrow_up_left.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/arrow_up_right.svg b/img/arrow_up_right.svg new file mode 100644 index 0000000..ab82e8b --- /dev/null +++ b/img/arrow_up_right.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/basket.svg b/img/basket.svg new file mode 100644 index 0000000..5dfc4a1 --- /dev/null +++ b/img/basket.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/bed.svg b/img/bed.svg new file mode 100644 index 0000000..bd22140 --- /dev/null +++ b/img/bed.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/clock.svg b/img/clock.svg new file mode 100644 index 0000000..9050282 --- /dev/null +++ b/img/clock.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/code.svg b/img/code.svg new file mode 100644 index 0000000..c283678 --- /dev/null +++ b/img/code.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/creature.svg b/img/creature.svg new file mode 100644 index 0000000..1ab0d45 --- /dev/null +++ b/img/creature.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/cross.svg b/img/cross.svg new file mode 100644 index 0000000..d0e63ad --- /dev/null +++ b/img/cross.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/cross_small.svg b/img/cross_small.svg new file mode 100644 index 0000000..d890ea0 --- /dev/null +++ b/img/cross_small.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/cup_1.svg b/img/cup_1.svg new file mode 100644 index 0000000..9020279 --- /dev/null +++ b/img/cup_1.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/cup_2.svg b/img/cup_2.svg new file mode 100644 index 0000000..0db73f7 --- /dev/null +++ b/img/cup_2.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/dect.svg b/img/dect.svg new file mode 100644 index 0000000..b061df2 --- /dev/null +++ b/img/dect.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/export.sh b/img/export.sh new file mode 100755 index 0000000..ba6d47d --- /dev/null +++ b/img/export.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# This script can be used to automatically export all project files +# to ensure, they are a single path without any modifiers or other +# inkscape-dependent things. It will also remove unnecessary things +# from the SVGs. For this the script requires both inkscape and svgo +# to be installed. + +for infile in ./project_files/*.svg +do + outfile="./$(basename "$infile")" + + inkscape --actions="select-by-element: svg; + object-set-attribute: id, svg; + select-clear; + select-all: layers; + selection-ungroup; + select-clear; + select-all: no-groups; + object-stroke-to-path; + path-union; + object-set-attribute: id,path; + object-set-attribute: style,; + selection-group; + selection-ungroup; + export-plain-svg;" \ + --export-filename "$outfile" \ + --vacuum-defs "$infile" + + svgo --pretty "$outfile" +done diff --git a/img/external.svg b/img/external.svg new file mode 100644 index 0000000..92a7419 --- /dev/null +++ b/img/external.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/fairydust.svg b/img/fairydust.svg new file mode 100644 index 0000000..e847437 --- /dev/null +++ b/img/fairydust.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/file-export.svg b/img/file-export.svg index d1a3f2d..727df65 100644 --- a/img/file-export.svg +++ b/img/file-export.svg @@ -1 +1,6 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/img/flag.svg b/img/flag.svg new file mode 100644 index 0000000..539a20e --- /dev/null +++ b/img/flag.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/gluten.svg b/img/gluten.svg new file mode 100644 index 0000000..715037b --- /dev/null +++ b/img/gluten.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/hackertours.svg b/img/hackertours.svg new file mode 100644 index 0000000..ca88cc6 --- /dev/null +++ b/img/hackertours.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/hare_head.svg b/img/hare_head.svg new file mode 100644 index 0000000..e20029e --- /dev/null +++ b/img/hare_head.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/history.svg b/img/history.svg new file mode 100644 index 0000000..4b66dd4 --- /dev/null +++ b/img/history.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/home.svg b/img/home.svg new file mode 100644 index 0000000..6c4e2f1 --- /dev/null +++ b/img/home.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/hygene.svg b/img/hygene.svg new file mode 100644 index 0000000..a7db265 --- /dev/null +++ b/img/hygene.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/info.svg b/img/info.svg new file mode 100644 index 0000000..2c6c17d --- /dev/null +++ b/img/info.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/lightbulb.svg b/img/lightbulb.svg new file mode 100644 index 0000000..ee9e8df --- /dev/null +++ b/img/lightbulb.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/link.svg b/img/link.svg new file mode 100644 index 0000000..a88ab81 --- /dev/null +++ b/img/link.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/location.svg b/img/location.svg new file mode 100644 index 0000000..e299d03 --- /dev/null +++ b/img/location.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/lock.svg b/img/lock.svg new file mode 100644 index 0000000..6f32cac --- /dev/null +++ b/img/lock.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/login.svg b/img/login.svg new file mode 100644 index 0000000..efa6a28 --- /dev/null +++ b/img/login.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/logout.svg b/img/logout.svg new file mode 100644 index 0000000..18c84d2 --- /dev/null +++ b/img/logout.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/menu.svg b/img/menu.svg index db5d4df..dda9be4 100644 --- a/img/menu.svg +++ b/img/menu.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/img/menu_small.svg b/img/menu_small.svg new file mode 100644 index 0000000..e5258de --- /dev/null +++ b/img/menu_small.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/merch.svg b/img/merch.svg new file mode 100644 index 0000000..f1e4512 --- /dev/null +++ b/img/merch.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/message.svg b/img/message.svg new file mode 100644 index 0000000..d89f9e4 --- /dev/null +++ b/img/message.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/microphone.svg b/img/microphone.svg new file mode 100644 index 0000000..041242d --- /dev/null +++ b/img/microphone.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/network.svg b/img/network.svg new file mode 100644 index 0000000..d746fb9 --- /dev/null +++ b/img/network.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/pen.svg b/img/pen.svg new file mode 100644 index 0000000..7586346 --- /dev/null +++ b/img/pen.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/pencil.svg b/img/pencil.svg index e3a4faa..7fae82b 100644 --- a/img/pencil.svg +++ b/img/pencil.svg @@ -1 +1,18 @@ - \ No newline at end of file + + + + + + + diff --git a/img/pin.svg b/img/pin.svg new file mode 100644 index 0000000..2b07c7a --- /dev/null +++ b/img/pin.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/plate_and_cutlery.svg b/img/plate_and_cutlery.svg new file mode 100644 index 0000000..e759c5a --- /dev/null +++ b/img/plate_and_cutlery.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/power.svg b/img/power.svg new file mode 100644 index 0000000..1e003d3 --- /dev/null +++ b/img/power.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/question.svg b/img/question.svg new file mode 100644 index 0000000..f904106 --- /dev/null +++ b/img/question.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/schedule.svg b/img/schedule.svg new file mode 100644 index 0000000..48c0c0e --- /dev/null +++ b/img/schedule.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/search.svg b/img/search.svg new file mode 100644 index 0000000..0e81215 --- /dev/null +++ b/img/search.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/settings.svg b/img/settings.svg new file mode 100644 index 0000000..410588b --- /dev/null +++ b/img/settings.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/signup.svg b/img/signup.svg new file mode 100644 index 0000000..6c20d48 --- /dev/null +++ b/img/signup.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/soldering_iron.svg b/img/soldering_iron.svg new file mode 100644 index 0000000..6c36a6e --- /dev/null +++ b/img/soldering_iron.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/tick.svg b/img/tick.svg new file mode 100644 index 0000000..6d5e5aa --- /dev/null +++ b/img/tick.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/tick_small.svg b/img/tick_small.svg new file mode 100644 index 0000000..cf7760e --- /dev/null +++ b/img/tick_small.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/ticket.svg b/img/ticket.svg new file mode 100644 index 0000000..d836a02 --- /dev/null +++ b/img/ticket.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/toast.svg b/img/toast.svg new file mode 100644 index 0000000..287b801 --- /dev/null +++ b/img/toast.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/train.svg b/img/train.svg new file mode 100644 index 0000000..6791f66 --- /dev/null +++ b/img/train.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/vegan.svg b/img/vegan.svg new file mode 100644 index 0000000..c65c83e --- /dev/null +++ b/img/vegan.svg @@ -0,0 +1,3 @@ + + + diff --git a/img/warning.svg b/img/warning.svg new file mode 100644 index 0000000..84bdef2 --- /dev/null +++ b/img/warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/js/anchor.js b/js/anchor.js new file mode 100644 index 0000000..6bbd854 --- /dev/null +++ b/js/anchor.js @@ -0,0 +1,13 @@ +jQuery(function () { + jQuery('#dokuwiki__content.main-content').find('h1,h2,h3,h4,h5').append(function () { + if (this.id) { + return '' + + '' + + '' + + '' + + ''; + } else { + return ''; + } + }) +}); diff --git a/js/base/helper.js b/js/base/helper.js deleted file mode 100755 index 170773b..0000000 --- a/js/base/helper.js +++ /dev/null @@ -1,85 +0,0 @@ -/** - * @file helper funcs - * - */ - -// + + + + + + + + + + + + + + + + + + + + + + + + + + + + -// shuffle func for random values -// + + + + + + + + + + + + + + + + + + + + + + + + + + + + -Array.prototype.shuffle = function(){ - var tmp, rand; - for(var i =0; i < this.length; i++){ - rand = Math.floor(Math.random() * this.length); - tmp = this[i]; - this[i] = this[rand]; - this[rand] =tmp; - } -}; -// + + + + + + + + + + + + + + + + + + + + + + + + + + + + -// js trim func for ie -// + + + + + + + + + + + + + + + + + + + + + + + + + + + + -if(typeof String.prototype.trim !== 'function') { - String.prototype.trim = function() { - return this.replace(/^\s\s*/, '').replace(/\s\s*$/, ''); - }; -} -var linkTo_UnCryptMailto = function(s){ - location.href=decryptString(s,-2); -}; -var decryptCharcode = function(n, start, end, offset) { - n = n + offset; - if (offset > 0 && n > end) { - n = start + (n - end - 1); - } else if (offset < 0 && n < start) { - n = end - (start - n - 1); - } - return String.fromCharCode(n); -}; -var decryptString = function(enc, offset) { - var dec = ''; - var len = enc.length; - for (var i = 0; i < len; i++) { - var n = enc.charCodeAt(i); - if (n >= 43 && n <= 58) { - dec += decryptCharcode(n, 43, 58, offset); - } else if (n >= 64 && n <= 90) { - dec += decryptCharcode(n, 64, 90, offset); - } else if (n >= 97 && n <= 122) { - dec += decryptCharcode(n, 97, 122, offset); - } else { - dec += enc.charAt(i); - } - } - return dec; -}; -/** - * simplify setting and getting state out of a node - * $("#my_id").data("my_data_attr") equals $$("#my_id").my_data_attr and - * $("#my_id").data("my_data_attr", "my_data_val") equals $$("#my_id").my_data_attr = my_data_val - * you can also do - * $$("#my_id").my_data_val = $$("#my_id").my_data_val + 1. - */ -var $$ = function(param) { - var node = $(param)[0]; - var id = $.data(node); - $.cache[id] = $.cache[id] || {}; - $.cache[id].node = node; - return $.cache[id]; -}; -var alertFB = false; -if (typeof console === "undefined" || typeof console.log === "undefined") { - console = {}; - if (alertFB) { - console.log = function(msg) { - alert(msg); - }; - } else { - console.log = function() {}; - } -} - -var wikiLang = "de"; -/** - * anonymous func: get page language - */ -(function($){ $("html").attr("lang"); if(typeof(l)!= 'undefined' && l.length>=2) wikiLang=l.substr(0,2).toLowerCase(); if(wikiLang!='de'&& wikiLang!='en') wikiLang='de'; })(jQuery); diff --git a/js/base/rem.min.js b/js/base/rem.min.js deleted file mode 100755 index 7a96d75..0000000 --- a/js/base/rem.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Module: rem - v1.3.2 - * Description: A polyfill to parse CSS links and rewrite pixel equivalents into head for non supporting browsers - * Date Built: 2014-07-02 - * Copyright (c) 2014 | Chuck Carpenter ,Lucas Serven ; -**/ -!function(e){"use strict";var t=function(){var e=document.createElement("div");return e.style.cssText="font-size: 1rem;",/rem/.test(e.style.fontSize)},n=function(){for(var e=document.getElementsByTagName("link"),t=[],n=0;n0?(v=[],p=[],m=[],r()):i()}},a=function(e,t){for(var n,r=d(e).replace(/\/\*[\s\S]*?\*\//g,""),o=/[\w\d\s\-\/\\\[\]:,.'"*()<>+~%#^$_=|@]+\{[\w\d\s\-\/\\%#:!;,.'"*()]+\d*\.?\d+rem[\w\d\s\-\/\\%#:!;,.'"*()]*\}/g,a=r.match(o),i=/\d*\.?\d+rem/g,s=r.match(i),c=/(.*\/)/,l=c.exec(t)[0],u=/@import (?:url\()?['"]?([^'\)"]*)['"]?\)?[^;]*/gm;null!==(n=u.exec(e));)m.push(0===n[1].indexOf("/")?n[1]:l+n[1]);null!==a&&0!==a.length&&(f=f.concat(a),g=g.concat(s))},i=function(){for(var e=/[\w\d\s\-\/\\%#:,.'"*()]+\d*\.?\d+rem[\w\d\s\-\/\\%#:!,.'"*()]*[;}]/g,t=0;t").text(s).html(); - }, - decode_entities: function(s){ - return $("").html(s).text(); - }, - /* add func to load event */ - add_loadEvent: function(func_name){ - var lastonload = window.onload; - if (typeof window.onload != 'function') { window.onload = func_name; } - else { window.onload = function() { lastonload(); func_name(); }; } - }, - /* logging for debug */ - _debug: function(msg){ - if(this.config.debug) { - try{ - if(console){ - console.log(msg); - } else{ - alert(msg); - } - }catch(err){ - alert(msg); - } - } - }, - /* return obj values for debug */ - _get_objVs: function(objl){ - try{ - var p = typeof JSON != "undefined" ? JSON.stringify : function(objl){ - var arr = []; - $.each(objl,function(key,val){ - var next = key + ": "; - next += $.isPlainObject(val) ? printObj(val) : val; - arr.push( next ); - }); - return "{ " + arr.join(", ") + " }"; - }; - return p(objl); - }catch(err){ - this._debug(err); - return ''; - } - }, - aria_live: function(setobj){ - if(typeof(setobj)=='object'){ - setobj.attr('aria-live',"polite"); - } - }, - aria_role: function(setobj, role){ - if(typeof(setobj)=='object'){ - setobj.attr('role',role); - } - }, - change_tabindex: function(remobj,setobj,i){ - if(typeof(remobj)=='object'){ - remobj.removeAttr('tabindex'); - } - if(typeof(setobj)=='object'){ - setobj.attr('tabindex',i); - } - }, - /* set focus to dom object: param obj */ - set_newfocusObj: function(focusobj){ - try{ - if(focusobj) focusobj.focus(); - }catch(err){ - this._debug('exception: '+err); - } - }, - /* set focus to dom object: param id */ - set_newfocusId: function(fid){ - try{ - var focusobj = document.getElementById(fid); - if(focusobj) focusobj.focus(); - if(focusobj) console.log(focusobj); - }catch(err){ - this._debug('exception: '+err); - } - }, - /* set focus to nonfocussable dom object: */ - set_newfocusBox: function(remobj,setobj){ - this.change_tabindex(remobj,setobj,0); - try{ - if(setobj) setobj.focus(); - }catch(err){ - this._debug('exception: '+err); - } - }, - /* set title(s) and remove other title(s) if set */ - set_title: function(remobj,setobj,ctitle){ - if(typeof(remobj)=='object'){ - remobj.removeAttr('title'); - } - if(typeof(setobj)=='object'){ - setobj.attr('title',ctitle); - } - }, - /* count appearances of dom elems with certain markup */ - count: function(jqdom){ - var num = 0; - $(jqdom).each(function() { - num++; - }); - return num; - }, - countOV: function(objlit){ - var i = 0; - for (var elem in objlit){ - i++; - } - return i; - }, - /*merge object literals (do not overwrite default, not recursively) */ - merge: function(objl1,objl2,objl3,objl4){ - return $.extend({},objl1,objl2,objl3,objl4); - }, - /*merge object literals (do not overwrite default, recursively) */ - mergeR: function(objl1,objl2,objl3,objl4){ - return $.extend(true,{},objl1,objl2,objl3,objl4); - }, - loadImage: function(isrc, func, errfunc){ - try{ - var img = new Image(); - img.onload = func; - img.onerror = errfunc; - img.src = isrc; - }catch(err){ - errfunc(); - } - }, - tb_getPageSize: function(){ - var de=document.documentElement; - var w=window.innerWidth||self.innerWidth||(de&&de.clientWidth)||document.body.clientWidth; - var h=window.innerHeight||self.innerHeight||(de&&de.clientHeight)||document.body.clientHeight; - arrayPageSize=[w,h]; - return arrayPageSize; - }, - useLocStorage: function(){ - return ('localStorage' in window && window.localStorage !== null); - }, - saveLSI: function(key, data){ - if (this.useLocStorage) { - localStorage.setItem(key, data); - } - }, - removeLSI: function(key){ - if (this.useLocStorage) { - localStorage.removeItem(key); - } - }, - getLSI: function(key){ - if (this.useLocStorage) { - return localStorage.getItem(key); - } - return ''; - - }, - showAllLSI: function() { - if (this.useLocStorage) { - var key = ""; - for (var i=0; i<=localStorage.length-1; i++) { - key = localStorage.key(i); - //console.log(key+': '+localStorage.getItem(key)); - } - } - } -}; diff --git a/js/breadcrumb.js b/js/breadcrumb.js deleted file mode 100644 index 7825584..0000000 --- a/js/breadcrumb.js +++ /dev/null @@ -1,30 +0,0 @@ -/** - * Sets up the breadcrumb behaviour (adds do / ACT status information) - * or adds tpl_getLang('image_detail') on detail template - */ -(function($) { - - - var setBreadcrumbSuffix = function(){ - - var $breadcrumb = $('.breadcrumbs'); - if (!$breadcrumb.length) return; - - - /** - * add ACT status to breadcrumb (if not show) - * or tpl_getLang('image_detail') on detail.php - */ - var mode = $breadcrumb.attr('data-do'); - if(mode && mode.indexOf('show') !== 0){ - var markup = ' : ' + mode + ''; - $breadcrumb.find('p').append(markup); - } - }; - - $(function(){ - setBreadcrumbSuffix(); - }); - - -})(jQuery); diff --git a/js/direct.js b/js/direct.js new file mode 100644 index 0000000..b2e9710 --- /dev/null +++ b/js/direct.js @@ -0,0 +1,128 @@ + +/** + * Sets up the behaviour of direct menu links + * + * @author Jana Deutschlaender + */ +(function($) { + + + var $body, + + /** + * Register the click handler for the direct links + * should scroll to the page area whether there is a fixed magic matcher bar or not + * + * @param $directMenu + */ + scrollingForDirectNav = function($directMenu) { + $body = $('body'); + checkAnchorsOnLoad($directMenu); + registerClickForDirectLinks($directMenu); + + }, + + /** + * register click event listener for direct links + * @param $menu + */ + registerClickForDirectLinks = function($menu) { + $menu.find('a').on('click', function (e) { + e.stopPropagation(); + var target = $(this).attr('href'); + tasksBeforeScrolling(target); + scrollToTarget(target); + }); + }, + + /** + * scroll to / set focus to target of direct link if value of location hash equals direct link + * @param $menu + */ + checkAnchorsOnLoad = function($menu) { + var hash = window.location.hash; + if (hash) { + $menu.find('a').each(function() { + var target = $(this).attr('href'); + if(hash === target) { + tasksBeforeScrolling(target); + scrollToTarget(target); + setFocusOnLoad(target); + } + }); + } + }, + + /** + * todos that needs to be done before the scrolling can start + * @param target + */ + tasksBeforeScrolling = function(target) { + switch (target) { + case '#qsearch__in': + showSearchField(target); + break; + + case '#dokuwiki__usertools': + $(target).find('li:first-child').find('a').focus(); + break; + + } + }, + + /** + * set focus on target or first link found in target + * @param target + */ + setFocusOnLoad = function(target) { + var $target = $(target); + switch (target) { + + case '#qsearch__in': + case '#spr__toggle-content': + $target.focus(); + break; + + case '#dokuwiki__usertools': + break; + + default: + $target.attr('tabindex',0); + $target.focus(); + + } + }, + + /** + * trigger content toggle link to make the search field visible otherwise it neither be used for scrolling nor + * for focus setting + * @param target + */ + showSearchField = function(target) { + if($body.hasClass('wide-content')) { + $('#spr__toggle-content').trigger('click'); + } + }, + + /** + * scrolls to the target with an offset of 60px + * @param target + */ + scrollToTarget = function(target) { + // scroll to each target + $('html, body').animate({ + scrollTop: (target.offset().top - 60) + }, 400); + }; + + + $(function(){ + + var $directMenu = $('#spr__direct'); + if (!$directMenu.length) return; + + scrollingForDirectNav($directMenu); + }); + + +})(jQuery); diff --git a/js/legacy/html5shiv.js b/js/legacy/html5shiv.js deleted file mode 100755 index 448cebd..0000000 --- a/js/legacy/html5shiv.js +++ /dev/null @@ -1,8 +0,0 @@ -/* - HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed -*/ -(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag(); -a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x"; -c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode|| -"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f); -if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d #mq-test-1 { width: 42px; }',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b + * @author Jana Deutschlaender + */ (function($) { @@ -11,12 +16,44 @@ */ var registerClickForTabsInMetaBox = function($metaBox) { - $metaBox.on('click', '.meta-tabs a', function (e) { - e.preventDefault(); - var $tab = $(this), - isopen = $tab.attr('aria-expanded') === 'true'; + $metaBox.on('click', '.meta-tabs a', function (e) { + e.preventDefault(); + var $tab = $(this), + isopen = $tab.attr('aria-expanded') === 'true'; - // disable all existing tabs + // disable all existing tabs + disableExistingTabs($metaBox); + + + if (isopen) return; // tab was open, we closed it. we're done + + // enable current tab + $tab + .attr('aria-expanded', 'true') + .closest('li') + .addClass('active'); + $metaBox.find($tab.attr('href')) + .addClass('active') + .attr('aria-hidden', 'false'); + + }).find('.meta-content').on('click', 'a[href*="#"]', function (e) { + disableExistingTabs($metaBox); + /* uses custome event handler hide see spc.js */ + }).find('#tagging__edit').on('hide', function(e){ + disableExistingTabs($metaBox); + }); + + /** + * in admin templates show toc tab, if available + */ + if($('body').hasClass('do-admin')) { + var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]'); + if($tocLink.length === 1) { + $tocLink.trigger('click'); + } + } + }, + disableExistingTabs = function($metaBox) { $metaBox.find('.meta-tabs li') .removeClass('active') .find('a') @@ -24,28 +61,14 @@ $metaBox.find('.meta-content .tab-pane') .removeClass('active') .attr('aria-hidden', 'false'); + }; - if (isopen) return; // tab was open, we closed it. we're done - // enable current tab - $tab - .attr('aria-expanded', 'true') - .closest('li') - .addClass('active'); - $metaBox.find($tab.attr('href')) - .addClass('active') - .attr('aria-hidden', 'false'); - - }); - - /** - * in admin templates show toc tab, if available - */ - if($('body').hasClass('do-admin')) { - var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]'); - if($tocLink.length === 1) { - $tocLink.trigger('click'); - } + var stickyBox = function ($metaBox, topOffset, leftOffset) { + if (window.pageYOffset >= topOffset) { + $metaBox.addClass("sticky").attr("style", "left: " + leftOffset + "px"); + } else { + $metaBox.removeClass("sticky").removeAttr("style"); } }; @@ -55,6 +78,13 @@ if (!$metaBox.length) return; registerClickForTabsInMetaBox($metaBox); + + var topOffset = $metaBox.offset().top; + window.onscroll = function () { + // check while scrolling, or window resizing will break horizontal positioning + var leftOffset = $metaBox.offset().left; + stickyBox($metaBox, topOffset, leftOffset) + }; }); diff --git a/js/plugins/bookcreator.js b/js/plugins/bookcreator.js index 742091f..10ca372 100644 --- a/js/plugins/bookcreator.js +++ b/js/plugins/bookcreator.js @@ -1,6 +1,8 @@ /** * prevents Uncaught TypeError in detail template if bookcreator plug-in is installed * + * @author Jana Deutschlaender + * */ (function($) { diff --git a/js/plugins/folded.js b/js/plugins/folded.js index 2f954c2..9540842 100644 --- a/js/plugins/folded.js +++ b/js/plugins/folded.js @@ -1,6 +1,8 @@ /** * prevents Uncaught TypeError in detail template if folded plug-in is installed * + * @author Jana Deutschlaender + * */ (function($) { diff --git a/js/plugins/qc.js b/js/plugins/qc.js index 5a0de75..4d768f1 100644 --- a/js/plugins/qc.js +++ b/js/plugins/qc.js @@ -1,5 +1,8 @@ /** * Add custom QC functionality instead of using the plugin's mechanism + * + * @author Andreas Gohr + * @author Jana Deutschlaender */ jQuery(function () { var $panel = jQuery('div.qc-output').hide(); diff --git a/js/sidebar.js b/js/sidebar.js index d0811b7..86036f6 100644 --- a/js/sidebar.js +++ b/js/sidebar.js @@ -1,10 +1,21 @@ /** * Sets up the sidebar behaviour + * + * @author Andreas Gohr + * @author Michael Große + * @author Jana Deutschlaender */ jQuery(function () { var $nav = jQuery('#dokuwiki__aside'); if (!$nav.length) return; + // id of the current sidebar, used to differentiate states + var sidebarId = ''; + var divId = jQuery('#sidebarId'); + if (typeof divId !== 'undefined') { + sidebarId = divId.attr('class').split(' ')[0]; + } + /** * closes sidebar */ @@ -20,11 +31,11 @@ jQuery(function () { */ removeToggleStorage = function () { for (var index=0; index <= window.sessionStorage.length; index += 1) { - var item = window.sessionStorage.getItem('sidebar-section-' + index + '-open'); + var item = window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + index + '-open'); if (!item) { continue; } - window.sessionStorage.removeItem('sidebar-section-' + index + '-open'); + window.sessionStorage.setItem('sidebar-section-' + sidebarId + '-' + index + '-open', 'false'); } }, @@ -45,13 +56,17 @@ jQuery(function () { $elem.find('a').first().focus(); }, + removeOpenStates = function() { + $nav.find('.is-open').removeClass('is-open'); + }, + /** * Toggle a navigation panel * - * @param {jQuery} $toggler The h6 toggler + * @param {jQuery} $toggler The a toggler */ toggleNav = function ($toggler) { - var $panel = $toggler.next('div.nav-panel'); + var $panel = $toggler.parent().next('div.nav-panel'); var isOpen = $panel.is(':visible'); // open sidebar on interaction setDefaultContent(); @@ -59,9 +74,12 @@ jQuery(function () { $panel.dw_toggle(!isOpen, function () { if (!isOpen) { focusFirstSubLink($panel); + $toggler.addClass('is-open'); + } else { + $toggler.removeClass('is-open'); } }); - window.sessionStorage.setItem('sidebar-section-' + $toggler.data('index') + '-open', !isOpen); + window.sessionStorage.setItem('sidebar-section-' + sidebarId + '-' + $toggler.data('index') + '-open', !isOpen); }, /** @@ -96,7 +114,6 @@ jQuery(function () { // make the new toggler var $toggler = jQuery('') - .addClass('nav') .attr('href', '#') .attr('role', 'heading') .attr('aria-level', '2') @@ -105,42 +122,84 @@ jQuery(function () { .prepend($icon) .data('index', index) ; + $toggler = jQuery('
').prepend($toggler); // wrap all following siblings til the next element in a wrapper var $wrap = jQuery('
') .addClass('nav-panel'); var $sibs = $me.nextAll(); + for (var i = 0; i < $sibs.length; i++) { var $sib = jQuery($sibs[i]); if ($sib.is(ELEMENT)) break; $sib.detach().appendTo($wrap); + addContentMenuCurrentStates($sib, $toggler); + } + + /* + * if there is only one subitem with a link, disable toggling + * and use a direct link. + */ + var $links = jQuery($wrap[0]).find('a'); + if ($links.length === 1 && $links.first().attr('href') !== '#') { + $toggler.children().first().attr('href', jQuery($links[0]).attr('href')); + } else { + $wrap.insertAfter($me); + + if ($toggler.parent('li').length) { + $toggler.parent('li').addClass('toggler'); + } + + if (window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + index + '-open') === 'true') { + $wrap.css('display', 'block'); + setTogglerClass($toggler,'is-open'); + } } - $wrap.insertAfter($me); // replace element with toggler $me.replaceWith($toggler); - - if ($toggler.parent('li').length) { - $toggler.parent('li').addClass('toggler'); - } - - if (window.sessionStorage.getItem('sidebar-section-' + index + '-open') === 'true') { - $wrap.css('display', 'block'); - } - }); + + // fade in the navigation (was hidden until now + $main.css({opacity: 0, visibility: "visible"}).animate({opacity: 1}, 200); }, /** * Initialize the open/close toggling of menu entries */ initMenuHandling = function () { - $nav.on('click', 'a.nav', function (e) { - toggleNav(jQuery(this)); - e.preventDefault(); + $nav.on('click', 'div.nav a', function (e) { + if (jQuery(this).attr('href').startsWith('#')) { + toggleNav(jQuery(this)); + e.preventDefault(); + } }); }, + /** + * adds a given class to the toggler link + * @param $toggler link or parent of link to whom the class is added + * @param classVal class to be added + */ + setTogglerClass = function ($toggler, classVal) { + if($toggler.is('a')) { + $toggler.addClass(classVal); + } else { + $toggler.find('a').addClass(classVal); + } + }, + + /** + * marks a $toggler link as active if the following menu has an active state + * @param $menuObj jQuery Object of the menu / container + * @param $toggler + */ + addContentMenuCurrentStates = function ($menuObj, $toggler) { + if($menuObj[0] && String($menuObj[0].innerHTML).indexOf('curid') > 0) { + setTogglerClass($toggler,'is-active'); + } + }, + /** * Make sure the content area is always as high as the sidebar */ @@ -165,6 +224,7 @@ jQuery(function () { setDefaultContent(); } else { setWideContent(); + removeOpenStates(); } }); @@ -194,11 +254,79 @@ jQuery(function () { var $body = jQuery('body'); $body.toggleClass('show-mobile-sidebar'); }); + }, + + /** + * set is-active class if body has at least one of the given selectors + * @param selectorArray Array of selectors + * @param $nav container in which the $toggler is situated + */ + setActive = function(selectorArray, $nav) { + for(var i=0; i< selectorArray.length; i++) { + var mode = selectorArray[i]; + if(jQuery('body').is('.do-'+mode)){ + setTogglerClass($nav.find('.nav'),'is-active'); + $nav.find('a[href*="do='+mode+'"]').wrapAll(''); + } + } + }, + + /** + * sets active states in site tool menu and user tool menu for certain modes + * adds sessionStorage behaviour equivalent approach to content menus + * + */ + initTemplateMenues = function () { + var $body = jQuery('body'), + $siteTools = $nav.find('> .nav-sitetools'), + $userTools = $nav.find('> .nav-usermenu'), + $templateMenus = $nav.find('> nav:not(.nav-main)'), + + stModes = ['recent', 'media', 'index'], + utModes = ['profile','admin'], + isWideContent = false; + + /* set active states for site tool menu and user tool menu */ + setActive(stModes,$siteTools); + setActive(utModes,$userTools); + + if($body.is('.do-show') && $body.is('.wide-content')) { + window.sessionStorage.setItem('wide-content', true); + isWideContent = true; + } + + + + /* set data attributes for sessionStorage and check onload if one of the template menus should be opened */ + $templateMenus.each(function( index ) { + var $t = jQuery(this).find('.nav'), + y = $nav.find('.nav-main').find('.nav').length, + $toggler = ($t.is('a')) ? $t : $t.find('a:last'), + tIndex = y + index; + $toggler.data('index', tIndex); + + var item = window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + tIndex + '-open'); + if (item) { + if(isWideContent) { + window.sessionStorage.setItem('sidebar-section-' + sidebarId + '-' + tIndex + '-open', 'false'); + } else { + if (item === 'true') { + jQuery(this).find('.nav-panel').css('display', 'block'); + setTogglerClass($toggler, 'is-open'); + } + } + } + //console.log(window.sessionStorage); + + }); + }; + // main initContentNav(); initSidebarToggling(); + initTemplateMenues(); initMenuHandling(); initContentMinHeight(); initSearchToggling(); diff --git a/lang/cs/lang.php b/lang/cs/lang.php new file mode 100755 index 0000000..acf9ac9 --- /dev/null +++ b/lang/cs/lang.php @@ -0,0 +1,104 @@ + .li'] = 'První položka v seznamu'; + +$lang['header_layout'] = 'Nastavit rozvrže`ní záhlaví:'; +$lang['header_layout_o_default'] = 'široké záhlaví s dlouhým nadpisem a sloganem'; +$lang['header_layout_o_compact'] = 'kompaktní záhlaví s krátkým nadpisem a skrytým sloganem'; + diff --git a/lang/cs/style.txt b/lang/cs/style.txt new file mode 100755 index 0000000..8e132de --- /dev/null +++ b/lang/cs/style.txt @@ -0,0 +1 @@ +Pokud chcete zménit //favicon//, jednoduše použijte Správu médií pro nahrátí ''favicon.ico'' do prostoru ''wiki'' nebo ''root''. Potom bude ikona automaticky použita. Pokud máte neveřejnou wiki, je doporučené nastavit prostor ''wiki'' (nebo root) čitelný pro všechny, jinak favicon nebude zobrazena nepřihlášeným uživatelům. diff --git a/lang/de-informal/lang.php b/lang/de-informal/lang.php new file mode 100755 index 0000000..c39687d --- /dev/null +++ b/lang/de-informal/lang.php @@ -0,0 +1,107 @@ + .li'] = 'Top-level Listeneinträge in verschachtelten Listen'; + +$lang['header_layout'] = 'Layout des Headers anpassen:'; +$lang['header_layout_o_default'] = 'großer Header für langen Wiki Titel und Tagline'; +$lang['header_layout_o_compact'] = 'kompakter Header für kurzen Wiki Titel ohne Tagline'; + +$lang['autocollapse'] = 'Sidebar automatisch einklappen wenn Nicht-Inhaltsseiten angezigt werden, um mehr Platz zu haben.'; diff --git a/lang/de/lang.php b/lang/de/lang.php index 62db31d..c39687d 100755 --- a/lang/de/lang.php +++ b/lang/de/lang.php @@ -8,58 +8,75 @@ $lang['direct_prefix'] = 'Direkt'; $lang['direct_content_main'] = 'Hauptinhalt dieser Seite'; -$lang['direct_menu_main'] = 'Hauptmenü'; +$lang['direct_quick_search'] = 'Schnellsuche'; +$lang['direct_content_toggle'] = 'Breite des Contents ändern'; -$lang['adjunct_start_logo_text'] = 'Logo: '; -$lang['adjunct_linked_logo_text'] = '. Link zur Startseite'; -$lang['a11y_search'] = 'geh zur Suche'; -$lang['a11y_sidebartoggle'] = 'Sidebar öffnen/schliessen'; +$lang['adjunct_linked_logo_text'] = ' - Link zur Startseite'; +$lang['a11y_sidebartoggle'] = 'Navigation anzeigen/verbergen'; $lang['nav-area-head'] = 'Navigationsmenüs und Suche'; $lang['head_magic_matcher'] = 'MagicMatcher'; -$lang['head_quick_search'] = 'wikiübergreifende Schnellsuche'; -$lang['head_menu_main'] = 'Hauptmenü'; +$lang['head_quick_search'] = 'Wikiübergreifende Schnellsuche'; $lang['head_menu_status'] = 'Seitenstatus'; -$lang['head_breadcrumb'] = 'Standortanzeiger'; +$lang['head_breadcrumb_youarehere'] = 'Standortanzeiger'; $lang['head_menu_trace'] = 'Zuletzt Angesehen'; $lang['head_meta_box'] = 'Metainformationen zur Seite'; +$lang['head_menu_starred'] = 'Gemerkte Seiten'; +$lang['head_menu_tool-select'] = 'Werkzeuge'; $lang['jump_to_quicksearch'] = 'Springe zur Schnellsuche'; +/** it will be shown from plugin lang.php: $lang['meta_box_jira_tickets_none'] = 'Keine Jira-Tickets verknüpft'; $lang['meta_box_tags_none'] = 'Keine Tags verknüpft'; $lang['js']['meta_box_toc_none'] = 'kein Inhaltsverzeichnis vorhanden'; +$lang['prefix_tasks_user'] = 'Ihre offenen Aufgaben: '; +*/ + +$lang['custom_modeswitch'] = 'Lichtschalter'; $lang['tab_tags'] = 'Tags'; +$lang['tab_issues'] = 'Issues'; -$lang['quality_trigger'] = 'Seitenanalyse ein- bzw. ausblenden'; +$lang['quality_trigger'] = 'Seitenanalyse anzeigen/verbergen'; -$lang['prefix_tasks'] = 'offene Aufgaben: '; $lang['prefix_tasks_page'] = 'offene Aufgaben auf dieser Seite: '; + $lang['tasks_page_none'] = 'keine offenen Aufgaben für diese Seite'; +$lang['tasks_page_intime'] = 'offenen Aufgaben für diese Seite: %1$d'; +$lang['tasks_page_late'] = 'offenen Aufgaben für diese Seite: %1$d, zu spät: %2$d'; -$lang['discussion'] = 'Diskussion'; -$lang['back_to_article'] = 'Zurück zum Artikel'; -$lang['userpage'] = 'Benutzer-Seite'; +/** is not used +$lang['discussion'] = 'xxx Diskussion'; +$lang['back_to_article'] = 'xxx Zurück zum Artikel'; +$lang['userpage'] = 'xxx Benutzer-Seite'; + */ -$lang['meta_data'] = 'Meta Daten des Bildes'; +$lang['meta_data'] = 'Meta Daten des Bildes'; /** wird aufgerufen aber nicht ausgegeben - Fehler? */ $lang['osm_zoom_link_text'] = 'größere Karte anzeigen'; -$lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster'; +$lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster'; /** in streetmaps - konnte ich nicht finden */ + $lang['image_detail'] = 'Detailinformationen zum Bild'; +$lang['mode_edit'] = 'Seite bearbeiten'; + + +$lang['nav_sidebar'] = 'Navigation'; +$lang['nav_sitemap'] = 'Seitenbaum'; + /** - * colors + * preferences colors */ $lang['__site_width__'] = 'Content - Breite (in %)'; $lang['__background_site__'] = 'Website - Hintergrundfarbe'; -$lang['__text_webframe__'] = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe'; +$lang['__text_webframe__'] = 'Claim, Titel, Footer (unverlinkt), Navigation (unverlinkt) - Schriftfarbe'; -$lang['__nav_menu_color__'] = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe'; -$lang['__nav_menu_hover_color__'] = 'verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe'; -$lang['__nav_menu_hover_bg__'] = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe'; +$lang['__nav_menu_color__'] = 'Navigation (verlinkt), Footer (verlinkt), Pagetools Icons, Tabbox - Schriftfarbe'; +$lang['__nav_menu_hover_color__'] = 'Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe'; +$lang['__nav_menu_hover_bg__'] = 'Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe'; $lang['__background__'] = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe'; $lang['__text__'] = 'Content: Text - Schriftfarbe'; @@ -82,8 +99,9 @@ $lang['__missing__'] = 'Links zu nicht vorhandenen Wikiseiten - S $lang['__button_color__'] = 'Buttons - Schriftfarbe'; $lang['__button_background__'] = 'Buttons - Hintergrundfarbe'; -$lang['__background_alt__'] = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Hintergrundfarbe (alternativ)'; -$lang['__text_alt__'] = 'Tabellenkopf unverlinkt, hover: Tabellenzeile, struct Label - Schriftfarbe (alternativ)'; +$lang['__background_alt__'] = 'Tabellenkopf, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)'; +$lang['__text_alt__'] = 'Tabellenkopf: unverlinkt, Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)'; +$lang['__link_alt__'] = 'Tabellenkopf: verlinkt - Schriftfarbe (alternativ)'; $lang['__border__'] = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe'; $lang['__default_border_radius__'] = 'Wiki Icons, Content (oben rechts) - Borderradius'; diff --git a/lang/de/settings.php b/lang/de/settings.php index 2d6972a..5bbe996 100755 --- a/lang/de/settings.php +++ b/lang/de/settings.php @@ -10,3 +10,9 @@ $lang['sidebar_sections_o_h1'] = 'Überschriften 1. Ordnung'; $lang['sidebar_sections_o_h1,h2'] = 'Überschriften der 1. und 2. Ordnung'; $lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'Alle Überschriften'; $lang['sidebar_sections_o_li.level1 > .li'] = 'Top-level Listeneinträge in verschachtelten Listen'; + +$lang['header_layout'] = 'Layout des Headers anpassen:'; +$lang['header_layout_o_default'] = 'großer Header für langen Wiki Titel und Tagline'; +$lang['header_layout_o_compact'] = 'kompakter Header für kurzen Wiki Titel ohne Tagline'; + +$lang['autocollapse'] = 'Sidebar automatisch einklappen wenn Nicht-Inhaltsseiten angezigt werden, um mehr Platz zu haben.'; diff --git a/lang/en/lang.php b/lang/en/lang.php index 9c7d137..2c146f8 100755 --- a/lang/en/lang.php +++ b/lang/en/lang.php @@ -7,66 +7,77 @@ $lang['direct_prefix'] = 'jump to'; -$lang['direct_content_main'] = 'main content'; -$lang['direct_menu_main'] = 'main menu'; +$lang['direct_content_main'] = 'Main Content'; +$lang['direct_quick_search'] = 'Search'; +$lang['direct_content_toggle'] = 'Change Content Width'; -$lang['adjunct_start_logo_text'] = 'Logo: '; -$lang['adjunct_linked_logo_text'] = '. homepage link'; -$lang['a11y_search'] = 'Jump to the search'; -$lang['a11y_sidebartoggle'] = 'Open/Close Sidebar'; +$lang['adjunct_linked_logo_text'] = ' - homepage link'; +$lang['a11y_sidebartoggle'] = 'Show/Hide Navigation'; $lang['nav-area-head'] = 'menus and quick search'; $lang['head_magic_matcher'] = 'MagicMatcher'; $lang['head_quick_search'] = 'quick search'; -$lang['head_menu_main'] = 'main menu'; $lang['head_menu_status'] = 'site status'; -$lang['head_breadcrumb'] = 'location indicator'; +$lang['head_breadcrumb_youarehere'] = 'location indicator'; $lang['head_menu_trace'] = 'Last Visited Pages'; $lang['head_meta_box'] = 'meta data for this page'; $lang['head_menu_starred'] = 'Starred Pages'; +$lang['head_menu_tool-select'] = 'Tools'; $lang['jump_to_quicksearch'] = 'Jump to quick search'; +/** it will be shown from plugin lang.php: $lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none'; $lang['meta_box_tags_none'] = 'tags found: none'; $lang['js']['meta_box_toc_none'] = 'no Table of Contents available'; +$lang['prefix_tasks_user'] = 'Your open tasks: '; +*/ + +$lang['custom_modeswitch'] = 'Light switch'; $lang['tab_tags'] = 'Tags'; $lang['tab_issues'] = 'Issues'; -$lang['quality_trigger'] = 'toggle page analysis'; +$lang['quality_trigger'] = 'Show/Hide page analysis'; -$lang['prefix_tasks'] = 'open tasks: '; $lang['prefix_tasks_page'] = 'open tasks for this page: '; -$lang['tasks_page_none'] = 'There are no open tasks for this page.'; -$lang['tasks_page_intime'] = 'There are %1$d open tasks on this page.'; -$lang['tasks_page_late'] = 'There are %1$d open tasks on this page, %2$d are late.'; +$lang['tasks_page_none'] = 'no open tasks on this page'; +$lang['tasks_page_intime'] = 'open tasks on this page: %1$d'; +$lang['tasks_page_late'] = 'open tasks on this page: %1$d, to late: %2$d'; + +/** is not used $lang['discussion'] = 'Discussion'; $lang['back_to_article'] = 'Back to article'; $lang['userpage'] = 'User page'; +*/ $lang['meta_data'] = 'Meta Data'; $lang['osm_zoom_link_text'] = 'view larger map'; $lang['osm_zoom_link_title'] = 'external link opens new window'; + $lang['image_detail'] = 'image details'; +$lang['mode_edit'] = 'Editing Page'; +$lang['nav_sidebar'] = 'Navigation'; +$lang['nav_sitemap'] = 'Site Tree'; + /** - * colors + * preferences colors */ $lang['__site_width__'] = 'content - width (in %)'; -$lang['__background__'] = 'website - background color'; -$lang['__text_webframe__'] = 'website unlinked: claim, title, footer, navigation - font color'; +$lang['__background_site__'] = 'website - background color'; +$lang['__text_webframe__'] = 'claim, title, footer (unlinked), navigation (unlinked) - font color'; -$lang['__nav_menu_color__'] = 'link: navigation, footer, pagetools icons, tabbox - font color'; -$lang['__nav_menu_hover_color__'] = 'link: navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color'; -$lang['__nav_menu_hover_bg__'] = 'link: navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color'; +$lang['__nav_menu_color__'] = 'navigation (link), footer (link), pagetools icons, tabbox - font color'; +$lang['__nav_menu_hover_color__'] = 'navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color'; +$lang['__nav_menu_hover_bg__'] = 'navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color'; -$lang['__background_content__'] = 'content, breadcrumb, pagetools (hover) - background color'; +$lang['__background__'] = 'content, breadcrumb, pagetools (hover) - background color'; $lang['__text__'] = 'content: text - font color'; $lang['__background_neu__'] = 'Content neutral (not too different from the content background) - background color'; @@ -87,8 +98,9 @@ $lang['__missing__'] = 'links to non-existing pages - font color' $lang['__button_color__'] = 'buttons - font color'; $lang['__button_background__'] = 'buttons - background color'; -$lang['__background_alt__'] = 'table head, hover: table cell, struct Label - background color (alternative)'; -$lang['__text_alt__'] = 'table head unlinked, hover: table cell, struct Label - font color (alternative)'; +$lang['__background_alt__'] = 'table head, table cell (hover), struct Label (hover) - background color (alternative)'; +$lang['__text_alt__'] = 'table head: unlinked, table cell (hover), struct Label (hover) - font color (alternative)'; +$lang['__link_alt__'] = 'table head: linked - font color (alternative)'; $lang['__border__'] = 'tables, form fields, blockquotes - border color'; $lang['__default_border_radius__'] = 'wiki icons, content (top right) - border radius'; diff --git a/lang/en/settings.php b/lang/en/settings.php index c210f07..e71229c 100755 --- a/lang/en/settings.php +++ b/lang/en/settings.php @@ -11,4 +11,10 @@ $lang['sidebar_sections_o_h1,h2'] = '1st and 2nd order headings'; $lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'All headings'; $lang['sidebar_sections_o_li.level1 > .li'] = 'Top-level list items'; +$lang['header_layout'] = 'Adjust header layout:'; +$lang['header_layout_o_default'] = 'generous header layout for long wiki titel and tagline'; +$lang['header_layout_o_compact'] = 'compact header layout for short wiki title and hidden tagline'; +$lang['autocollapse'] = 'Automatically collapse the sidebar when viewing non-content pages for more screen estate.'; +$lang['closedwiki'] = 'This is a closed wiki. Hide most wiki functionality before user has logged in.'; +$lang['copyright'] = 'Copyright notice. Use %year%, %title%, and %TITLE% as placeholders. May contain HTML. You probably want to disable the default license notice.'; diff --git a/lang/es/lang.php b/lang/es/lang.php new file mode 100755 index 0000000..e8c2321 --- /dev/null +++ b/lang/es/lang.php @@ -0,0 +1,104 @@ + .li'] = 'Items del mayor nivel en listas'; + +$lang['header_layout'] = 'Adjust header layout:'; +$lang['header_layout_o_default'] = 'disposición generosa del encabezado (para título y lema de la wiki largos)'; +$lang['header_layout_o_compact'] = 'disposición compacta del encabezado (para título corto de la wiki y lema oculto)'; diff --git a/lang/es/style.txt b/lang/es/style.txt new file mode 100755 index 0000000..df61094 --- /dev/null +++ b/lang/es/style.txt @@ -0,0 +1 @@ +Si desea cambiar el favicon, use el Administrador de Ficheros para subir un ''favicon.ico'' en el subespacio ''wiki'' o RAIZ, y se utilizará automáticamente. Si usa una wiki cerrada, se recomienda dar permiso de lectura para todo el mundo en la configuracion de ACL, en el espacio de nombres ''wiki'' (o RAIZ), o los usuarios no conectados, no podrán ver el favicon. \ No newline at end of file diff --git a/lang/fr/lang.php b/lang/fr/lang.php new file mode 100644 index 0000000..7c83a66 --- /dev/null +++ b/lang/fr/lang.php @@ -0,0 +1,63 @@ + + * @author ISKANDER REKIK + */ +$lang['direct_prefix'] = 'sauter à '; +$lang['direct_content_main'] = 'Contenu principal'; +$lang['direct_quick_search'] = 'Chercher'; +$lang['direct_content_toggle'] = 'Changer la largeur du contenu'; +$lang['adjunct_linked_logo_text'] = '- lien page d\'accueil'; +$lang['a11y_sidebartoggle'] = 'Cacher/Afficher Navigation'; +$lang['nav-area-head'] = 'menus et recherche rapide'; +$lang['head_magic_matcher'] = 'Correspondance Magique'; +$lang['head_quick_search'] = 'recherche rapide'; +$lang['head_menu_status'] = 'statut du site'; +$lang['head_breadcrumb_youarehere'] = 'indicateur d\'emplacement'; +$lang['head_menu_trace'] = 'Pages récemment visitées'; +$lang['head_meta_box'] = 'meta données pour cette page'; +$lang['head_menu_starred'] = 'Pages suivies'; +$lang['head_menu_tool-select'] = 'Outils'; +$lang['jump_to_quicksearch'] = 'Sauter à la recherche rapide'; +$lang['tab_tags'] = 'Étiquettes'; +$lang['tab_issues'] = 'problèmes'; +$lang['quality_trigger'] = 'Afficher/Cacher les analyses de la page'; +$lang['prefix_tasks_page'] = 'tâches ouvertes sur cette page:'; +$lang['tasks_page_none'] = 'pas de tâches ouvertes sur cette page'; +$lang['tasks_page_intime'] = 'tâches ouvertes sur cette page: %1$d'; +$lang['tasks_page_late'] = 'tâches ouvertes sur cette page: %1$d, sur %2$d'; +$lang['meta_data'] = 'Meta données'; +$lang['osm_zoom_link_text'] = 'Voire carte plus large'; +$lang['osm_zoom_link_title'] = 'lien externe ouvre une nouvelle fenêtre'; +$lang['image_detail'] = 'détails de l\'image'; +$lang['mode_edit'] = 'Page d\'édition'; +$lang['nav_sidebar'] = 'Navigation'; +$lang['nav_sitemap'] = 'Arborescence du site'; +$lang['__site_width__'] = 'contenu - largeur en %'; +$lang['__background_site__'] = 'site - coleur de fond'; +$lang['__text_webframe__'] = 'Annonce, titre, pied de page (sans lien), navigation (sans lien) - couleur de police'; +$lang['__nav_menu_color__'] = 'navigation (lien), pied de page (lien), icône outils de page, boîte d\'onglets - couleur de police'; +$lang['__nav_menu_hover_color__'] = 'navigation (survol) - couleur de police, de bord ; icônes du wiki - couleur de police ; icônes du wiki (survol) - couleur de fond'; +$lang['__nav_menu_hover_bg__'] = 'navigation (survol) - couleur de fond ; icônes du wiki - couleur de fond ; icônes du wiki (survol) - couleur de police'; +$lang['__background__'] = 'contenu, miettes, outils de page (survol) - couleur de fond'; +$lang['__text__'] = 'contenu : texte - couleur de police'; +$lang['__background_neu__'] = 'Contenu neutre (pas trop différent du fond du contenu) - couleur de fond'; +$lang['__text_neu__'] = 'contenu neutre : texte - couleur de police'; +$lang['__background_page_header__'] = 'Contenu : entête, pied de page, contrôle d\'onglet tabinclude inactifs - couleur de fond'; +$lang['__background_page_footer__'] = 'contenu : pied de page, contrôle d\'onglet tabinclude inactifs - couleur de police'; +$lang['__border_light__'] = 'contenu : entête, pied de page - couleur de bordure'; +$lang['__highlight__'] = 'texte emphatique (e.g. résultats de recherche) - couleur de fond'; +$lang['__highlight_text__'] = 'texte emphatique (e.g. résultats de recherche) - couleur de police'; +$lang['__existing__'] = 'liens vers des pages, crayon, outils de page (survol) - couleur de police ; boîte d\'onglets (survol) - couleur de bordure, couleur de police'; +$lang['__link__'] = 'liens vers des pages non wiki (sites externes) - couleur de police'; +$lang['__missing__'] = 'liens vers des pages inexistantes - couleur de police'; +$lang['__button_color__'] = 'boutons - couleur de police'; +$lang['__button_background__'] = 'boutons - couleur de fond'; +$lang['__background_alt__'] = 'entête de tableau, cellules (survol), labels «struct» (survol) - couleur de fond (alternative)'; +$lang['__text_alt__'] = 'entête de tableau : sans lien, cellules (survol), labels «struct» (survol) - couleur de police (alternative)'; +$lang['__link_alt__'] = 'entête de tableau : avec liens - couleur de police (alternative)'; +$lang['__border__'] = 'tableau, champ de formulaire, citations - couleur de bordure'; +$lang['__default_border_radius__'] = 'icônes du wiki, contenu (en haut à droite) - rayon de l\'arrondi de la bordure'; diff --git a/lang/fr/settings.php b/lang/fr/settings.php new file mode 100644 index 0000000..4350307 --- /dev/null +++ b/lang/fr/settings.php @@ -0,0 +1,18 @@ + + */ +$lang['sidebar_sections'] = 'Convertir automatiquement en section ces éléments :'; +$lang['sidebar_sections_o_h1'] = 'titres de premier rang'; +$lang['sidebar_sections_o_h1,h2'] = 'titres de premier et second rang'; +$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'tous les titres'; +$lang['sidebar_sections_o_li.level1 > .li'] = 'items de premier niveau des listes'; +$lang['header_layout'] = 'Ajuster la disposition de l\'entête :'; +$lang['header_layout_o_default'] = 'Disposition d\'entête généreuse pour un titre long et un descriptif'; +$lang['header_layout_o_compact'] = 'Disposition compacte de l\'entête pour un titre court sans descriptif'; +$lang['autocollapse'] = 'Replier automatiquement la barre latérale quand on n\'est pas sur une page de wiki pour donner plus de place aux outils.'; +$lang['closedwiki'] = 'Ceci est un wiki fermé. Cacher la plupart des fonctionnalités avant que l\'utilisateur ne se connecte.'; +$lang['copyright'] = 'Notice de Copyright. Utilisez les expressions %year% pour l\'année, %title% et %TITLE% pour le titre. Peut contenir de l\'HTML. Vous voudrez probablement désactiver la notice de licence par défaut.'; diff --git a/lang/fr/style.txt b/lang/fr/style.txt new file mode 100644 index 0000000..77e21a9 --- /dev/null +++ b/lang/fr/style.txt @@ -0,0 +1 @@ +Si vous voulez changer le //favicon//, utilisez simplement le gestionnaire de médias et envoyez un ''favicon.ico'' dans la catégorie racine ou ''wiki'' et il sera automatiquement utilisé. Si vous utilisez un wiki privé on vous recommande de rendre la catégorie ''wiki'' (ou racine) publique dans les réglages d'ACL, sans quoi votre //favicon// sera invisible aux utilisateurs non connectés. \ No newline at end of file diff --git a/lang/it/lang.php b/lang/it/lang.php new file mode 100644 index 0000000..f6287f8 --- /dev/null +++ b/lang/it/lang.php @@ -0,0 +1,104 @@ + .li'] = 'Primo livello degli elementi di elenco'; + +$lang['header_layout'] = 'Regola il layout dell\'intestazione:'; +$lang['header_layout_o_header-default'] = 'layout di intestazione generoso per un lungo titolo e una tagline'; +$lang['header_layout_o_header-compact'] = 'layout di intestazione compatto per un breve titolo e tagline nascosta'; + diff --git a/lang/it/style.txt b/lang/it/style.txt new file mode 100644 index 0000000..07f41e3 --- /dev/null +++ b/lang/it/style.txt @@ -0,0 +1 @@ +Se vuoi cambiare la favicon, usa semplicemente il Gestore Media per caricare un ''favicon.ico'' nel ''wiki'' o nel namespace di root e verrà automaticamente usato. Se si utilizza un wiki chiuso, si consiglia di rendere leggibile per chiunque lo spazio dei nomi ''wiki'' (o root) nelle impostazioni ACL o il proprio favicon non verrà mostrato agli utenti che hanno effettuato il logout. diff --git a/lang/nl/lang.php b/lang/nl/lang.php new file mode 100644 index 0000000..0393b34 --- /dev/null +++ b/lang/nl/lang.php @@ -0,0 +1,50 @@ + + */ +$lang['direct_prefix'] = 'ga naar'; +$lang['direct_content_main'] = 'Hoofdinhoud'; +$lang['direct_quick_search'] = 'Zoeken'; +$lang['direct_content_toggle'] = 'Wijzig inhoud breedte'; +$lang['adjunct_linked_logo_text'] = 'link naar home pagina'; +$lang['a11y_sidebartoggle'] = 'Toon/Verberg navigatie'; +$lang['nav-area-head'] = 'Menu en snelzoeken'; +$lang['head_quick_search'] = 'Snelzoeken'; +$lang['head_menu_status'] = 'website status'; +$lang['head_menu_trace'] = 'Laatst bezochte pagina\'s'; +$lang['head_meta_box'] = 'meta data voor deze pagina'; +$lang['head_menu_starred'] = 'Gemarkeerde pagina\'s'; +$lang['head_menu_tool-select'] = 'Hulpmiddelen'; +$lang['jump_to_quicksearch'] = 'Ga naar snelzoeken'; +$lang['tab_tags'] = 'Tags'; +$lang['tab_issues'] = 'Onderwerpen'; +$lang['quality_trigger'] = 'Toon/Verberg pagina analyse'; +$lang['prefix_tasks_page'] = 'open taken voor deze pagina'; +$lang['tasks_page_none'] = 'geen openstaande taken voor deze pagina'; +$lang['tasks_page_intime'] = 'open taken op deze pagina: %1$d'; +$lang['tasks_page_late'] = 'open taken op deze pagina: %1$d, over tijd: %2$d'; +$lang['meta_data'] = 'meta data'; +$lang['osm_zoom_link_text'] = 'bekijk grotere kaart'; +$lang['osm_zoom_link_title'] = 'externe link opent in een nieuw venster'; +$lang['image_detail'] = 'afbeelding details'; +$lang['mode_edit'] = 'Bewerk pagina'; +$lang['nav_sidebar'] = 'Navigatie'; +$lang['nav_sitemap'] = 'Site structuur'; +$lang['__site_width__'] = 'inhoud - breedte (in %)'; +$lang['__background_site__'] = 'website - kleur achtergrond'; +$lang['__text_webframe__'] = 'claim, titel, footer (niet gelinkt), navigatie (niet gelinkt) - tekstkleur'; +$lang['__nav_menu_color__'] = 'navigatie (link), footer (link), pagina-hulpmiddelen iconen, tabbox, tekstkleur'; +$lang['__nav_menu_hover_color__'] = 'navigatie (hover), tekstkleur, kader kleur; wiki iconen - tekstkleur; wiki iconen (hover) - kleur achtergrond'; +$lang['__nav_menu_hover_bg__'] = 'navigatie (hover), kleur achtergrond; wiki iconen - kleur achtergrond; wiki iconen (hover) - tekstkleur'; +$lang['__background__'] = 'inhoud, broodkruimels, pagina hulpmiddelen (hover) - kleur achtergrond'; +$lang['__text__'] = 'inhoud: tekst - tekstkleur'; +$lang['__highlight__'] = 'tekst accentuering (bijv. voor zoekresultaten) - kleur achtergrond'; +$lang['__highlight_text__'] = 'tekst accentuering (bijv. voor zoekresultaten) - tekstkleur'; +$lang['__existing__'] = 'links naar wiki-pagina\'s, pen, pagina-hulpmiddelen (hover) - tekstkleur; tabbox (hover) - tekstkleur, kader kleur'; +$lang['__link__'] = 'links naar niet wiki-pagina\'s (externe links) - tekstkleur'; +$lang['__missing__'] = 'links naar niet niet bestaande pagina\'s (externe links) - tekstkleur'; +$lang['__button_color__'] = 'buttons - tekstkleur'; +$lang['__button_background__'] = 'buttons - kleur achtergrond'; diff --git a/lang/nl/settings.php b/lang/nl/settings.php new file mode 100644 index 0000000..cad6dc5 --- /dev/null +++ b/lang/nl/settings.php @@ -0,0 +1,8 @@ + + */ +$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'Alle koppen'; diff --git a/lang/nl/style.txt b/lang/nl/style.txt new file mode 100644 index 0000000..e13bbde --- /dev/null +++ b/lang/nl/style.txt @@ -0,0 +1 @@ +Gebruik de Media Manager voor het wijzigen van de favicon. Upload een "favicon.ico" naar de "wiki" of root namespace en deze wordt automatisch gebruikt. Bij een gesloten Wiki wordt aanbevolen om de "wiki" of root namespace leesbaar te maken in de ACL settings, anders is de favicon niet zichtbaar voor niet ingelogde gebruikers. \ No newline at end of file diff --git a/lang/ru/lang.php b/lang/ru/lang.php new file mode 100644 index 0000000..4f7479c --- /dev/null +++ b/lang/ru/lang.php @@ -0,0 +1,75 @@ + + */ +$lang['direct_prefix'] = 'перейти к'; +$lang['direct_content_main'] = 'Главная страница'; +$lang['direct_quick_search'] = 'Поиск'; +$lang['direct_content_toggle'] = 'Изменить ширину рабочей области'; +$lang['adjunct_linked_logo_text'] = ' - homepage link'; +$lang['a11y_sidebartoggle'] = 'Показать/скрыть навигацию'; +$lang['nav-area-head'] = 'меню и быстрый поиск'; +$lang['head_magic_matcher'] = 'MagicMatcher'; +$lang['head_quick_search'] = 'быстрый поиск'; +$lang['head_menu_status'] = 'статус сайта'; +$lang['head_breadcrumb_youarehere'] = '«хлебные крошки»'; +$lang['head_menu_trace'] = 'Последние посещённые страницы'; +$lang['head_meta_box'] = 'мета-данные страницы'; +$lang['head_menu_starred'] = 'Избранные страницы'; +$lang['head_menu_tool-select'] = 'Инструменты'; +$lang['jump_to_quicksearch'] = 'Переход к быстрому поиску'; +$lang['tab_tags'] = 'Теги'; +$lang['tab_issues'] = 'Вопросы'; +$lang['quality_trigger'] = 'Показать/скрыть аналитику'; +$lang['prefix_tasks_page'] = 'открытые задачи по странице: '; +$lang['tasks_page_none'] = 'нет открытых задач по странице'; +$lang['tasks_page_intime'] = 'открытых задач на странице: %1$d'; +$lang['tasks_page_late'] = 'открытых задач на странице: %1$d, до: %2$d'; +$lang['meta_data'] = 'Мета-данные'; +$lang['osm_zoom_link_text'] = 'открыть расширенную карту'; +$lang['osm_zoom_link_title'] = 'внешние ссылки в новом окне'; +$lang['image_detail'] = 'информация по изображению'; +$lang['mode_edit'] = 'Редактирование страницы'; +$lang['nav_sidebar'] = 'Навигация'; +$lang['nav_sitemap'] = 'Карта сайта'; +$lang['__site_width__'] = 'ширина области для контента (в %)'; +$lang['__background_site__'] = 'сайт — цвет фона'; +$lang['__text_webframe__'] = 'заглавие, подвал (без ссылок), навигация (без ссылок) — цвет шрифта'; +$lang['__nav_menu_color__'] = 'навигация (ссылка), подвал (ссылка), иконки инструментов страницы, панель вкладок — цвет шрифта'; +$lang['__nav_menu_hover_color__'] = 'навигация (при наведении) — цвет шрифта, цвет границы; иконки вики — цвет шрифта; иконки вики (при наведении) — цвет фона'; +$lang['__nav_menu_hover_bg__'] = 'навигация (при наведении) — цвет фона; иконки вики — цвет фона; иконки вики (при наведении) — цвет шрифта'; +$lang['__background__'] = 'содержимое, «хлебные крошки», инструменты страницы (при наведении) — цвет фона'; +$lang['__text__'] = 'содержимое: текст — цвет шрифта'; +$lang['__background_neu__'] = 'нейтральное содержимое (не сильно отличается от фонового содержимого) — цвет фона'; +$lang['__text_neu__'] = 'нейтральное содержимое: текст — цвет шрифта'; +$lang['__background_page_header__'] = 'содержимое: заголовок, подвал, неактивные вкладки (плагин TabInclude) — цвет фона'; +$lang['__background_page_footer__'] = 'содержимое: подвал, неактивные вкладки (плагин TabInclude) — цвет шрифта'; +$lang['__border_light__'] = 'содержимое: заголовок, подвал — цвет границы'; +$lang['__highlight__'] = 'подчёркнутый текст (например, результаты поиска) — цвет фона'; +$lang['__highlight_text__'] = 'подчёркнутый текст (например, результаты поиска) — цвет шрифта'; +$lang['__existing__'] = 'ссылки на вики-страницы, карандаш, инструменты страницы (при наведении) — цвет шрифта; панель вкладок (при наведении) — цвет шрифта, цвет границы'; +$lang['__link__'] = 'ссылки на внешние страницы — цвет шрифта'; +$lang['__missing__'] = 'ссылки на не существующие страницы — цвет шрифта'; +$lang['__button_color__'] = 'кнопки — цвет шрифта'; +$lang['__button_background__'] = 'кнопки — цвет фона'; +$lang['__background_alt__'] = 'заголовок таблицы, ячейка таблицы (при наведении), метка (Label) плагина Stuct (при наведении) — цвет фона (альтернативный)'; +$lang['__text_alt__'] = 'заголовок таблицы: без ссылки, ячейка таблицы (при наведении), метка (Label) плагина Stuct (при наведении) — цвет шрифта (альтернативный)'; +$lang['__link_alt__'] = 'заголовок таблицы: связанная — цвет шрифта (альтернативный)'; +$lang['__border__'] = 'таблицы, поля форм, цитаты — цвет границы'; +$lang['__default_border_radius__'] = 'иконки вики, содержимое (верхний правый угол) — радиус скругления углов'; diff --git a/lang/ru/settings.php b/lang/ru/settings.php new file mode 100644 index 0000000..37b8459 --- /dev/null +++ b/lang/ru/settings.php @@ -0,0 +1,17 @@ + + */ +$lang['sidebar_sections'] = 'Автоматически переключать боковую панель в секциях'; +$lang['sidebar_sections_o_h1'] = 'Заголовок 1 уровня'; +$lang['sidebar_sections_o_h1,h2'] = 'Заголовки 1 и 2 уровня'; +$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'Все заголовки'; +$lang['sidebar_sections_o_li.level1 > .li'] = 'Первые элементы в списках'; +$lang['header_layout'] = 'Настройка размещения заголовков'; +$lang['header_layout_o_default'] = 'разрежённое размещение длинных вики-заголовков и блоков тегов'; +$lang['header_layout_o_compact'] = 'компактное размещение длинных вики-заголовков и блоков тегов'; diff --git a/lang/ru/style.txt b/lang/ru/style.txt new file mode 100644 index 0000000..99f0a95 --- /dev/null +++ b/lang/ru/style.txt @@ -0,0 +1 @@ +If you'd like to change the favicon, simply use the Media Manager to upload a ''favicon.ico'' into the ''wiki'' or the root namespace and it will automatically be used. If you use a closed wiki it is recommended to make the ''wiki'' (or root) namespace world readable in the ACL settings or your favicon will not be shown to logged-out users. diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php new file mode 100644 index 0000000..003e4ad --- /dev/null +++ b/lang/zh-tw/lang.php @@ -0,0 +1,13 @@ + + */ +$lang['head_menu_trace'] = '最近瀏覽的頁面'; +$lang['head_menu_tool-select'] = '工具'; +$lang['tab_tags'] = '標籤'; +$lang['quality_trigger'] = '顯示/隱藏頁面分析'; +$lang['prefix_tasks_page'] = '此頁尚未完成的工作：'; +$lang['tasks_page_none'] = '此頁工作都已完成'; diff --git a/lang/zh-tw/settings.php b/lang/zh-tw/settings.php new file mode 100644 index 0000000..991a7e1 --- /dev/null +++ b/lang/zh-tw/settings.php @@ -0,0 +1,10 @@ + + */ +$lang['sidebar_sections_o_li.level1 > .li'] = '上層清單項目'; +$lang['header_layout_o_default'] = '寬裕的頁首佈局（適用於較長的 wiki 標題及副標題）'; +$lang['header_layout_o_compact'] = '精簡的頁首佈局（適用於較短的 wiki 標題及隱藏副標題）'; diff --git a/lang/zh-tw/style.txt b/lang/zh-tw/style.txt new file mode 100644 index 0000000..d0ea161 --- /dev/null +++ b/lang/zh-tw/style.txt @@ -0,0 +1 @@ +若您想變更 favicon，只要將一個 ''favicon.ico'' 檔案上傳到 ''wiki'' 或 root 分類名稱下，系統就會自動使用該檔案。如果您使用封閉的 wiki，建議您在 ACL 設定中將 ''wiki''（或 root）分類名稱設為公開，不然未登入的使用者將無法看到您的 favicon。 \ No newline at end of file diff --git a/main.php b/main.php index 43de9d5..fdb3d9c 100755 --- a/main.php +++ b/main.php @@ -1,4 +1,3 @@ - tpl_getCon $showTools = true; $showSidebar = true; ?> + + fullWidthClass(); ?> - + -
+
no-print">
-
-
-
- - - -
+ +
+
+ getDropdown(); + } else { + //Pre-Greebo Backwards compatibility + tpl_actiondropdown($lang['tools'], "test"); + } + ?> +
- -
-
- -

- - -

- -
-
@@ -173,7 +169,8 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
-
+ server->has('REMOTE_USER')) { ?> +
@@ -187,6 +184,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; include('tpl/main-sidebar-search.php'); ?>
+
@@ -209,6 +207,8 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; ?>
- +
@@ -245,11 +245,6 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; if($mm && $matcher !== ""){ include('tpl/nav-magicmatcher.php'); } - -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ -/* Include Hook: header.html */ -/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - tpl_includeFile('header.html'); ?>
@@ -277,9 +272,11 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
+ server->has('REMOTE_USER')) { ?>
- +
+
@@ -306,7 +303,9 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ /* page tools */ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ - include('tpl/nav-page-tools.php'); + if(!tpl_getConf('closedwiki') || $INPUT->server->has('REMOTE_USER')) { + include('tpl/nav-page-tools.php'); + } ?>
@@ -332,8 +331,17 @@ $classWideContent = ($ACT === "show") ? "": "wide-content "; echo $highlightParent->tpl(); } ?> -
-
+ showTranslations(); + } + ?> +
+
+
+
-

- -

+
@@ -418,5 +417,14 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
+ diff --git a/mediamanager.php b/mediamanager.php index dd98bf3..7d45615 100755 --- a/mediamanager.php +++ b/mediamanager.php @@ -1,4 +1,3 @@ - + _event = 'SVG_CACHE'; + $cache = new \dokuwiki\Cache\Cache($cachekey, '.svg'); + $cache->setEvent('SVG_CACHE'); http_cached($cache->cache, $cache->useCache(array('files' => array($file, __FILE__)))); if($params['e']) { @@ -173,11 +175,16 @@ class SVG { $xml = simplexml_load_file($file, SvgNode::class); $def = hsc((string) $xml->path['d']); - $w = hsc($xml['width']); - $h = hsc($xml['height']); + $w = hsc($xml['width'] ?? '100%'); + $h = hsc($xml['height'] ?? '100%'); $v = hsc($xml['viewBox']); - return ""; + // if viewbox is not defined, construct it from width and height, if available + if (empty($v) && !empty($w) && !empty($h)) { + $v = hsc("0 0 $w $h"); + } + + return ""; } /** @@ -316,9 +323,18 @@ class SVG { */ protected function initReplacements() { global $conf; - define('SIMPLE_TEST', 1); // hacky shit - include DOKU_INC . 'lib/exe/css.php'; - $ini = css_styleini($conf['template']); + if (!class_exists('\dokuwiki\StyleUtils')) { + // Pre-Greebo Compatibility + + define('SIMPLE_TEST', 1); // hacky shit + include DOKU_INC . 'lib/exe/css.php'; + $ini = css_styleini($conf['template']); + $this->replacements = $ini['replacements']; + return; + } + + $stuleUtils = new \dokuwiki\StyleUtils(); + $ini = $stuleUtils->cssStyleini('sprintdoc'); $this->replacements = $ini['replacements']; } } diff --git a/template.info.txt b/template.info.txt index 861a96e..fd40cd9 100755 --- a/template.info.txt +++ b/template.info.txt @@ -1,7 +1,7 @@ base sprintdoc author Jana Deutschlaender -email deutschlaender@cosmocode.de -date 2017-04-13 +email dokuwiki@cosmocode.de +date 2024-10-14 name sprintDoc Template -desc DokuWiki Template for sprintDoc Project -url FIXME URL +desc modern, responsive template that integrates multiple plugins +url https://www.dokuwiki.org/template:sprintdoc diff --git a/tpl.php b/tpl.php index b5a432f..1334488 100644 --- a/tpl.php +++ b/tpl.php @@ -45,7 +45,7 @@ class tpl { $linktarget = wl($data['id'], $data['params'], false, '&'); } $caption = $lang['btn_' . $data['type']]; - if(strpos($caption, '%s')) { + if(strpos($caption, '%s') !== false) { $caption = sprintf($caption, $data['replacement']); } @@ -83,7 +83,7 @@ class tpl { $args['rel'] = 'nofollow'; } - $args['href'] = $link; + $args['href'] = $link ?: '#'; $svg = inlineSVG($svg); if(!$svg) $svg = inlineSVG(__DIR__ . '/images/tools/' . self::$icons['default']); diff --git a/tpl/main-footer.php b/tpl/main-footer.php new file mode 100644 index 0000000..7e12ae8 --- /dev/null +++ b/tpl/main-footer.php @@ -0,0 +1,25 @@ +'; + tpl_license($img = false, $imgonly = false, $return = false, $wrap = false); + echo '

'; +} + +if (tpl_getConf('copyright')) { + $copy = str_replace( + [ + '%year%', + '%title%', + '%TITLE%', + ], + [ + date('Y'), + $conf['title'], + dokuwiki\Utf8\PhpString::strtoupper($conf['title']), + ], + tpl_getConf('copyright') + ); + echo '

' . $copy . '

'; +} diff --git a/tpl/main-sidebar-nav.php b/tpl/main-sidebar-nav.php index 7998827..d97fa87 100644 --- a/tpl/main-sidebar-nav.php +++ b/tpl/main-sidebar-nav.php @@ -1,48 +1,84 @@ - +getNavigation(); +?> +