Merge branch 'dojo-1.12.1'

Conflicts:
	js/prefs.js

1 files changed, 12 insertions, 1 deletions

diff --git a/lib/dijit/themes/claro/layout/BorderContainer.less b/lib/dijit/themes/claro/layout/BorderContainer.less
index f3edcd3c5..194daf297 100644
--- a/lib/dijit/themes/claro/layout/BorderContainer.less
+++ b/lib/dijit/themes/claro/layout/BorderContainer.less
@@ -70,6 +70,9 @@ Splitters and gutters:
 	border:0;
 	height:5px;
 }
+.dj_ios .claro .dijitSplitterH, .dj_android .claro .dijitSplitterH {
+  height: 11px;
+}
 
 .claro .dijitSplitterH .dijitSplitterThumb {
 	background:@border-color none;
@@ -77,7 +80,9 @@ Splitters and gutters:
 	top:2px;
 	width:19px;
 }
-
+.dj_ios .claro .dijitSplitterH .dijitSplitterThumb, .dj_android .claro .dijitSplitterH .dijitSplitterThumb{
+  top:5px;
+}
 .claro .dijitSplitterV,
 .claro .dijitGutterV {
 	background:none;
@@ -85,6 +90,9 @@ Splitters and gutters:
 	width:5px;
 	margin: 0;
 }
+.dj_ios .claro .dijitSplitterV, .dj_android .claro .dijitSplitterV {
+  width: 11px;
+}
 
 .claro .dijitSplitterV .dijitSplitterThumb {
 	background:@border-color none;
@@ -93,6 +101,9 @@ Splitters and gutters:
 	width:1px;
 	margin: 0;
 }
+.dj_ios .claro .dijitSplitterV .dijitSplitterThumb, .dj_android .claro .dijitSplitterV .dijitSplitterThumb{
+  left:5px;
+}
 
 /* hovered splitter */
 .claro .dijitSplitterHHover,