From 92daf45345538670a617f067bfa9c0b7ffe7728c Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Sun, 7 Sep 2014 13:31:36 -0400
Subject: [PATCH] Fixes for pointing dropdowns in menus

---
 server/documents/modules/dropdown.html.eco    | 23 +++++++++++++++++++
 src/definitions/collections/menu.less         | 14 ++++++-----
 src/definitions/modules/sidebar.js            | 11 +++++++--
 .../default/collections/menu.variables        |  4 ++--
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/server/documents/modules/dropdown.html.eco b/server/documents/modules/dropdown.html.eco
index a2ddb28d3..cd824d526 100755
--- a/server/documents/modules/dropdown.html.eco
+++ b/server/documents/modules/dropdown.html.eco
@@ -121,6 +121,29 @@ themes      : ['Default']
         </div>
       </div>
     </div>
+    <div class="another hover example">
+      <div class="ui vertical menu">
+        <div class="menu">
+          <a class="active item">
+            Home
+          </a>
+          <div class="ui left pointing dropdown link item">
+            <i class="dropdown icon"></i>
+            Messages
+            <div class="menu">
+              <a class="item"><i class="mail icon"></i>Inbox</a>
+              <a class="item"><i class="book icon"></i>Archive</a>
+            </div>
+          </div>
+          <a class="item">
+            Browse
+          </a>
+          <a class="item">
+            Help
+          </a>
+        </div>
+      </div>
+    </div>
     <div class="another button example">
       <div class="ui blue labeled icon top left pointing dropdown button">
         <i class="settings icon"></i>
diff --git a/src/definitions/collections/menu.less b/src/definitions/collections/menu.less
index 11d75dd31..8db819691 100755
--- a/src/definitions/collections/menu.less
+++ b/src/definitions/collections/menu.less
@@ -102,12 +102,12 @@
 }
 
 /* Floated Content */
-.ui.menu .item.left,
-.ui.menu .menu.left {
+.ui.menu:not(.vertical) .item.left,
+.ui.menu:not(.vertical) .menu.left {
   float: left;
 }
-.ui.menu .item.right,
-.ui.menu .menu.right {
+.ui.menu:not(.vertical) .item.right,
+.ui.menu:not(.vertical) .menu.right {
   float: right;
 }
 
@@ -270,13 +270,15 @@
 /* Menu Position */
 .ui.menu .dropdown.item .menu {
   background: @dropdownBackground;
-  left: 1px;
+  left: 0px;
   margin: @dropdownMenuOffset 0px 0px;
   min-width: calc(100% - 1px);
   box-shadow: @dropdownBoxShadow;
 }
 .ui.menu .pointing.dropdown.item .menu {
   margin-top: @dropdownPointingDistance;
+  border-top-left-radius: 0em;
+  border-top-right-radius: 0em;
 }
 .ui.menu .simple.dropdown.item .menu {
   margin: 0px !important;
@@ -504,7 +506,7 @@
 .ui.vertical.menu .dropdown.item .menu {
   top: 0% !important;
   left: 100%;
-  margin: 0px 0px 0px @dropdownMenuOffset;
+  margin: @dropdownMenuOffset 0px 0px @dropdownMenuOffset;
   box-shadow: @dropdownVerticalBoxShadow;
 }
 .ui.vertical.menu .dropdown.item.active {
diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js
index 7e056ac72..b88d51bbb 100755
--- a/src/definitions/modules/sidebar.js
+++ b/src/definitions/modules/sidebar.js
@@ -63,6 +63,7 @@ $.fn.sidebar = function(parameters) {
         element         = this,
         instance        = $module.data(moduleNamespace),
 
+        currentScroll,
         transitionEnd,
 
         module
@@ -296,9 +297,12 @@ $.fn.sidebar = function(parameters) {
             requestAnimationFrame(transition);
           }
           else {
-            $module.scrollTop(0);
             if(module.is.mobile()) {
-              window.scrollTo(0, 0);
+              requestAnimationFrame(function() {
+                $module.scrollTop(0);
+                currentScroll = $(window).scrollTop();
+                window.scrollTo(0, 0);
+              });
             }
             module.remove.allVisible();
             requestAnimationFrame(transition);
@@ -322,6 +326,9 @@ $.fn.sidebar = function(parameters) {
           $transition
             .on(transitionEnd, function(event) {
               if( event.target == $transition[0] ) {
+                if(module.is.mobile()) {
+                  window.scrollTo(0, currentScroll);
+                }
                 $transition.off(transitionEnd);
                 module.remove.transition();
                 module.remove.direction();
diff --git a/src/themes/packages/default/collections/menu.variables b/src/themes/packages/default/collections/menu.variables
index db914252c..7b7799939 100755
--- a/src/themes/packages/default/collections/menu.variables
+++ b/src/themes/packages/default/collections/menu.variables
@@ -125,13 +125,13 @@
 /* Dropdown */
 @dropdownBackground: #FFFFFF;
 @dropdownMenuOffset: 1px;
-@dropdownPointingDistance: 0.75em;
+@dropdownPointingDistance: 1px;
 
 @dropdownTextColor: @textColor;
 @dropdownTextColorHover: @darkTextColor;
 @dropdownIconMargin: 0em 0em 0em 1em;
 
-@dropdownBoxShadow: 0 1px 1px 1px @solidBorderColor;
+@dropdownBoxShadow: 0px 1px 0px 1px @borderColor;
 @dropdownVerticalBoxShadow: 0 0px 1px 1px @solidBorderColor;
 
 /* Pointing Arrow */