scratch – Diff between revs 65 and 68

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 65 Rev 68
Line 14... Line 14...
14 <!-- Bootstrap core CSS --> 14 <!-- Bootstrap core CSS -->
15 <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> 15 <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
16 <!-- Font Awesome --> 16 <!-- Font Awesome -->
17 <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet"> 17 <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
Line -... Line 18...
-   18
-   19 <!-- Site-wide style CCS -->
18 20 <link href="css/style.css" rel="stylesheet">
Line 19... Line 21...
19 </head> 21 </head>
Line 20... Line 22...
20   22  
Line 21... Line 23...
21 <body> 23 <body>
-   24  
22   25 <div class="container">
23 <div class="container"> 26  
24   27 <!-- Main component for a primary marketing message or call to action -->
25 <!-- Main component for a primary marketing message or call to action --> 28 <div class="paralax-background"></div>
Line 26... Line 29...
26 <div class="jumbotron"> 29 <div class="jumbotron">
27 <h1>Scratch</h1> 30 <h1>Scratch</h1>
28 <p>Asset sharing platform.</p> 31 <p class="lead">Asset sharing platform</p>
29 </div> 32 </div>
30 33
Line 31... Line 34...
31 <ul class="nav nav-tabs"> 34 <ul class="nav nav-tabs">
32 <li class="active"><a href="#">Home</a></li> -  
33 <li><a href="file.html">File</a></li> 35 <li class="active"><a href="#">Home</a></li>
34 <li><a href="text.html">Text</a></li> 36 <li><a href="file.html">File</a></li>
35 </ul> 37 <li><a href="text.html">Text</a></li>
36 -  
37 38 </ul>
Line 38... Line 39...
38 <div class="row"> 39
Line 39... Line 40...
39 <div class="col-md-4"> 40
Line 53... Line 54...
53   54  
54 <!-- jQuery --> 55 <!-- jQuery -->
55 <script src="bower_components/jquery/dist/jquery.min.js"></script> 56 <script src="bower_components/jquery/dist/jquery.min.js"></script>
56 <!-- BootStrap --> 57 <!-- BootStrap -->
-   58 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-   59 <script>
-   60 var jumboHeight = $('.jumbotron').outerHeight();
-   61 function parallax(){
-   62 var scrolled = $(window).scrollTop();
-   63 $('.paralax-background').css('height', (jumboHeight-scrolled) + 'px');
-   64 }
-   65  
-   66 $(window).scroll(function(e){
-   67 parallax();
-   68 });
57 <script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script> 69 </script>
58 </body> 70 </body>