From f2b8c713c49fbad37e3d128701fb55c1cc8c9d92 Mon Sep 17 00:00:00 2001 From: ryderr Date: Thu, 13 Nov 2014 12:02:46 -0500 Subject: minor --- public/assets/stylesheets/app.css | 2 +- views/home.ejs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index e97ffa1..3039d6c 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -953,7 +953,7 @@ border-left: 1px solid black; } .editing .mx-scenery:hover, .editing .mx-scenery.picked { - border: 15px dashed yellow; + border: 5px dashed yellow; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; diff --git a/views/home.ejs b/views/home.ejs index c25b5e7..bad97f9 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -17,7 +17,7 @@ - +

What's VValls For?

@@ -60,12 +60,13 @@ [[ include projects/list-projects ]] +

Ready To Go Pro?

- We offer white-label licensing of the VValls platform that could be used within the context of your product offering. We can also customize the VValls platform to suit the various needs of your project. This could be include custom floor plans and numerous other features. Please inquire to start a conversation. + We offer white-label licensing of the VValls platform that could be used within the context of your product offering. We can customize the VValls platform to suit the various needs of your project. This could include custom floor plans and numerous other features. Please inquire to start a conversation. Contact
-- cgit v1.2.3-70-g09d2 From 39fa1a5b835797deb4b28d7ba6faae766a979dca Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 11:23:51 -0500 Subject: minor --- public/assets/stylesheets/app.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index ef7736f..99d501b 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -958,7 +958,7 @@ border-left: 1px solid black; } .editing .mx-scenery:hover, .editing .mx-scenery.picked { - border: 5px dashed yellow; + border: 2px dashed yellow; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; -- cgit v1.2.3-70-g09d2 From a122c8137152cb7d6c1a398033364b200330b6ee Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 17 Nov 2014 11:34:28 -0500 Subject: autosave after tweaking wallpaper size --- public/assets/javascripts/ui/editor/WallpaperPicker.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js index c383489..e2aaeb7 100644 --- a/public/assets/javascripts/ui/editor/WallpaperPicker.js +++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js @@ -186,10 +186,19 @@ var WallpaperPicker = UploadView.extend({ this.$scale.val( Math.log( this.wall.background.scale ) ) }, + scaleTimeout: null, updateScale: function(){ if (! this.wall) return; var scale = Math.exp( parseFloat(this.$scale.val()) ) this.wall.wallpaperPosition({ scale: scale }) + + clearTimeout(this.scaleTimeout) + this.scaleTimeout = setTimeout(function(){ + + // TODO: watch individual scenery object here + Minotaur.watch( app.router.editorView.settings ) + + }.bind(this), 500) }, enterUrl: function(){ -- cgit v1.2.3-70-g09d2 From 053f55941d6a09fe124f982baca0f9dd3d3ed1f9 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 12:04:33 -0500 Subject: stylez --- public/assets/stylesheets/app.css | 18 +++++++++++------- views/home.ejs | 6 ++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 1a48a86..39fdc44 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -2224,15 +2224,19 @@ input[type="range"]::-webkit-slider-thumb { width: 100%; } #randomize { - background: white; + background: transparent; display: inline-block; color: black; - text-decoration:none; - border:1px solid black; + text-decoration: none; text-align: center; - font-size: 13px; - padding: 3px; - cursor: pointer; + font-size: 12px; + padding: 3px; + cursor: pointer; + position: absolute; + left: 10px; + font-weight: 500; + top: 0px; + border-bottom: 1px solid; } #randomize:hover { color: white; @@ -2679,7 +2683,7 @@ a[data-role="forgot-password"] { text-decoration:underline; } .vvbox.share { - width: 300px + width: 230px } .vvbox.share #share_link { width: 100%; diff --git a/views/home.ejs b/views/home.ejs index bad97f9..6d53ca1 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -38,7 +38,7 @@

Defy The Status Quo

- There is no platform on the internet quite like VValls. Built using advanced HTML5 techniques, VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms. + There is no platform on the internet quite like VValls. VValls opens up the possibilities of expression online. Go crazy, make otherworldly rooms.
@@ -66,7 +66,9 @@

Ready To Go Pro?

- We offer white-label licensing of the VValls platform that could be used within the context of your product offering. We can customize the VValls platform to suit the various needs of your project. This could include custom floor plans and numerous other features. Please inquire to start a conversation. + We can help make your content immersive and experiential. We offer white-label licensing of VValls customized to suit the various needs of your project. Customizations include more sophisticated floor plan, video, audio, and interactivity options, as well as automation of room creation. We can also completely integrate a custom version of VValls into your product offering or work with your team to enhance your advertising or marketing campaign. + Give your audience a cutting-edge interactive experience with your brand. + Please inquire to start a conversation. Contact
-- cgit v1.2.3-70-g09d2 From 4fed1541ff3ae153a219cb4deff304bce7b49c86 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 17 Nov 2014 12:16:33 -0500 Subject: about views --- server/lib/views/index.js | 7 +++++++ views/about/_blank.ejs | 24 ++++++++++++++++++++++++ views/about/index.ejs | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 views/about/_blank.ejs create mode 100644 views/about/index.ejs diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 31cb1db..48b1c32 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,6 +111,13 @@ var views = module.exports = { docs: function (req, res){ var name = req.params.name || "index" + try { + res.render('about/' + name) + return + } + catch (e) { + } + if (name === "new") { res.render('docs', { doc: { name: "new" }, diff --git a/views/about/_blank.ejs b/views/about/_blank.ejs new file mode 100644 index 0000000..0e9ea7e --- /dev/null +++ b/views/about/_blank.ejs @@ -0,0 +1,24 @@ + + + + vvalls + [[ include ../partials/meta ]] + + +
+ [[ include ../partials/header ]] + + + + + + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +
+ +[[ include ../partials/scripts ]] + diff --git a/views/about/index.ejs b/views/about/index.ejs new file mode 100644 index 0000000..4d40a5c --- /dev/null +++ b/views/about/index.ejs @@ -0,0 +1,23 @@ + + + + vvalls + [[ include ../partials/meta ]] + + +
+ [[ include ../partials/header ]] + + + +

INDEX

+ + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +
+ +[[ include ../partials/scripts ]] + -- cgit v1.2.3-70-g09d2 From cda5a0c18e3dde664a9df526db2e218d201dfda9 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 13:35:07 -0500 Subject: beginnings of how to --- public/assets/stylesheets/app.css | 6 ++--- views/about/index.ejs | 51 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 39fdc44..c83b4bd 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -385,14 +385,14 @@ h5 { } -.projectList.about .item:nth-child(2) span:nth-child(2) { +.projectList.about .item:nth-child(2n+2) span:nth-child(2) { padding: 70px 0 70px 100px; } -.projectList.about .item:nth-child(2) { +.projectList.about .item:nth-child(2n+2) { padding: 5% 0; } -.projectList.about .item:nth-child(2) span:nth-child(1){ +.projectList.about .item:nth-child(2n+2) span:nth-child(1){ float: right; } diff --git a/views/about/index.ejs b/views/about/index.ejs index 4d40a5c..62d873c 100644 --- a/views/about/index.ejs +++ b/views/about/index.ejs @@ -10,7 +10,56 @@ -

INDEX

+

How To Use VValls

+
+
+
+ + + +

Define Your Space.

+ Choose from one of our existing floor plan templates or create your own. +
+
+
+ + +
+
+ + + +

Add Your Media Files.

+ Upload media files or choose media from our pre-loaded image/video stream. Position media on the walls. +
+
+
+ + +
+
+ + + +

Customize.

+ Use color or wallpaper features to customize the look of your space. +
+
+
+ +
+
+ + + +

Collaborate.

+ ou can invite others to collaborate on your project. +
+
+
+ +
+ [[ include ../partials/confirm-modal ]] [[ include ../projects/layouts-modal ]] -- cgit v1.2.3-70-g09d2 From 878fe73e56ecce5d3966fc6d9dfd66c3b20b0358 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 16:12:23 -0500 Subject: howto --- public/assets/stylesheets/app.css | 5 +++ views/about/howto.ejs | 88 +++++++++++++++++++++++++++++++++++++++ views/about/index.ejs | 54 +----------------------- 3 files changed, 94 insertions(+), 53 deletions(-) create mode 100644 views/about/howto.ejs diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index c83b4bd..65968f2 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -363,6 +363,11 @@ h5 { font-weight: 300; } +.projectList.about.howto .item span words { + line-height: 43px; + font-size: 24px; +} + .projectList.about .item span:nth-child(1){ width: 300px; height: 300px; diff --git a/views/about/howto.ejs b/views/about/howto.ejs new file mode 100644 index 0000000..a3768e1 --- /dev/null +++ b/views/about/howto.ejs @@ -0,0 +1,88 @@ + + + + vvalls + [[ include ../partials/meta ]] + + +
+ [[ include ../partials/header ]] + + + +
+
+
+
+

How To Use VValls

+ +
+
+
+ + + +

1. Define Your Space.

+ Choose from one of our existing floor plan templates or create your own. +
+
+
+ + +
+
+ + + +

2. Add Your Media Files.

+ Upload media files or choose media from our pre-loaded image/video stream. Position media on the walls. +
+
+
+ + +
+
+ + + +

3. Customize.

+ Use color or wallpaper features to customize the look of your space. +
+
+
+ +
+
+ + + +

4. Collaborate.

+ You can invite others to collaborate on your project. +
+
+
+ +
+
+ + + +

5. Publish + Share.

+ Share a link to your creation on social media or embed your 3D space directly into your own web page. When on the go, make sure to show off your project on your phone. +
+
+
+ +
+ + + [[ include ../partials/confirm-modal ]] + [[ include ../projects/layouts-modal ]] + [[ include ../partials/sign-in ]] + [[ include ../partials/footer ]] + +
+ +[[ include ../partials/scripts ]] + diff --git a/views/about/index.ejs b/views/about/index.ejs index 62d873c..2517225 100644 --- a/views/about/index.ejs +++ b/views/about/index.ejs @@ -5,62 +5,10 @@ [[ include ../partials/meta ]] -
+
[[ include ../partials/header ]] - -

How To Use VValls

-
-
-
- - - -

Define Your Space.

- Choose from one of our existing floor plan templates or create your own. -
-
-
- - -
-
- - - -

Add Your Media Files.

- Upload media files or choose media from our pre-loaded image/video stream. Position media on the walls. -
-
-
- - -
-
- - - -

Customize.

- Use color or wallpaper features to customize the look of your space. -
-
-
- -
-
- - - -

Collaborate.

- ou can invite others to collaborate on your project. -
-
-
- -
- - [[ include ../partials/confirm-modal ]] [[ include ../projects/layouts-modal ]] [[ include ../partials/sign-in ]] -- cgit v1.2.3-70-g09d2 From b60a065fc76706a835b1957cfcac8831daa5480c Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 17:00:50 -0500 Subject: howto and button --- public/assets/stylesheets/app.css | 28 +++++++++++++++++++++++++--- views/about/howto.ejs | 2 +- views/home.ejs | 7 ++++--- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 65968f2..820c631 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -378,6 +378,18 @@ h5 { background-position:center; } +.projectList.about.howto .item span:nth-child(1){ + width: 300px; + height: 300px; + display: inline-block; + float: left; + border-radius: 0; + background-size:cover; + background-position:center; + border: 1px solid; + box-shadow: 2px 2px black; +} + .projectList.about .item span h3{ font-weight: 500; font-size: 25px; @@ -830,7 +842,7 @@ iframe.embed { margin: 0 auto; line-height: 50px; } -.gopro span a{ +.greenbtn{ width: 100%; display: inline-block; text-align: center; @@ -842,7 +854,14 @@ iframe.embed { -moz-transition:0.2s background; transition:0.2s background; } -.gopro span a:hover{ +.greenbtn.learn { + width: 80%; + clear: both; + font-size: 30px; + font-weight: 300; + margin: 110px 10% 0 10%; +} +.greenbtn:hover{ background:black; } .profilepage .about h2 .btn { @@ -963,7 +982,7 @@ border-left: 1px solid black; } .editing .mx-scenery:hover, .editing .mx-scenery.picked { - border: 2px dashed yellow; + border: 1px dashed black; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; @@ -3041,6 +3060,9 @@ a[data-role="forgot-password"] { .gopro span a{ margin-top: 20px; } + .greenbtn.learn { + display:none; + } } @media screen and (orientation:portrait) { diff --git a/views/about/howto.ejs b/views/about/howto.ejs index a3768e1..2e0f8ed 100644 --- a/views/about/howto.ejs +++ b/views/about/howto.ejs @@ -31,7 +31,7 @@
- +

2. Add Your Media Files.

diff --git a/views/home.ejs b/views/home.ejs index 6d53ca1..28499d7 100755 --- a/views/home.ejs +++ b/views/home.ejs @@ -53,8 +53,9 @@
- -
+ + Learn How To Use VValls +

Room Showcase

@@ -69,7 +70,7 @@ We can help make your content immersive and experiential. We offer white-label licensing of VValls customized to suit the various needs of your project. Customizations include more sophisticated floor plan, video, audio, and interactivity options, as well as automation of room creation. We can also completely integrate a custom version of VValls into your product offering or work with your team to enhance your advertising or marketing campaign. Give your audience a cutting-edge interactive experience with your brand. Please inquire to start a conversation. - Contact + Contact [[ include partials/confirm-modal ]] -- cgit v1.2.3-70-g09d2 From 37466ff2c09432f27a96f7a33dc041175847f6d6 Mon Sep 17 00:00:00 2001 From: ryderr Date: Mon, 17 Nov 2014 17:35:33 -0500 Subject: learn button --- public/assets/stylesheets/app.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 820c631..cf11b1a 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -855,11 +855,13 @@ iframe.embed { transition:0.2s background; } .greenbtn.learn { - width: 80%; + width: 60%; clear: both; - font-size: 30px; + font-size: 26px; font-weight: 300; - margin: 110px 10% 0 10%; + margin: 140px 0% 0 20%; + background: #0054ff; + padding: 20px 0; } .greenbtn:hover{ background:black; -- cgit v1.2.3-70-g09d2