Permalink
Browse files

Merge branch 'master' of https://github.com/goinvo/hGraph

  • Loading branch information...
bsalinas committed Jun 3, 2013
2 parents 74731a1 + 7d89ced commit f59015afe54e88ca66057f59aa5f9a2f42894ada
@@ -26,14 +26,15 @@ body {
* Window sizes
*/
/*
-* Defaults to > 1200px width (>2013)
+* Default config
*/
/* line 26, ../scss/partials/_structure.scss */
#main {
width: 100%;
height: 100%;
+ min-width: 1024px;
}
-/* line 30, ../scss/partials/_structure.scss */
+/* line 31, ../scss/partials/_structure.scss */
#main #viz {
height: 100%;
min-height: 690px;
@@ -51,6 +52,7 @@ body {
/* line 46, ../scss/partials/_structure.scss */
#main #viz {
min-height: 660px;
+ min-width: 1024px;
}
}
/* line 7, ../scss/partials/_multiuser.scss */
View
@@ -149,7 +149,7 @@ $(document).ready(function (){
/*
* Prevents scrolling on ios
*/
- document.ontouchmove = function(e){ e.preventDefault(); }
+ //document.ontouchmove = function(e){ e.preventDefault(); }
/*
* Win resize function
View
4 examples/multiuser/js/hUsers.js 100644 → 100755
@@ -112,7 +112,7 @@ selectUser = function(uid){
*/
showTimeline = function(){
// enable scrolling on touch devices
- document.ontouchmove = function(e){ return true; }
+ //document.ontouchmove = function(e){ return true; }
usertimeline.active = true;
//center timeline horizontally
usertimeline.css({ left : (userinfo.width() - usertimeline.width()) / 2 });
@@ -129,7 +129,7 @@ showTimeline = function(){
*/
hideTimeline = function(user){
// disable scrolling on touch devices
- document.ontouchmove = function(e){ e.preventDefault(); }
+ //document.ontouchmove = function(e){ e.preventDefault(); }
usertimeline.active = false;
usertimeline.fadeOut();
showUserMenu();
View
@@ -21,18 +21,18 @@ body {
*/
/*
-* Defaults to > 1200px width (>2013)
+* Default config
*/
#main {
width: 100%;
height: 100%;
+ min-width: 1024px;
#viz{
height: 100%;
min-height: 690px;
min-width: 1024px;
}
-
}
/*
@@ -45,6 +45,7 @@ body {
#viz{
min-height: 660px;
+ min-width: 1024px;
}
}
}

0 comments on commit f59015a

Please sign in to comment.