From 7242cc33695673b0e4f4fef37dc1844786321686 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Mon, 1 Jun 2015 18:18:32 -0400
Subject: [PATCH] Fix remaining issues #2335

---
 RELEASE-NOTES.md                              |  6 ++---
 src/definitions/collections/menu.less         | 22 ++++++++++---------
 src/themes/default/collections/menu.variables |  4 +++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 8aaaea9d9..a394469c4 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -116,7 +116,7 @@
 - **Statistic** - Added new evenly divided group variation, for example `three statistics` shows 3 per row
 - **Statistic** - Statitic group now use `flex`. Styles have been updated.
 - **Tabs** - Added new callbacks `onTabVisible` and `onRequest`
-- **Tabs* - Added `parseScripts` option, defaults to `once` parsing inline scripts only first load
+- **Tabs** - Added `parseScripts` option, defaults to `once` parsing inline scripts only first load
 - **Table** - Added `vertical alignment` variations to `ui table`
 - **Table** - Added `single line` table variation which prevents text from wrapping
 - **Visibility/Sticky** - Visibility and sticky now refresh automatically after page content loading to deal with changes in position from images loading
@@ -248,7 +248,7 @@
 - **Label** - Label size now varies by type. `pointing label` are now `1em` by default.
 - **Label** - Padding on `corner label` has been increased
 - **Input** - Input now use `em` instead of `rem` so they will inherit the size of the elements they are nested inside
-- **Progress* - Update contrast on `indicating`, update default styles. Fixed some examples
+- **Progress** - Update contrast on `indicating`, update default styles. Fixed some examples
 - **Menu** - Menu now uses `border` for borders instead of `box-shadow`
 - **Menu** - `secondary pointing menu` has had some slight design tweaks, thinner lines, more padding
 - **Menu** - Active sub-menu items are now `bold`
@@ -270,7 +270,7 @@
 - **Site** - Adjusted global line height to the closest even pixel value
 - **Table** - Table header colors and padding defaults have been slightly adjusted
 - **Table** - Horizontal cell padding has been slightly reduced, and cell borders are slightly lighter.
-- **Transition - Transition no longer checks for vendor prefixed `animation-name` css property. This was introduced in jQuery `1.8`
+- **Transition** - Transition no longer checks for vendor prefixed `animation-name` css property. This was introduced in jQuery `1.8`
 - **Visibility** - In returned `calculations` object, `visible` and `hidden` are renamed to `onScreen` and `offScreen`, since this describes more accurately what the value represents.
 
 ### Version 1.12.3 - May 20, 2015
diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less
index b24ff0013..c8c6f3b37 100755
--- a/src/definitions/collections/menu.less
+++ b/src/definitions/collections/menu.less
@@ -155,6 +155,7 @@
 .ui.menu >  .grid,
 .ui.menu > .container {
   display: flex;
+  flex-direction: inherit;
 }
 
 /*--------------
@@ -265,6 +266,8 @@
   display: block;
 }
 .ui.menu .ui.dropdown .menu > .item .icon:not(.dropdown) {
+  display: inline-block;
+  font-size: @dropdownItemIconFontSize !important;
   float: @dropdownItemIconFloat;
   margin: @dropdownItemIconMargin;
 }
@@ -1066,27 +1069,26 @@ Floated Menu / Item
   color: @iconMenuItemColor;
 }
 .ui.icon.menu .item > .icon {
-  display: block;
-  float: none !important;
-  margin: 0em auto !important;
+  margin: 0em;
   opacity: 1;
 }
+.ui.vertical.icon.menu .item > .icon:not(.dropdown) {
+  display: block;
+  margin: 0em auto;
+  float: none;
+}
 .ui.icon.menu .icon:before {
   opacity: 1;
 }
 
 /* Item Icon Only */
 .ui.menu .icon.item > .icon {
-  margin: 0em;
   width: auto;
 }
 
 /*--- inverted ---*/
 .ui.inverted.icon.menu .item {
-  color: rgba(255, 255, 255, 0.8);
-}
-.ui.inverted.icon.menu .icon {
-  color: rgba(255, 255, 255, 1);
+  color: @iconMenuInvertedItemColor;
 }
 
 /*--------------
@@ -1108,13 +1110,13 @@ Floated Menu / Item
   padding-right: @labeledIconItemHorizontalPadding;
 }
 
-.ui.labeled.icon.menu .item > .icon {
+.ui.labeled.icon.menu .item > .icon:not(.dropdown) {
   height: 1em;
   display: block;
   font-size: @labeledIconSize !important;
   margin: 0em @labeledIconTextMargin 0em 0em !important;
 }
-.ui.vertical.labeled.icon.menu .item > .icon {
+.ui.vertical.labeled.icon.menu .item > .icon:not(.dropdown) {
   margin: 0em auto @labeledIconTextMargin !important;
 }
 
diff --git a/src/themes/default/collections/menu.variables b/src/themes/default/collections/menu.variables
index f4f5a88a5..19f5825a1 100644
--- a/src/themes/default/collections/menu.variables
+++ b/src/themes/default/collections/menu.variables
@@ -148,6 +148,7 @@
 @dropdownItemTransition: none;
 
 @dropdownItemIconFloat: none;
+@dropdownItemIconFontSize: @relativeMedium;
 @dropdownItemIconMargin: 0em 0.75em 0em 0em;
 
 @dropdownHoveredItemBackground: @transparentBlack;
@@ -298,7 +299,8 @@
 
 /* Icon */
 @iconMenuTextAlign: center;
-@iconMenuItemColor: @textColor;
+@iconMenuItemColor: @black;
+@iconMenuInvertedItemColor: @white;
 
 
 /* Tabular */