Merge branch 'spis-master' into 'master'

num in metabox + togglelink for sitebar

See merge request !9
This commit is contained in:
Jana Deutschländer 2017-01-10 10:03:22 +01:00
commit a67033a090
4 changed files with 261 additions and 162 deletions

View file

@ -41,21 +41,49 @@
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
color: @color-nav; color: @color-nav;
cursor: pointer; cursor: pointer;
transition: @transition color, @transition background-color, @transition border-color;
* { * {
cursor: pointer; cursor: pointer;
} }
.prefix { .prefix {
font-size: .78rem; font-size: .78rem;
color: @color-nav; color: @color-nav;
position: relative;
transition: @transition color;
} }
.num { .num {
position: absolute;
right: -.8rem;
top: -.4rem;
background-color: @color-border;
border-radius: 2px;
color: @color-nav;
font-size: .56rem; font-size: .56rem;
font-weight: 400;
text-align: center;
line-height: 1;
padding: .2em .2rem .1em;
transition: @transition color, @transition background-color;
} }
&:hover, &:focus, &:active { &:hover,
color: @color-link; &:focus,
&:active {
background-color: @background_page-header; background-color: @background_page-header;
border-color: @color-border; border-color: @color-border;
border-bottom-color: transparent; border-bottom-color: transparent;
color: @button_background;
.prefix {
color: @button_background;
}
.num {
background-color: @button_background;
color: @button_color;
}
} }
} }
&.active > a { &.active > a {

65
css/area_togglelink.less Normal file
View file

@ -0,0 +1,65 @@
/**
* This file provides the design styles for the sidebar (navmain).
*
* @author Jana Deutschlaender <deutschlaender@cosmocode.de>
*/
#dokuwiki__content {
overflow: visible;
.togglelink {
&.page_main-content {
position: absolute;
top: -1px;
left: -2rem;
z-index: 1;
a {
display: block;
width: 2rem;
height: 3.1rem;
background-color: #F6F6F6;
border: solid 1px @color-border;
border-radius: 2px 0 0 2px;
text-decoration: none;
text-align: center;
padding-top: .9em;
transition: @transition color, @transition background-color, @transition border-color;
&:hover,
&:focus,
&:active {
background-color: @button_background;
border-color: @button_background;
color: @button_color;
text-decoration: none;
* {
color: inherit;
text-decoration: none;
}
}
}
}
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* min-width: 1440px */
@media @screen_min-xlg {
#dokuwiki__content .togglelink {
}
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* max-width: 1199px */
@media @screen_max-xlg {
#dokuwiki__content .togglelink {
}
}

View file

@ -327,6 +327,11 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
</div> </div>
<div id="dokuwiki__content" class="page main-content"> <div id="dokuwiki__content" class="page main-content">
<div class="togglelink page_main-content">
<a href="#">&lt; &gt;<span class="sr-out">auf/zu</span></a>
</div>
<div id="meta-box"> <div id="meta-box">
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_meta_box') ?></h6> <h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_meta_box') ?></h6>

321
style.ini
View file

@ -1,160 +1,161 @@
; Please see http://www.php.net/manual/en/function.parse-ini-file.php ; Please see http://www.php.net/manual/en/function.parse-ini-file.php
; for limitations of the ini format used here ; for limitations of the ini format used here
; To extend this file or make changes to it, it is recommended to create ; To extend this file or make changes to it, it is recommended to create
; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing ; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing
; any changes after an upgrade. ; any changes after an upgrade.
; Please don't forget to copy the section your changes should be under ; Please don't forget to copy the section your changes should be under
; (i.e. [stylesheets] or [replacements]) into that file as well. ; (i.e. [stylesheets] or [replacements]) into that file as well.
; Define the stylesheets your template uses here. The second value ; Define the stylesheets your template uses here. The second value
; defines for which output media the style should be loaded. Currently ; defines for which output media the style should be loaded. Currently
; print, screen and all are supported. ; print, screen and all are supported.
; You can reference CSS and LESS files here. Files referenced here will ; You can reference CSS and LESS files here. Files referenced here will
; be checked for updates when considering a cache rebuild while files ; be checked for updates when considering a cache rebuild while files
; included through LESS' @import statements are not ; included through LESS' @import statements are not
[stylesheets] [stylesheets]
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; DokuWiki Default Template Styles ; DokuWiki Default Template Styles
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
../dokuwiki/css/_imgdetail.css = screen ../dokuwiki/css/_imgdetail.css = screen
../dokuwiki/css/_media_popup.css = screen ../dokuwiki/css/_media_popup.css = screen
../dokuwiki/css/_media_fullscreen.css = screen ../dokuwiki/css/_media_fullscreen.css = screen
../dokuwiki/css/_fileuploader.css = screen ../dokuwiki/css/_fileuploader.css = screen
../dokuwiki/css/_tabs.css = screen ../dokuwiki/css/_tabs.css = screen
../dokuwiki/css/_links.css = screen ../dokuwiki/css/_links.css = screen
../dokuwiki/css/_toc.css = screen ../dokuwiki/css/_toc.css = screen
../dokuwiki/css/_footnotes.css = screen ../dokuwiki/css/_footnotes.css = screen
../dokuwiki/css/_search.css = screen ../dokuwiki/css/_search.css = screen
../dokuwiki/css/_recent.css = screen ../dokuwiki/css/_recent.css = screen
../dokuwiki/css/_diff.css = screen ../dokuwiki/css/_diff.css = screen
../dokuwiki/css/_edit.css = screen ../dokuwiki/css/_edit.css = screen
../dokuwiki/css/_modal.css = screen ../dokuwiki/css/_modal.css = screen
../dokuwiki/css/_forms.css = screen ../dokuwiki/css/_forms.css = screen
../dokuwiki/css/_admin.css = screen ../dokuwiki/css/_admin.css = screen
../dokuwiki/css/pagetools.less = screen ../dokuwiki/css/pagetools.less = screen
../dokuwiki/css/content.less = screen ../dokuwiki/css/content.less = screen
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; sprintDoc Template Styles ; sprintDoc Template Styles
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; responsive behaviour for structure and areas is handled in style modules ; responsive behaviour for structure and areas is handled in style modules
; _____________ basic styles _____________ ; _____________ basic styles _____________
css/base.less = all css/base.less = all
css/base_mixins.less = all css/base_mixins.less = all
css/base_fontello-codes.less = all css/base_fontello-codes.less = all
css/base_fonts.less = all css/base_fonts.less = all
css/base_structure.less = all css/base_structure.less = all
css/base_design.less = all css/base_design.less = all
; _____________ area styles _____________ ; _____________ area styles _____________
css/area_content.less = all css/area_content.less = all
css/area_header.less = all css/area_header.less = all
css/area_footer.less = all css/area_footer.less = all
css/area_nav-direct.less = all css/area_nav-direct.less = all
css/area_nav-breadcrumb.less = all css/area_nav-breadcrumb.less = all
css/area_nav-usertools.less = all css/area_nav-usertools.less = all
css/area_sidebar-search.less = all css/area_sidebar-search.less = all
css/area_nav-pagetools.less = all css/area_nav-pagetools.less = all
css/area_nav-metabox.less = all css/area_nav-metabox.less = all
css/area_main-sidebar.less = all css/area_main-sidebar.less = all
css/area_sidetools.less = all css/area_sidetools.less = all
css/area_main-content.less = all css/area_main-content.less = all
css/area_togglelink.less = all
; _____________ plugin styles _____________
; _____________ plugin styles _____________
css/plugins/popupviewer.less = all
css/plugins/magic-matcher.less = all css/plugins/popupviewer.less = all
css/plugins/do_tasks.less = all css/plugins/magic-matcher.less = all
css/plugins/struct.less = all css/plugins/do_tasks.less = all
css/plugins/bureaucracy.less = all css/plugins/struct.less = all
css/plugins/bureaucracy.less = all
; _____________ print styles _____________
; _____________ print styles _____________
css/print.css = print
css/print.css = print
; This section is used to configure some placeholder values used in
; the stylesheets. Changing this file is the simplest method to ; This section is used to configure some placeholder values used in
; give your wiki a new look. ; the stylesheets. Changing this file is the simplest method to
; Placeholders defined here will also be made available as LESS variables ; give your wiki a new look.
; (with surrounding underscores removed, and the prefix @ini_ added) ; Placeholders defined here will also be made available as LESS variables
; (with surrounding underscores removed, and the prefix @ini_ added)
[replacements]
[replacements]
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; guaranteed dokuwiki color placeholders that every plugin can use ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; guaranteed dokuwiki color placeholders that every plugin can use
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; main text and background colors
__text__ = "#252525" ; @ini_text ; main text and background colors
__background__ = "#ECECEC" ; @ini_background __text__ = "#252525" ; @ini_text
__background__ = "#ECECEC" ; @ini_background
; alternative text and background colors
__text_alt__ = "#454545" ; @ini_text_alt ; alternative text and background colors
__background_alt__ = "#e8e8e8" ; @ini_background_alt __text_alt__ = "#454545" ; @ini_text_alt
__background_alt__ = "#e8e8e8" ; @ini_background_alt
; neutral text and background colors
__text_neu__ = "#656565" ; @ini_text_neu ; neutral text and background colors
__background_neu__ = "#ffffff" ; @ini_background_neu __text_neu__ = "#656565" ; @ini_text_neu
__background_neu__ = "#ffffff" ; @ini_background_neu
; border color
__border__ = "#cccccc" ; @ini_border ; border color
__border__ = "#cccccc" ; @ini_border
; highlighted text (e.g. search snippets)
__highlight__ = "#efefef" ; @ini_highlight ; highlighted text (e.g. search snippets)
__highlight__ = "#efefef" ; @ini_highlight
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; template specific placeholders ; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ; template specific placeholders
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
; these are used for links
__link__ = "#286DA8" ; @ini_link ; these are used for links
__existing__ = "#286DA8" ; @ini_existing __link__ = "#286DA8" ; @ini_link
__missing__ = "#CD5360" ; @ini_missing __existing__ = "#286DA8" ; @ini_existing
__missing__ = "#CD5360" ; @ini_missing
__button_color__ = "#FFF"
__button_background__ = "#286DA8" __button_color__ = "#FFF"
__button_background__ = "#286DA8"
; widths
__site_width__ = "64em" ; @ini_site_width ; widths
__sidebar_width__ = "16em" ; @ini_sidebar_width __site_width__ = "64em" ; @ini_site_width
__sidebar_width__ = "16em" ; @ini_sidebar_width
__font_family_screen__ = "roboto, 'helvetica', arial, sans-serif"
__font_family_menu__ = "'roboto condensed', 'helvetica neue', arial, sans-serif" __font_family_screen__ = "roboto, 'helvetica', arial, sans-serif"
__font_family_print__ = "'times new roman', serif" __font_family_menu__ = "'roboto condensed', 'helvetica neue', arial, sans-serif"
__font_family_print__ = "'times new roman', serif"
__nav_direct_background__ = "#FFF"
__nav_direct_color__ = "#286da8" __nav_direct_background__ = "#FFF"
__box_shadow_colored__ = "0 0 .5em rgba(40,109,168,.5)" __nav_direct_color__ = "#286da8"
__box_shadow__ = "0 0 .5em rgb(153,153,153,.5)" __box_shadow_colored__ = "0 0 .5em rgba(40,109,168,.5)"
__box_shadow_offset__ = ".1em .1em .1em rgb(153,153,153,.5)" __box_shadow__ = "0 0 .5em rgb(153,153,153,.5)"
__nav_menu_color__ = "#696969" __box_shadow_offset__ = ".1em .1em .1em rgb(153,153,153,.5)"
__nav_menu_hover_color__ = "#286da8" __nav_menu_color__ = "#696969"
__nav_menu_hover_bg__ = "#FFF" __nav_menu_hover_color__ = "#286da8"
__nav_menu_hover_bg__ = "#FFF"
__background_content__ = "#FFF"
__background_site__ = "#ECECEC" __background_content__ = "#FFF"
__background_site__ = "#ECECEC"
__default_border_radius__ = "5px"
__default_border_radius__ = "5px"
__background_page-header__ = "#F6F6F6"
__background_page-header__ = "#F6F6F6"