From 126ecf5598eab1371de44071dc0164cbbf0ba04a Mon Sep 17 00:00:00 2001 From: jlukic Date: Wed, 22 Oct 2014 13:06:29 -0400 Subject: [PATCH] Adds further fixes for lists inside menu, adds nested grid coupling with popup --- src/definitions/elements/list.less | 9 +++++++++ src/definitions/modules/popup.less | 10 ++++++++++ src/themes/default/elements/list.variables | 1 - src/themes/default/modules/popup.variables | 4 +++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/definitions/elements/list.less b/src/definitions/elements/list.less index fbdace0d4..7f40010ef 100755 --- a/src/definitions/elements/list.less +++ b/src/definitions/elements/list.less @@ -246,6 +246,14 @@ ol.ui.list ol, border: none; background: none; } +.ui.menu .ui.list .list > .item:first-child, +.ui.menu .ui.list > .item:first-child { + padding-top: 0em; +} +.ui.menu .ui.list .list > .item:last-child, +.ui.menu .ui.list > .item:last-child { + padding-bottom: 0em; +} /******************************* @@ -496,6 +504,7 @@ ul.ui.list li:before, .ui.bulleted.list .list > .item:before, .ui.bulleted.list > .item:before { position: absolute; + top: auto; left: @bulletOffset; content: @bulletCharacter; opacity: @bulletOpacity; diff --git a/src/definitions/modules/popup.less b/src/definitions/modules/popup.less index 07a6d69f3..a000c1b50 100755 --- a/src/definitions/modules/popup.less +++ b/src/definitions/modules/popup.less @@ -177,6 +177,16 @@ box-shadow: @rightArrowBoxShadow; } +/******************************* + Coupling +*******************************/ + +/* Immediate Nested Grid */ +.ui.popup > .ui.grid:not(.padded) { + width: @nestedGridWidth; + margin: @nestedGridMargin; +} + /******************************* States *******************************/ diff --git a/src/themes/default/elements/list.variables b/src/themes/default/elements/list.variables index f0ca247a4..5395cdbed 100644 --- a/src/themes/default/elements/list.variables +++ b/src/themes/default/elements/list.variables @@ -2,7 +2,6 @@ List *******************************/ - /*------------------- View --------------------*/ diff --git a/src/themes/default/modules/popup.variables b/src/themes/default/modules/popup.variables index ba5a9931c..668e9099b 100644 --- a/src/themes/default/modules/popup.variables +++ b/src/themes/default/modules/popup.variables @@ -60,7 +60,9 @@ Coupling --------------------*/ -@popupButtonWidth: 100%; +/* (padding * @medium) */ +@nestedGridMargin: -0.7rem -0.875rem; +@nestedGridWidth: ~"calc(100% + 1.75rem)"; /*------------------- States