From d16290eb87ad16799ff2bb657b4bd6cb8b9598e4 Mon Sep 17 00:00:00 2001 From: jlukic Date: Mon, 18 May 2015 12:18:17 -0400 Subject: [PATCH] #2263, tweaking inverted pointing --- src/definitions/collections/menu.less | 42 ++++++++++++------- src/themes/default/collections/menu.variables | 20 ++++----- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less index 70ee8a3e4..e6ebe826e 100755 --- a/src/definitions/collections/menu.less +++ b/src/definitions/collections/menu.less @@ -1265,7 +1265,9 @@ Floated Menu / Item } .ui.inverted.pointing.menu .active.item:after { background: @invertedArrowActiveColor !important; + margin: 0em !important; box-shadow: none !important; + border: none !important; } /*--- Active Hover ---*/ @@ -1327,57 +1329,65 @@ Floated Menu / Item .ui.inverted.blue.menu { background-color: @blue; } +.ui.inverted.blue.menu .active.item, .ui.inverted.blue.pointing.menu .active.item:after { - background-color: @blue; + background-color: @blueActive !important; } /* Green */ .ui.inverted.green.menu { background-color: @green; } +.ui.inverted.green.menu .active.item, .ui.inverted.green.pointing.menu .active.item:after { - background-color: @green; + background-color: @greenActive !important; } /* Orange */ .ui.inverted.orange.menu { background-color: @orange; } +.ui.inverted.orange.menu .active.item, .ui.inverted.orange.pointing.menu .active.item:after { - background-color: @orange; + background-color: @orangeActive !important; } /* Pink */ .ui.inverted.pink.menu { background-color: @pink; } +.ui.inverted.pink.menu .active.item, .ui.inverted.pink.pointing.menu .active.item:after { - background-color: @pink; + background-color: @pinkActive !important; } /* Purple */ .ui.inverted.purple.menu { background-color: @purple; } +.ui.inverted.purple.menu .active.item, .ui.inverted.purple.pointing.menu .active.item:after { - background-color: @purple; + background-color: @purpleActive !important; } /* Red */ .ui.inverted.red.menu { background-color: @red; } +.ui.inverted.red.menu .active.item, .ui.inverted.red.pointing.menu .active.item:after { - background-color: @red; + background-color: @redActive !important; } /* Teal */ .ui.inverted.teal.menu { background-color: @teal; } +.ui.inverted.teal.menu .active.item, .ui.inverted.teal.pointing.menu .active.item:after { - background-color: @teal; + background-color: @tealActive !important; } /* Yellow */ .ui.inverted.yellow.menu { background-color: @yellow; } +.ui.inverted.yellow.menu .active.item, .ui.inverted.yellow.pointing.menu .active.item:after { - background-color: @yellow; + background-color: @yellowActive !important; } @@ -1550,15 +1560,16 @@ Floated Menu / Item Pointing --------------------*/ -.ui.pointing.menu .active.item:after { +.ui.pointing.menu .item:after { + visibility: hidden; position: absolute; content: ''; top: 100%; left: 50%; transform: translateX(-50%) translateY(-50%) rotate(45deg); - margin: 0em; background: none; + margin: (@arrowBorderWidth / 2) 0em 0em; width: @arrowSize; height: @arrowSize; @@ -1567,11 +1578,9 @@ Floated Menu / Item border-right: @arrowBorder; z-index: @arrowZIndex; - transition: @arrowTransition; } - -.ui.vertical.pointing.menu .active.item:after { +.ui.vertical.pointing.menu .item:after { position: absolute; top: 50%; right: 0%; @@ -1579,13 +1588,18 @@ Floated Menu / Item left: auto; transform: translateX(50%) translateY(-50%) rotate(45deg); - margin: 0em -@arrowBorderSize 0em 0em; + margin: 0em -(@arrowBorderWidth / 2) 0em 0em; border: none; border-top: @arrowBorder; border-right: @arrowBorder; } +/* Active */ +.ui.pointing.menu .active.item:after { + visibility: visible; +} + /* Don't double up pointers */ .ui.pointing.menu .dropdown.active.item:after, .ui.pointing.menu .active.item .menu .active.item:after { diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables index 010617a15..b8cc85141 100644 --- a/src/themes/default/collections/menu.variables +++ b/src/themes/default/collections/menu.variables @@ -31,11 +31,7 @@ @itemVerticalPadding: @relativeSmall; @itemHorizontalPadding: @relativeLarge; @itemTextTransform: none; -@itemTransition: - opacity @defaultDuration @defaultEasing, - background @defaultDuration @defaultEasing, - box-shadow @defaultDuration @defaultEasing -; +@itemTransition: none; @itemFontWeight: normal; @itemTextColor: @textColor; @@ -84,9 +80,9 @@ @verticalHeaderFontWeight: bold; /* Pointing Arrow */ -@arrowSize: 0.6em; -@arrowBorderSize: 1px; -@arrowBorder: @arrowBorderSize solid @solidBorderColor; +@arrowSize: 0.5714em; +@arrowBorderWidth: 1px; +@arrowBorder: @arrowBorderWidth solid @solidBorderColor; @arrowTransition: background @defaultDuration @defaultEasing; @arrowZIndex: 11; @@ -322,9 +318,9 @@ @paginationActiveTextColor: @selectedTextColor; /* Labeled Icon */ -@labeledIconSize: 1.5em; +@labeledIconSize: @relativeMassive; @labeledIconMinWidth: 6em; -@labeledIconTextMargin: 0.5em; +@labeledIconTextMargin: 0.5rem; /* Text */ @@ -384,12 +380,12 @@ /* Inverted Active */ @invertedActiveBackground: @strongTransparentBlack; @invertedActiveColor: @invertedSelectedTextColor; -@invertedArrowActiveColor: #3C3C3C; +@invertedArrowActiveColor: #1A1A1A; /* Inverted Active Hover */ @invertedActiveHoverBackground: @invertedActiveBackground; @invertedActiveHoverColor: @white; -@invertedArrowActiveHoverColor: #3C3C3C; +@invertedArrowActiveHoverColor: @invertedArrowActiveColor; @invertedSubMenuActiveBackground: transparent; @invertedSubMenuActiveColor: @white;