Skip to content

Commit

Permalink
added a third fade
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeyferg committed Mar 18, 2016
1 parent 70add48 commit f7a7c63
Show file tree
Hide file tree
Showing 79 changed files with 917 additions and 11 deletions.
5 changes: 3 additions & 2 deletions app/assets/javascripts/main_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ $(document).ready(function(){
input: false
})

$('.test').delay(5000).fadeIn(1000)
$('.fade_1').delay(4000).fadeIn(1000)
// $("imgInp").filestyle();
$('.test2').delay(8000).fadeIn(1000)
$('.fade_2').delay(8000).fadeIn(1000)
$('.fade_3').delay(12000).fadeIn(1000)

$("#imgInp").on("click", function(){
$("video").removeClass('hidden');
Expand Down
6 changes: 1 addition & 5 deletions app/assets/stylesheets/freelancer.css
Original file line number Diff line number Diff line change
Expand Up @@ -492,10 +492,6 @@ body {
color: white;
}

.test {
display:none;
}

.test2 {
.fade_1, .fade_2, .fade_3 {
display:none;
}
8 changes: 4 additions & 4 deletions app/views/static_pages/main_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@
</div>
</div> -->
<div class="row test">
<div class="col-sm-4 portfolio-item center">
<div class="col-sm-4 portfolio-item center fade_1">
<h3>Record yourself turning your head <br>SLOWLY</h2>
</div>
<div class="col-sm-4 portfolio-item center">
<div class="col-sm-4 portfolio-item center fade_2">
<!-- <p>Turn head all the way left and then right and back to center.</p> -->
<p class="two">First all the way left, then right, and back to center</p>
</div>
<div class="col-sm-4 portfolio-item center">
<div class="col-sm-4 portfolio-item center fade_2">
<p>Record for about 10 seconds</p>
</div>
<!-- <div class="col-sm-4 portfolio-item center">
<p>Don't forget to start and stop the camera!</p>
</div> -->
</div>
<div class="row test2">
<div class="row fade_3 test2">
<div class="col-sm-4 portfolio-item center">
<form id="form1" runat="server" class="row col-centered">
<input type='file' accept="video/*" id="imgInp" class="add_video filestyle" data-classButton="btn btn-primary" data-input="false" data-classIcon="icon-plus" data-icon="false" data-buttonText="Load Camera"/>
Expand Down
850 changes: 850 additions & 0 deletions log/development.log

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=self&id=ed815cad80efba6f9b24696902c0811a821cf6d5f987c7572225e3c546dd7a14:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application_green.css.sass?type=text/css&pipeline=self&id=5e86ba3e953198bfaf93e457f4b309361c9f8dec87796554164328ca6862cfd4:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"8file-digest://app/assets/stylesheets/freelancer.css;TT
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=debug&id=d30d76a8ac62b5ef985d6ecb6fbb164b0502bb54f7ab39e42091e857e38ff79a:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/main_page.js?type=application/javascript&pipeline=self&id=d30231e37f07686f8be3b111df9377b8f3f562550e13ace067b2790a073bbfd2:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%l�R&���c��J����T�L��!��6��s"�
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=b55d6c89ed4e80ae980c89d4981e414cec08ac55eee3fd14be4789a2aa271e77:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/freelancer.css?type=text/css&pipeline=self&id=54979851da5654c11aa4511fad3822dac2ab2e0c58f98603219ed59e8df82cbe:ET
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&pipeline=debug&id=ccfbaf3c4411caeb7516e097ba113c2f6e5605446a0469e5643ff6c68d7ebc2d:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%eǒ��k�@(;�S ��Ϙ�r㔥b2Cv$��x
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"6file-digest://app/assets/javascripts/main_page.js;TT
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"8file-digest://app/assets/stylesheets/freelancer.css;TT
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=self&id=0aa07953d69ade36df77a63885b9da841ba0efd7a33157163dc4b75195cd037d:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application_green.css.sass?type=text/css&pipeline=self&id=de45cb2712f87736098e813cd9e6d84025dd94654c66a995b417a0fc44874260:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=self&id=ea1de1c01c1fd5252aca98461facd8483b923ba7ee292b62560f9b92231f76e0:ET
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=debug&id=8bc842a1750ce6653185a294a132ea9de9868b7703a7a5787952931f1eb29d4f:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=bab358fb5f80a74901539942c54f896ffc3b3d7aebe75fc1739b949a5707dd1c:ET
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"8file-digest://app/assets/stylesheets/freelancer.css;TT
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/freelancer.css?type=text/css&pipeline=self&id=a7753755ec31f3755b8c6554ce7434f54d455061e168b71104c078a44ddba8be:ET
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%�����{���c�M�Qݝ/��8-k�_��/
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/main_page.js?type=application/javascript&pipeline=self&id=6bbd04184660527573ff068271b445573e21c26bb864d5933e41f93327061db6:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"}app/assets/stylesheets/application.css.sass?type=text/css&id=55ca3e0209ff7095fe0cce48ac3c7617ce432634501808b7ad38d04b55702987:ET
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&id=9f57154f860deb95feb3a884acd5abf4c092dc93664f62ac6928479a07fb05f5:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application_green.css.sass?type=text/css&pipeline=self&id=23b318424648dffd71d76c7dae759fcaa61d134e9acf16b335cbd92bd2f785d6:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&pipeline=debug&id=a76c39bd6b7af39e9407b591865bbb0e6a538c596caa129eef9df549fbdca268:ET
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"6file-digest://app/assets/javascripts/main_page.js;TT
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=debug&id=83301237238133e287bd755efe94d1ea94848d5a80c65dc21302cc2475641403:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%E�w2�9{� �<3� �Z$��R��S��O�
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%����E�6� �ff.<����6�hzƾ�n�ZY
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=debug&id=a355d5d458cabc36276f5ff73ca53a2ec8414e4e636adae9c85293481e6779d9:ET
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%�qs*Ge��y�|a��)��#�b�4�C�c�:F
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/freelancer.css?type=text/css&pipeline=self&id=aaac28f869d3d809b84f56cf840c0e4102165094b39391cb276199579db41fe2:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/main_page.js?type=application/javascript&pipeline=self&id=0e1a9569bc66b924525368f1d60b787fea8f31b47470577d4cfae1ce7b411598:ET
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=ea38206656077257e75a6450737915a284792dc1507df40b05f30eedb80d4ca6:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%j�?jx$Eq+�I��r�]X�Ыc�udpdfU��
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/freelancer.css?type=text/css&pipeline=self&id=89be2c8173064332e8936014f8f04a118ad027447455e5d12ddccf98d2dff63c:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%eǒ��k�@(;�S ��Ϙ�r㔥b2Cv$��x
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/javascripts/application.js?type=application/javascript&pipeline=debug&id=576c5570d09ce216c114fa76fd00fd17ba8ae4fea152536d3bde73e9fc50d85d:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI"Zprocessors:type=application/javascript&file_type=application/javascript&pipeline=self;TTI"6file-digest://app/assets/javascripts/main_page.js;TT
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%E�w2�9{� �<3� �Z$��R��S��O�
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%E�w2�9{� �<3� �Z$��R��S��O�
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application_green.css.sass?type=text/css&pipeline=self&id=d56cc1c4a025c9ff7fb770773e70106eab8ae00df519198ef4e9e49a4e24b15d:ET
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[o:Set:
@hash{
I"environment-version:ETTI"environment-paths;TTI"rails-env;TTI">processors:type=text/css&file_type=text/css&pipeline=self;TTI"8file-digest://app/assets/stylesheets/freelancer.css;TT
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
"%�qs*Ge��y�|a��)��#�b�4�C�c�:F
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I"�app/assets/stylesheets/application.css.sass?type=text/css&pipeline=self&id=1be7ec59a2e2cb9ea7c0d91200baeff1aeb09118d366a8a82087a62386b62776:ET

0 comments on commit f7a7c63

Please sign in to comment.