[Mobile] Merge

Fix Conflicts.
2015-07-27 15:21:59 -07:00
parent a9418fd2c7 1d7a0fa48d
commit 6e43a92191
40 changed files with 1561 additions and 141 deletions
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -265,6 +265,7 @@
 	&.vertical {
 		// Slides left and right
 		>.pane {
+//            @include test();
 			margin-left: $interiorMargin;
 			>.holder {
 				left: 0;