diff --git a/asset/c_FA_48.png b/asset/c_FA_48.png new file mode 100644 index 0000000..5cabbfd Binary files /dev/null and b/asset/c_FA_48.png differ diff --git a/asset/c_FI_48.png b/asset/c_FI_48.png new file mode 100644 index 0000000..c8f12b3 Binary files /dev/null and b/asset/c_FI_48.png differ diff --git a/asset/c_FL_48.png b/asset/c_FL_48.png new file mode 100644 index 0000000..2233bf0 Binary files /dev/null and b/asset/c_FL_48.png differ diff --git a/asset/c_UD_48.png b/asset/c_UD_48.png new file mode 100644 index 0000000..ef5a904 Binary files /dev/null and b/asset/c_UD_48.png differ diff --git a/asset/i_FA_48.png b/asset/i_FA_48.png index 293e7a4..7917b83 100644 Binary files a/asset/i_FA_48.png and b/asset/i_FA_48.png differ diff --git a/asset/i_FI_48.png b/asset/i_FI_48.png index a9a4200..c3f2ba1 100644 Binary files a/asset/i_FI_48.png and b/asset/i_FI_48.png differ diff --git a/asset/i_FL_48.png b/asset/i_FL_48.png index 9c66c87..915efe9 100644 Binary files a/asset/i_FL_48.png and b/asset/i_FL_48.png differ diff --git a/asset/i_UD_48.png b/asset/i_UD_48.png index 3945de9..570a524 100644 Binary files a/asset/i_UD_48.png and b/asset/i_UD_48.png differ diff --git a/asset/river.html b/asset/river.html index a2a3a10..0184bcc 100644 --- a/asset/river.html +++ b/asset/river.html @@ -52,7 +52,6 @@ + + + + diff --git a/asset/scsv.html b/asset/scsv.html index c8c6d0c..2d52cb0 100644 --- a/asset/scsv.html +++ b/asset/scsv.html @@ -1,7 +1,7 @@ -

- TOUCH - ME -

+ + + + diff --git a/asset/uda.css b/asset/uda.css index 18949fe..527d90c 100644 --- a/asset/uda.css +++ b/asset/uda.css @@ -1151,20 +1151,32 @@ li{ padding: 20px; z-index: 800; } -.ml15 { - position: fixed; - top: 50%; - left: 50%; - z-index: 800; - transform: translate(-50%, -50%); - font-weight: 800; - font-size: 3.8em; - text-transform: uppercase; - letter-spacing: 0.5em; +.cat{ + z-index: 805; } -.ml15 .word { - display: inline-block; - line-height: 1em; - color: white; +.cat_FI{ + position: absolute; + top: 50px; + left: 300px; } +.cat_FL{ + position: absolute; + top: 150px; + left: 300px; +} +.cat_FA{ + position: absolute; + top: 250px; + left: 300px; +} +.cat_UD{ + position: absolute; + top: 350px; + left: 300px; +} + +.cat_OFF{ + opacity: 0.5; +} + diff --git a/asset/udatinos.js b/asset/udatinos.js index ab2664d..a59513e 100644 --- a/asset/udatinos.js +++ b/asset/udatinos.js @@ -63,25 +63,8 @@ function toScsv(){ var body = $jq('body'); body.html(html_string); -// Wrap every letter in a span -anime.timeline({loop: true}) - .add({ - targets: '.ml15 .word', - scale: [14,1], - opacity: [0,1], - easing: "easeOutCirc", - duration: 800, - delay: (el, i) => 800 * i - }).add({ - targets: '.ml15', - opacity: 0, - duration: 1000, - easing: "easeOutExpo", - delay: 1000 - }); $jq("#myVideo").on( "click", function(){toRiver();} ) - $jq(".ml15").on( "click", function(){toRiver();} ) $jq(".mword").on( "click", function(){toRiver();} ) },'html'); @@ -91,6 +74,17 @@ function toRiver(){ $jq.get("asset/river.html", function(html_string){ var body = $jq('body'); body.html(html_string); + $jq('.cat').on('click',function(e){ + if($jq(this).hasClass( "cat_OFF" )){ + //is going on + $jq(this).removeClass( "cat_OFF" ); + }else{ + //is going off + $jq(this).addClass( "cat_OFF" ); + } + }); + + $jq('input').each(function(){ var self = $jq(this), label = self.next(), @@ -180,7 +174,7 @@ $jq( document ).ready(function() { }); var intervalId = setInterval(function() { - if(Date.now()-timeRef>=30000 && state==1){ + if(Date.now()-timeRef>=3330000 && state==1){ toScsv(); } }, 5000); diff --git a/index.html b/index.html index 5bcd83f..dadf0c8 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + diff --git a/media/rain.mp4 b/media/rain.mp4 index a0d6909..f16e124 100644 Binary files a/media/rain.mp4 and b/media/rain.mp4 differ