Since we have a dark main menu the coloring logic inverted between menu

and child pages macro.
pull/6627/head
Wieland Lindenthal 6 years ago
parent 007f567d62
commit 0001e62d7f
  1. 14
      app/assets/stylesheets/layout/_main_menu.sass
  2. 13
      app/assets/stylesheets/layout/_tree_menu.sass
  3. 2
      app/controllers/custom_styles_controller.rb

@ -392,3 +392,17 @@ a.main-menu--parent-node
@include icon-mixin-arrow-left2
%absolute-layout-mode &
z-index: 100
#main-menu ul ul.main-menu--children ul.pages-hierarchy
.tree-menu--hierarchy-indicator
@include varprop(color, main-menu-font-color)
.tree-menu--item
&.-selected
@include varprop(background, main-menu-bg-selected-background)
.tree-menu--title
@include varprop(color, main-menu-selected-font-color)
&:hover
@include varprop(background, main-menu-bg-hover-background)
.tree-menu--title
@include varprop(color, main-menu-hover-font-color)
text-decoration: none

@ -5,6 +5,8 @@ $tree-menu-item-height: 30px
div.wiki ul.pages-hierarchy,
.pages-hierarchy
line-height: $tree-menu-item-height
margin-left: 0
padding-left: 0
.tree-menu--title
display: inline-block
@ -28,7 +30,7 @@ div.wiki ul.pages-hierarchy,
// default: open arrow down
// collapsed: right arrow
.tree-menu--hierarchy-indicator
@include varprop(color, main-menu-font-color)
@include varprop(color, content-link-color)
height: $tree-menu-item-height
line-height: $tree-menu-item-height
@ -76,14 +78,13 @@ div.wiki ul.pages-hierarchy,
line-height: $tree-menu-item-height
height: $tree-menu-item-height
&.-selected
@include varprop(background, main-menu-bg-selected-background)
@include varprop(background, drop-down-selected-bg-color)
.tree-menu--title
@include varprop(color, main-menu-selected-font-color)
@include varprop(color, drop-down-selected-font-color)
&:hover
@include varprop(background, main-menu-bg-hover-background)
@include varprop(background, drop-down-hover-bg-color)
.tree-menu--title
@include varprop(color, main-menu-hover-font-color)
text-decoration: none
@include varprop(color, drop-down-hover-font-color)

@ -97,7 +97,7 @@ class CustomStylesController < ApplicationController
design_color.save
end
else
# craete that design_color
# create that design_color
design_color = DesignColor.new variable: param_variable, hexcode: param_hexcode
design_color.save
end

Loading…
Cancel
Save