From e225d36aed3cf1afa5cf010980079cf04e8295bb Mon Sep 17 00:00:00 2001 From: jlukic Date: Sun, 7 Sep 2014 12:46:44 -0400 Subject: [PATCH] Only require scrollTo(0,0) for iOS fix, fix margin on stackable divider --- src/definitions/collections/grid.less | 1 + src/definitions/elements/divider.less | 4 ++-- src/definitions/modules/sidebar.js | 4 +++- src/themes/packages/default/elements/divider.variables | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/definitions/collections/grid.less b/src/definitions/collections/grid.less index cd9400dae..4b477c84d 100755 --- a/src/definitions/collections/grid.less +++ b/src/definitions/collections/grid.less @@ -24,6 +24,7 @@ *******************************/ .ui.grid { + position: relative; display: block; text-align: left; diff --git a/src/definitions/elements/divider.less b/src/definitions/elements/divider.less index 4fee9ad04..7242278b9 100755 --- a/src/definitions/elements/divider.less +++ b/src/definitions/elements/divider.less @@ -24,7 +24,7 @@ *******************************/ .ui.divider { - margin: @dividerMargin 0rem; + margin: @margin; line-height: 1; height: 0em; @@ -137,7 +137,7 @@ .ui.stackable.grid .ui.vertical.divider, .ui.grid .stackable.row .ui.vertical.divider { position: relative; - margin: @dividerMargin; + margin: @margin; left: 0; height: auto; overflow: hidden; diff --git a/src/definitions/modules/sidebar.js b/src/definitions/modules/sidebar.js index d99cf0621..7e056ac72 100755 --- a/src/definitions/modules/sidebar.js +++ b/src/definitions/modules/sidebar.js @@ -297,7 +297,9 @@ $.fn.sidebar = function(parameters) { } else { $module.scrollTop(0); - $(document).scrollTop(0); + if(module.is.mobile()) { + window.scrollTo(0, 0); + } module.remove.allVisible(); requestAnimationFrame(transition); } diff --git a/src/themes/packages/default/elements/divider.variables b/src/themes/packages/default/elements/divider.variables index 705eb5035..926cb8258 100755 --- a/src/themes/packages/default/elements/divider.variables +++ b/src/themes/packages/default/elements/divider.variables @@ -6,7 +6,7 @@ Element --------------------*/ -@dividerMargin: 1rem; +@margin: 1rem 0rem; @highlightWidth: 1px; @highlightColor: rgba(255, 255, 255, 0.2);