From fd6bc6e093aa16ff8c26c165d518d252940e7796 Mon Sep 17 00:00:00 2001 From: Leonid Medovyy Date: Sun, 15 Dec 2019 22:19:29 -0800 Subject: [PATCH] adjuted covers for about and features --- .idea/workspace.xml | 8 +++++--- app/views/pages/about.html.slim | 4 ++-- frontend/js/about_cover.vue | 28 ++++++++++++---------------- frontend/js/feature_cover.vue | 2 +- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 86edc49..ed41822 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,8 @@ + + @@ -224,10 +226,10 @@ - + - + \ No newline at end of file diff --git a/app/views/pages/about.html.slim b/app/views/pages/about.html.slim index 3426106..23fd14b 100644 --- a/app/views/pages/about.html.slim +++ b/app/views/pages/about.html.slim @@ -7,8 +7,8 @@ = container = grid = column size: 14, class: 'centered content' - = h1 class: 'inverted', text: "It's all for LOLs" - = text text: "One mission. One vision. Make the internet fun again." + = h1 class: 'inverted', text: "One Vision" + = text text: "Make the Internet fun." = fragment 'story' = container 'full' diff --git a/frontend/js/about_cover.vue b/frontend/js/about_cover.vue index f346e65..0b3edd0 100644 --- a/frontend/js/about_cover.vue +++ b/frontend/js/about_cover.vue @@ -7,14 +7,10 @@ PointLight(:diffuse="point_light") template(v-for="x in squares") template(v-for="y in squares") - Box(v-for="z in squares" :position="[x, y, z]" :key="`${x},${y},${z}`") - Material(:diffuse="pick_color(x,y,z)" :roughness="0.50" :glossiness="1") - Animation(property="rotation.x" :duration="4" :end="Math.PI * 1.9" :loop="true") - Animation(property="rotation.y" :duration="4" :end="Math.PI * 1.9" :loop="true") - Animation(property="rotation.z" :duration="4" :end="Math.PI * 1.9" :loop="true") - Animation(property="scaling.x" :duration="50" :start="1.1" :end="Math.PI * 1.3" :loop="false") - Animation(property="scaling.y" :duration="50" :start="1.1" :end="Math.PI * 1.3" :loop="false") - Animation(property="scaling.z" :duration="50" :start="1.1" :end="Math.PI * 1.3" :loop="false") + template(v-if="x != 0 && y == 0") + Box(v-for="z in squares" :position="[x, y, z]" :key="`${x},${y},${z}`") + Material(:diffuse="pick_color(x,y,z)" :roughness="0.50" :glossiness="1") + Animation(property="scaling.z" :duration="60" :start="1.2" :end="Math.PI * 1.3" :loop="false") @@ -27,18 +23,18 @@ export default { point_light: '#fff' square_color: "#000" squares: [0, 2, -2 ] - first_color: '#9c91ff' - second_color: '#ffab1d' - third_color: '#ffe908' - fourth_color: '#00d8ff' - fifth_color: '#ff1873' - sixth_color: '#0fff7a' + first_color: '#fff' + second_color: '#fff' + third_color: '#fff' + fourth_color: '#fff' + fifth_color: '#fff' + sixth_color: '#fff' mounted: -> $('.overlay').css('transition', 'all 2.5s') - $('.overlay').css('opacity', 0.1) + $('.overlay').css('opacity', 0.4) beforeDestroy: -> $('.overlay').css('transition', 'none') - $('.overlay').css('opacity', 1) + $('.overlay').css('opacity', 0.4) methods: pick_color: (x, y, z) -> diff --git a/frontend/js/feature_cover.vue b/frontend/js/feature_cover.vue index 9b019d3..ba55b38 100644 --- a/frontend/js/feature_cover.vue +++ b/frontend/js/feature_cover.vue @@ -30,7 +30,7 @@ export default { second_color: '#0E6EB8' third_color: '#0E6EB8' fourth_color: '#0E6EB8' - fifth_color: '#0E6EB8 + fifth_color: '#0E6EB8' sixth_color: '#0E6EB8' mounted: -> $('.overlay').css('transition', 'all 2.5s')