From f6f962573862264a44abf89c0720ea1447eca99d Mon Sep 17 00:00:00 2001 From: youluna Date: Wed, 5 Jun 2019 10:09:17 +0800 Subject: [PATCH] fix(Nav): disorder when set margin(t, b) of hoz Nav, close #744 --- src/nav/main.scss | 2 +- src/nav/scss/mixin.scss | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/nav/main.scss b/src/nav/main.scss index eb5f6a4fac..4429ae30d3 100644 --- a/src/nav/main.scss +++ b/src/nav/main.scss @@ -65,7 +65,7 @@ $nav-icononly-width: $s-15; } &.#{$css-prefix}hoz { - height: $nav-hoz-height; + height: $nav-hoz-height + 2 * $nav-hoz-item-margin-tb; @include nav-size( 'hoz', diff --git a/src/nav/scss/mixin.scss b/src/nav/scss/mixin.scss index 8c7d7de98b..7e544fe5ff 100644 --- a/src/nav/scss/mixin.scss +++ b/src/nav/scss/mixin.scss @@ -20,14 +20,22 @@ border-radius: $itemCorner; } - #{$menu-prefix}-item:not(:first-child), - #{$menu-prefix}-sub-menu-wrapper:not(:first-child) > #{$menu-prefix}-item { - margin-top: $marginTB; - } + @if $direction == 'ver' { + #{$menu-prefix}-item:not(:first-child), + #{$menu-prefix}-sub-menu-wrapper:not(:first-child) > #{$menu-prefix}-item { + margin-top: $marginTB; + } - #{$menu-prefix}-item:not(:last-child), - #{$menu-prefix}-sub-menu-wrapper:not(:last-child) > #{$menu-prefix}-item { - margin-bottom: $marginTB; + #{$menu-prefix}-item:not(:last-child), + #{$menu-prefix}-sub-menu-wrapper:not(:last-child) > #{$menu-prefix}-item { + margin-bottom: $marginTB; + } + } @else { + #{$menu-prefix}-item, + #{$menu-prefix}-sub-menu-wrapper > #{$menu-prefix}-item { + margin-top: $marginTB; + margin-bottom: $marginTB; + } } #{$menu-prefix}-item-inner {