From 2df87210a03cfa4a444a0b279805fdda52f854d0 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 12 Mar 2015 18:19:02 -0400 Subject: [PATCH] Iteration on menu flex fixes --- src/definitions/collections/menu.less | 7 +++---- src/themes/default/collections/menu.variables | 5 ++++- src/themes/github/collections/menu.variables | 20 +++++++++---------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less index a0c978313..8ed0110a2 100755 --- a/src/definitions/collections/menu.less +++ b/src/definitions/collections/menu.less @@ -236,6 +236,9 @@ min-width: ~"calc(100% - 1px)"; box-shadow: @dropdownBoxShadow; } +.ui.menu .dropdown.item .menu .item { + display: block; +} .ui.menu:not(.secondary) .pointing.dropdown.item .menu { border-top-left-radius: 0em; border-top-right-radius: 0em; @@ -651,10 +654,6 @@ Floated Menu / Item } /* Coupling with segment for attachment */ -.ui.attached.tabular.menu { - position: relative; - z-index: 2; -} .ui.tabular.menu + .bottom.attached.segment, .ui.tabular.menu ~ .bottom.attached.segment + .bottom.attached.segment { border-top: none; diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables index b71c2fc79..70b0e2c77 100644 --- a/src/themes/default/collections/menu.variables +++ b/src/themes/default/collections/menu.variables @@ -188,7 +188,10 @@ ; @verticalActivePointerSize: 2px; -@verticalActiveBoxShadow: @verticalActivePointerSize 0em 0em inset; +@verticalActiveBoxShadow: + (@verticalActivePointerSize - @borderWidth) 0em 0em inset, + -@borderWidth 0em 0em +; /* Secondary */ diff --git a/src/themes/github/collections/menu.variables b/src/themes/github/collections/menu.variables index 6dcbc1124..82fe8160a 100644 --- a/src/themes/github/collections/menu.variables +++ b/src/themes/github/collections/menu.variables @@ -2,21 +2,21 @@ Collection --------------------*/ -@itemVerticalPadding : 1em; -@itemHorizontalPadding : 1.25em; +@itemVerticalPadding: 1em; +@itemHorizontalPadding: 1.25em; -@background : #FFFFFF linear-gradient(rgba(255, 255, 255, 0.05), rgba(0, 0, 0, 0.05)); -@fontWeight : normal; +@background: #FFFFFF linear-gradient(rgba(255, 255, 255, 0.05), rgba(0, 0, 0, 0.05)); +@fontWeight: normal; -@activeBorderSize : 0em; +@activeBorderSize: 0em; -@hoverBackground : rgba(0, 0, 0, 0.02); -@downBackground : rgba(0, 0, 0, 0.06); +@hoverBackground: rgba(0, 0, 0, 0.02); +@downBackground: rgba(0, 0, 0, 0.06); -@activeBackground : rgba(0, 0, 0, 0.04); -@activeHoverBackground : rgba(0, 0, 0, 0.04); +@activeBackground: rgba(0, 0, 0, 0.04); +@activeHoverBackground: rgba(0, 0, 0, 0.04); -@boxShadow : +@boxShadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.15), 0px 0px 0px 1px rgba(0, 0, 0, 0.1) ;