Merge branch 'master' into pageattributes
Adjusted some more files to account for changes in the over 100 commits in master since the creation of this branch. SPR-869
This commit is contained in:
commit
3f9d4d521a
85 changed files with 4162 additions and 1910 deletions
106
style.ini
106
style.ini
|
@ -53,8 +53,7 @@
|
|||
|
||||
css/base.less = all
|
||||
css/base_mixins.less = all
|
||||
css/base_fontello-codes.less = all
|
||||
css/base_fonts.less = all
|
||||
css/base_fontello-icons.less = all
|
||||
css/base_structure.less = all
|
||||
css/base_design.less = all
|
||||
|
||||
|
@ -78,6 +77,9 @@ css/area_main-sidebar-content.less = all
|
|||
css/area_main-content.less = all
|
||||
css/area_main-content-secedit.less = all
|
||||
css/area_togglelink.less = all
|
||||
css/area_forms.less = all
|
||||
css/area_search.less = all
|
||||
css/area_tabs.less = all
|
||||
|
||||
css/template_admin.less = all
|
||||
|
||||
|
@ -94,8 +96,12 @@ css/plugins/highlight_parent.less = all
|
|||
css/plugins/edit.less = all
|
||||
css/plugins/mediamanager.less = all
|
||||
css/plugins/tabinclude.less = all
|
||||
css/plugins/tagging.less = all
|
||||
css/plugins/include.less = all
|
||||
css/plugins/edittable.less = all
|
||||
css/plugins/extension__manager.less = all
|
||||
css/plugins/folded.less = all
|
||||
css/plugins/configmanager.less = all
|
||||
|
||||
|
||||
; _____________ print styles _____________
|
||||
|
@ -113,66 +119,72 @@ css/print.css = print
|
|||
[replacements]
|
||||
|
||||
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; guaranteed dokuwiki color placeholders that every plugin can use
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; guaranteed dokuwiki color placeholders that every plugin can use + template specific placeholders
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
|
||||
; main content width (from this ASIDE is calculated)
|
||||
__site_width__ = "73%" ; @ini_site_width
|
||||
|
||||
; main text and background colors
|
||||
__text__ = "#252525" ; @ini_text
|
||||
__background__ = "#ECECEC" ; @ini_background
|
||||
|
||||
; alternative text and background colors
|
||||
__text_alt__ = "#454545" ; @ini_text_alt
|
||||
__background_alt__ = "#f6f6f6" ; @ini_background_alt
|
||||
__background__ = "#ECECEC" ; @ini_background (guaranteed for every plugin)
|
||||
|
||||
; neutral text and background colors
|
||||
__text_neu__ = "#656565" ; @ini_text_neu
|
||||
__background_neu__ = "#ffffff" ; @ini_background_neu
|
||||
__text_webframe__ = "#696969" ; @ini_text_webframe
|
||||
|
||||
|
||||
; icons: usertools, pagetools, metabox, tabbox
|
||||
__nav_menu_color__ = "#696969" ; @ini_nav_menu_color
|
||||
__nav_menu_hover_color__ = "#286da8" ; @ini_nav_menu_hover_color
|
||||
__nav_menu_hover_bg__ = "#FFF" ; @ini_nav_menu_hover_bg
|
||||
|
||||
__background_content__ = "#FFF" ; @ini_background_content
|
||||
__text__ = "#252525" ; @ini_text (guaranteed for every plugin)
|
||||
|
||||
__background_neu__ = "#ffffff" ; @ini_background_neu (guaranteed for every plugin)
|
||||
__text_neu__ = "#656565" ; @ini_text_neu (guaranteed for every plugin)
|
||||
|
||||
__background_page_header__ = "#F6F6F6" ; @ini_background_page_header
|
||||
__border_light__ = "#dadada" ; @ini_border_light
|
||||
__background_page_footer__ = "#252525" ; @ini_background_page_footer
|
||||
|
||||
; border color
|
||||
__border__ = "#bbbbbb" ; @ini_border
|
||||
|
||||
; highlighted text (e.g. search snippets)
|
||||
__highlight__ = "#efefef" ; @ini_highlight
|
||||
__highlight__ = "#efefef" ; @ini_highlight (guaranteed for every plugin)
|
||||
__highlight_text__ = "#252525" ; @ini_highlight_text
|
||||
|
||||
|
||||
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; template specific placeholders
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
|
||||
; these are used for links
|
||||
__link__ = "#286DA8" ; @ini_link
|
||||
__existing__ = "#286DA8" ; @ini_existing
|
||||
__missing__ = "#CD5360" ; @ini_missing
|
||||
__existing__ = "#286DA8" ; @ini_existing
|
||||
__missing__ = "#CD5360" ; @ini_missing
|
||||
__link__ = "#286DA8" ; @ini_link
|
||||
|
||||
__button_color__ = "#FFF"
|
||||
__button_background__ = "#286DA8"
|
||||
|
||||
; widths
|
||||
__site_width__ = "64em" ; @ini_site_width
|
||||
__sidebar_width__ = "16em" ; @ini_sidebar_width
|
||||
; buttons: submit, links styled like buttons, togglebuttons
|
||||
__button_color__ = "#FFF" ; @ini_button_color
|
||||
__button_background__ = "#286DA8" ; @ini_button_background
|
||||
|
||||
__font_family_screen__ = "arial, sans-serif"
|
||||
__font_family_menu__ = "arial, sans-serif"
|
||||
__font_family_print__ = "'times new roman', serif"
|
||||
__background_alt__ = "#f6f6f6" ; @ini_background_alt (guaranteed for every plugin)
|
||||
__text_alt__ = "#454545" ; @ini_text_alt (guaranteed for every plugin)
|
||||
|
||||
__nav_direct_background__ = "#FFF"
|
||||
__nav_direct_color__ = "#286da8"
|
||||
__box_shadow_colored__ = "0 0 .5em rgba(40,109,168,.5)"
|
||||
__box_shadow__ = "0 0 .5em rgb(153,153,153,.5)"
|
||||
__box_shadow_right_bottom__ = "0.1em 0.3rem 0.5em rgb(153,153,153,.5)"
|
||||
__box_shadow_bottom__ = "0 0.1em 0.5em rgb(153,153,153,.5)"
|
||||
__box_shadow_offset__ = ".1em .1em .1em rgb(153,153,153,.5)"
|
||||
__nav_menu_color__ = "#696969"
|
||||
__nav_menu_hover_color__ = "#286da8"
|
||||
__nav_menu_hover_bg__ = "#FFF"
|
||||
|
||||
__background_content__ = "#FFF"
|
||||
__background_site__ = "#ECECEC"
|
||||
; border color
|
||||
__border__ = "#bbbbbb" ; @ini_border (guaranteed for every plugin)
|
||||
|
||||
__default_border_radius__ = "3px"
|
||||
__default_border_radius__ = "3px" ; @ini_default_border_radius
|
||||
|
||||
__background_page-header__ = "#F6F6F6"
|
||||
|
||||
__border_light__ = "#dadada"
|
||||
; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
|
||||
; obsolete
|
||||
|
||||
;__sidebar_width__ = "23%"
|
||||
|
||||
;__font_family_screen__ = "arial, sans-serif"
|
||||
;__font_family_menu__ = "arial, sans-serif"
|
||||
;__font_family_print__ = "times new roman, serif"
|
||||
|
||||
;__box_shadow_colored__ = "0 0 .5em rgba(40,109,168,.5)"
|
||||
;__box_shadow__ = "0 0 .5em rgb(153,153,153,.5)"
|
||||
;__box_shadow_right_bottom__ = "0.1em 0.3rem 0.5em rgb(153,153,153,.5)"
|
||||
;__box_shadow_bottom__ = "0 0.1em 0.5em rgb(153,153,153,.5)"
|
||||
;__box_shadow_offset__ = ".1em .1em .1em rgb(153,153,153,.5)"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue