Browse Source

#2263, tweaking inverted pointing

pull/2300/head
jlukic 10 years ago
parent
commit
d16290eb87
2 changed files with 36 additions and 26 deletions
  1. 42
      src/definitions/collections/menu.less
  2. 20
      src/themes/default/collections/menu.variables

42
src/definitions/collections/menu.less

@ -1265,7 +1265,9 @@ Floated Menu / Item
} }
.ui.inverted.pointing.menu .active.item:after { .ui.inverted.pointing.menu .active.item:after {
background: @invertedArrowActiveColor !important; background: @invertedArrowActiveColor !important;
margin: 0em !important;
box-shadow: none !important; box-shadow: none !important;
border: none !important;
} }
/*--- Active Hover ---*/ /*--- Active Hover ---*/
@ -1327,57 +1329,65 @@ Floated Menu / Item
.ui.inverted.blue.menu { .ui.inverted.blue.menu {
background-color: @blue; background-color: @blue;
} }
.ui.inverted.blue.menu .active.item,
.ui.inverted.blue.pointing.menu .active.item:after { .ui.inverted.blue.pointing.menu .active.item:after {
background-color: @blue;
background-color: @blueActive !important;
} }
/* Green */ /* Green */
.ui.inverted.green.menu { .ui.inverted.green.menu {
background-color: @green; background-color: @green;
} }
.ui.inverted.green.menu .active.item,
.ui.inverted.green.pointing.menu .active.item:after { .ui.inverted.green.pointing.menu .active.item:after {
background-color: @green;
background-color: @greenActive !important;
} }
/* Orange */ /* Orange */
.ui.inverted.orange.menu { .ui.inverted.orange.menu {
background-color: @orange; background-color: @orange;
} }
.ui.inverted.orange.menu .active.item,
.ui.inverted.orange.pointing.menu .active.item:after { .ui.inverted.orange.pointing.menu .active.item:after {
background-color: @orange;
background-color: @orangeActive !important;
} }
/* Pink */ /* Pink */
.ui.inverted.pink.menu { .ui.inverted.pink.menu {
background-color: @pink; background-color: @pink;
} }
.ui.inverted.pink.menu .active.item,
.ui.inverted.pink.pointing.menu .active.item:after { .ui.inverted.pink.pointing.menu .active.item:after {
background-color: @pink;
background-color: @pinkActive !important;
} }
/* Purple */ /* Purple */
.ui.inverted.purple.menu { .ui.inverted.purple.menu {
background-color: @purple; background-color: @purple;
} }
.ui.inverted.purple.menu .active.item,
.ui.inverted.purple.pointing.menu .active.item:after { .ui.inverted.purple.pointing.menu .active.item:after {
background-color: @purple;
background-color: @purpleActive !important;
} }
/* Red */ /* Red */
.ui.inverted.red.menu { .ui.inverted.red.menu {
background-color: @red; background-color: @red;
} }
.ui.inverted.red.menu .active.item,
.ui.inverted.red.pointing.menu .active.item:after { .ui.inverted.red.pointing.menu .active.item:after {
background-color: @red;
background-color: @redActive !important;
} }
/* Teal */ /* Teal */
.ui.inverted.teal.menu { .ui.inverted.teal.menu {
background-color: @teal; background-color: @teal;
} }
.ui.inverted.teal.menu .active.item,
.ui.inverted.teal.pointing.menu .active.item:after { .ui.inverted.teal.pointing.menu .active.item:after {
background-color: @teal;
background-color: @tealActive !important;
} }
/* Yellow */ /* Yellow */
.ui.inverted.yellow.menu { .ui.inverted.yellow.menu {
background-color: @yellow; background-color: @yellow;
} }
.ui.inverted.yellow.menu .active.item,
.ui.inverted.yellow.pointing.menu .active.item:after { .ui.inverted.yellow.pointing.menu .active.item:after {
background-color: @yellow;
background-color: @yellowActive !important;
} }
@ -1550,15 +1560,16 @@ Floated Menu / Item
Pointing Pointing
--------------------*/ --------------------*/
.ui.pointing.menu .active.item:after {
.ui.pointing.menu .item:after {
visibility: hidden;
position: absolute; position: absolute;
content: ''; content: '';
top: 100%; top: 100%;
left: 50%; left: 50%;
transform: translateX(-50%) translateY(-50%) rotate(45deg); transform: translateX(-50%) translateY(-50%) rotate(45deg);
margin: 0em;
background: none; background: none;
margin: (@arrowBorderWidth / 2) 0em 0em;
width: @arrowSize; width: @arrowSize;
height: @arrowSize; height: @arrowSize;
@ -1567,11 +1578,9 @@ Floated Menu / Item
border-right: @arrowBorder; border-right: @arrowBorder;
z-index: @arrowZIndex; z-index: @arrowZIndex;
transition: @arrowTransition; transition: @arrowTransition;
} }
.ui.vertical.pointing.menu .active.item:after {
.ui.vertical.pointing.menu .item:after {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 0%; right: 0%;
@ -1579,13 +1588,18 @@ Floated Menu / Item
left: auto; left: auto;
transform: translateX(50%) translateY(-50%) rotate(45deg); transform: translateX(50%) translateY(-50%) rotate(45deg);
margin: 0em -@arrowBorderSize 0em 0em;
margin: 0em -(@arrowBorderWidth / 2) 0em 0em;
border: none; border: none;
border-top: @arrowBorder; border-top: @arrowBorder;
border-right: @arrowBorder; border-right: @arrowBorder;
} }
/* Active */
.ui.pointing.menu .active.item:after {
visibility: visible;
}
/* Don't double up pointers */ /* Don't double up pointers */
.ui.pointing.menu .dropdown.active.item:after, .ui.pointing.menu .dropdown.active.item:after,
.ui.pointing.menu .active.item .menu .active.item:after { .ui.pointing.menu .active.item .menu .active.item:after {

20
src/themes/default/collections/menu.variables

@ -31,11 +31,7 @@
@itemVerticalPadding: @relativeSmall; @itemVerticalPadding: @relativeSmall;
@itemHorizontalPadding: @relativeLarge; @itemHorizontalPadding: @relativeLarge;
@itemTextTransform: none; @itemTextTransform: none;
@itemTransition:
opacity @defaultDuration @defaultEasing,
background @defaultDuration @defaultEasing,
box-shadow @defaultDuration @defaultEasing
;
@itemTransition: none;
@itemFontWeight: normal; @itemFontWeight: normal;
@itemTextColor: @textColor; @itemTextColor: @textColor;
@ -84,9 +80,9 @@
@verticalHeaderFontWeight: bold; @verticalHeaderFontWeight: bold;
/* Pointing Arrow */ /* Pointing Arrow */
@arrowSize: 0.6em;
@arrowBorderSize: 1px;
@arrowBorder: @arrowBorderSize solid @solidBorderColor;
@arrowSize: 0.5714em;
@arrowBorderWidth: 1px;
@arrowBorder: @arrowBorderWidth solid @solidBorderColor;
@arrowTransition: background @defaultDuration @defaultEasing; @arrowTransition: background @defaultDuration @defaultEasing;
@arrowZIndex: 11; @arrowZIndex: 11;
@ -322,9 +318,9 @@
@paginationActiveTextColor: @selectedTextColor; @paginationActiveTextColor: @selectedTextColor;
/* Labeled Icon */ /* Labeled Icon */
@labeledIconSize: 1.5em;
@labeledIconSize: @relativeMassive;
@labeledIconMinWidth: 6em; @labeledIconMinWidth: 6em;
@labeledIconTextMargin: 0.5em;
@labeledIconTextMargin: 0.5rem;
/* Text */ /* Text */
@ -384,12 +380,12 @@
/* Inverted Active */ /* Inverted Active */
@invertedActiveBackground: @strongTransparentBlack; @invertedActiveBackground: @strongTransparentBlack;
@invertedActiveColor: @invertedSelectedTextColor; @invertedActiveColor: @invertedSelectedTextColor;
@invertedArrowActiveColor: #3C3C3C;
@invertedArrowActiveColor: #1A1A1A;
/* Inverted Active Hover */ /* Inverted Active Hover */
@invertedActiveHoverBackground: @invertedActiveBackground; @invertedActiveHoverBackground: @invertedActiveBackground;
@invertedActiveHoverColor: @white; @invertedActiveHoverColor: @white;
@invertedArrowActiveHoverColor: #3C3C3C;
@invertedArrowActiveHoverColor: @invertedArrowActiveColor;
@invertedSubMenuActiveBackground: transparent; @invertedSubMenuActiveBackground: transparent;
@invertedSubMenuActiveColor: @white; @invertedSubMenuActiveColor: @white;

Loading…
Cancel
Save