From 82e86224bdc2a987b9e3cd4f18c2192427b5f04b Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 24 Oct 2014 12:16:51 -0400 Subject: wallpaper sizing --- public/assets/stylesheets/app.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 58b87d4..b29c613 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1475,6 +1475,8 @@ border-left: 1px solid black; vertical-align: text-bottom; background-color:white; -webkit-user-drag: element; + background-size: auto 100%; + background-position: center; } .wallpaper.active .swatches .swatch:hover { cursor: pointer; -- cgit v1.2.3-70-g09d2 From 30dac4509e28f07bacf29c3be3d58f8fa684b115 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 24 Oct 2014 14:25:39 -0400 Subject: adding video --- public/assets/javascripts/app.js | 8 ++++++++ public/assets/stylesheets/app.css | 34 ++++++++++++++++++++++++++++++++++ views/home.ejs | 5 +++++ 3 files changed, 47 insertions(+) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index 9b46a3e..f26a782 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -17,6 +17,14 @@ else { new WOW().init(); +$('.hero .circle').click( function(){ + $('.videoModal').addClass('active'); +}); + +$('.videoModal .ion-ios7-close-empty').click( function(){ + $('.videoModal').removeClass('active'); +}); + var scene, cam, map; diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 20498c0..4544fa3 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -92,6 +92,40 @@ a{ text-shadow: 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff, 0 0 3px #fff; } +.videoModal { + position: fixed; + width: 0; + height: 0; + background: rgba(255,255,255,0); + display: table; + opacity:0; + z-index: -1; + -webkit-transition:0.4s background + -moz-transition:0.4s background; + transition:0.4s background; +} + +.videoModal.active { + opacity:1; + z-index: 6; + width: 100%; + height: 100%; + background: rgba(255,255,255,0.9); +} + +.videoModal .ion-ios7-close-empty { + position: absolute; + right: 50px; + top: 60px; + font-size: 80px; + cursor:pointer; + color:#444; +} + +.videoModal .ion-ios7-close-empty:hover { + color:black; +} + #help-button { display: none; border-right:0px!important; diff --git a/views/home.ejs b/views/home.ejs index 85d6f23..7fe0c71 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -70,6 +70,11 @@ [[ include partials/sign-in ]] [[ include partials/footer ]] + +
+ +
+
[[ include partials/scripts ]] -- cgit v1.2.3-70-g09d2 From f3f5a65f8cbf14fbda34728d0a39b1c0c0e16096 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 24 Oct 2014 14:32:51 -0400 Subject: fade issue --- public/assets/stylesheets/app.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 4544fa3..4dfb707 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -93,23 +93,31 @@ a{ } .videoModal { - position: fixed; + position: relative; width: 0; height: 0; background: rgba(255,255,255,0); display: table; opacity:0; z-index: -1; - -webkit-transition:0.4s background + top:-100%; + left:-100%; + overflow:hidden; + -webkit-transition:0.4s background; -moz-transition:0.4s background; transition:0.4s background; + display:none; } .videoModal.active { + position: fixed; + display:table; opacity:1; z-index: 6; width: 100%; height: 100%; + top:0; + left:0; background: rgba(255,255,255,0.9); } -- cgit v1.2.3-70-g09d2 From 5ad9b1fcefb91956c6866ff8b10603f142daaec9 Mon Sep 17 00:00:00 2001 From: ryderr Date: Fri, 24 Oct 2014 14:35:19 -0400 Subject: mobile scene after --- public/assets/stylesheets/app.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 4dfb707..af40bf2 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -308,7 +308,7 @@ h5 { } .projectList.about .item .rap { - max-width: 1250px; + max-width: 1500px; margin: 0 auto; padding: 0 10%; } @@ -2706,7 +2706,7 @@ a[data-role="forgot-password"] { .aboutRoom { display:none; } - body:after{ + .mobile #scene:after{ content:"Hey there! For best viewing we suggest flipping your device sideways and spinning around in circles :)"; z-index: 3; border: 1px solid; -- cgit v1.2.3-70-g09d2 From 04e20c10c7a01d78c08b8aa87dbeeb0061c535f5 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 24 Oct 2014 14:53:50 -0400 Subject: setting up embed, hide play bar --- public/assets/javascripts/app.js | 35 ++++++++++++++++++++++++++--------- public/assets/stylesheets/app.css | 5 +++++ views/home.ejs | 2 +- 3 files changed, 32 insertions(+), 10 deletions(-) (limited to 'public/assets/stylesheets/app.css') diff --git a/public/assets/javascripts/app.js b/public/assets/javascripts/app.js index f26a782..42e8a53 100644 --- a/public/assets/javascripts/app.js +++ b/public/assets/javascripts/app.js @@ -17,21 +17,38 @@ else { new WOW().init(); -$('.hero .circle').click( function(){ - $('.videoModal').addClass('active'); -}); - -$('.videoModal .ion-ios7-close-empty').click( function(){ - $('.videoModal').removeClass('active'); -}); - +$(function(){ + var player + $('.hero .circle').click( function(){ + $('.videoModal').css("display","table").addClass('active'); + player = $f( okplayer ) + player.api('play') + player.addEvent('ready', function(){ + player.api('play') + player.addEvent('finish', function(){ + hide() + }) + }) + }); + + $('.videoModal .ion-ios7-close-empty').click( function(){ + player.api('pause') + hide() + }) + + function hide() { + $('.videoModal').fadeOut(300, function(){ + $('.videoModal').removeClass('active'); + }) + } +}) var scene, cam, map; var app = new function(){} app.mode = { editor: false, builder: false } - + app.init = function () { app.tube = new Tube () app.router = new SiteRouter () diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 4dfb707..2d52633 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -107,6 +107,11 @@ a{ -moz-transition:0.4s background; transition:0.4s background; display:none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + -o-user-select: none; + user-select: none; } .videoModal.active { diff --git a/views/home.ejs b/views/home.ejs index 7fe0c71..2da811d 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -74,7 +74,7 @@
-
+
[[ include partials/scripts ]] -- cgit v1.2.3-70-g09d2