From 765815086b1436319ce7b0c17d4cdd42ba610f70 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 23 Jan 2014 17:01:50 -0500 Subject: [PATCH] Fixes up some formatting on github menu theme, fixes some input variables in menu --- src/collections/menu.less | 13 ++++++------- src/themes/default/collections/menu.variables | 2 +- src/themes/github/collections/menu.overrides | 4 ++++ src/themes/github/collections/menu.variables | 3 +++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/collections/menu.less b/src/collections/menu.less index 7a487ed3d..169cdf369 100755 --- a/src/collections/menu.less +++ b/src/collections/menu.less @@ -141,7 +141,7 @@ right: 0px; width: @dividerSize; height: 100%; - background-image: @dividerBackground; + background: @dividerBackground; } .ui.menu .menu.right .item:before, .ui.menu .item.right:before { @@ -202,6 +202,7 @@ top: @inputIconOffset; } .ui.menu .item > .input input { + font-size: @inputSize; padding-top: @inputVerticalPadding; padding-bottom: @inputVerticalPadding; } @@ -339,7 +340,7 @@ cursor: pointer; background: @hoverBackground; } -.ui.menu .ui.dropdown.active { +.ui.menu .ui.dropdown.visible { background: @subtleTransparentBlack; box-shadow: none; border-bottom-right-radius: 0em; @@ -386,9 +387,6 @@ .ui.vertical.menu .active.item .menu .active.item { border-left: none; } -.ui.vertical.menu .active.item .menu .active.item { - padding-left: 1.5rem; -} .ui.vertical.menu .item .menu .active.item { background-color: @subMenuActiveColor; box-shadow: none; @@ -523,6 +521,7 @@ margin: @subMenuMargin -@horizontalPadding 0em; } .ui.vertical.menu .item > .menu > .item { + background: none; padding: @subMenuHorizontalPadding @subMenuVerticalPadding; font-size: @subMenuFontSize; } @@ -1187,10 +1186,10 @@ /*--- Border ---*/ .ui.inverted.menu .item:before { - background-image: @invertedDividerBackground; + background: @invertedDividerBackground; } .ui.vertical.inverted.menu .item:before { - background-image: @invertedVerticalDividerBackground; + background: @invertedVerticalDividerBackground; } /*--- Hover ---*/ diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables index ad40e4778..91071b477 100755 --- a/src/themes/default/collections/menu.variables +++ b/src/themes/default/collections/menu.variables @@ -84,6 +84,7 @@ @labeledButtonPadding: 0.6em; /* Input */ +@inputSize: 0.875em; @inputVerticalMargin: -0.8em; @inputOffset: -0.05em; @inputVerticalPadding: 0.5em; @@ -153,7 +154,6 @@ /* Vertical */ @verticalBackground: #FFFFFF; @verticalItemBackground: none; - @verticalDividerBackground: linear-gradient(to right, rgba(0, 0, 0, 0.03) 0%, rgba(0, 0, 0, 0.1) 1.5em, diff --git a/src/themes/github/collections/menu.overrides b/src/themes/github/collections/menu.overrides index c5c53367f..06d7827dd 100755 --- a/src/themes/github/collections/menu.overrides +++ b/src/themes/github/collections/menu.overrides @@ -1,3 +1,7 @@ /******************************* Overrides *******************************/ + +.ui.menu .item > .label { + box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.1) inset; +} \ No newline at end of file diff --git a/src/themes/github/collections/menu.variables b/src/themes/github/collections/menu.variables index 7f291a44b..88b39cb31 100755 --- a/src/themes/github/collections/menu.variables +++ b/src/themes/github/collections/menu.variables @@ -32,6 +32,9 @@ @arrowVerticalHoverColor: #F4F4F4; @arrowVerticalActiveColor: #F4F4F4; +@dividerBackground: #E8E8E8; +@verticalDividerBackground: #E8E8E8; + /*------------------- Elements --------------------*/