diff options
Diffstat (limited to 'public/assets')
| -rw-r--r-- | public/assets/javascripts/ui/editor/WallpaperPicker.js | 9 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 59 |
2 files changed, 55 insertions, 13 deletions
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(){ diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 55f3219..cf11b1a 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; @@ -373,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; @@ -385,14 +402,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; } @@ -825,7 +842,7 @@ iframe.embed { margin: 0 auto; line-height: 50px; } -.gopro span a{ +.greenbtn{ width: 100%; display: inline-block; text-align: center; @@ -837,7 +854,16 @@ iframe.embed { -moz-transition:0.2s background; transition:0.2s background; } -.gopro span a:hover{ +.greenbtn.learn { + width: 60%; + clear: both; + font-size: 26px; + font-weight: 300; + margin: 140px 0% 0 20%; + background: #0054ff; + padding: 20px 0; +} +.greenbtn:hover{ background:black; } .profilepage .about h2 .btn { @@ -958,7 +984,7 @@ border-left: 1px solid black; } .editing .mx-scenery:hover, .editing .mx-scenery.picked { - border: 15px dashed yellow; + border: 1px dashed black; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; @@ -2224,15 +2250,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 +2709,7 @@ a[data-role="forgot-password"] { text-decoration:underline; } .vvbox.share { - width: 300px + width: 230px } .vvbox.share #share_link { width: 100%; @@ -3032,6 +3062,9 @@ a[data-role="forgot-password"] { .gopro span a{ margin-top: 20px; } + .greenbtn.learn { + display:none; + } } @media screen and (orientation:portrait) { |