scratch – Diff between revs 70 and 71

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 70 Rev 71
Line 18... Line 18...
18 <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"> 18 <link href="bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
19 <!-- Font Awesome --> 19 <!-- Font Awesome -->
20 <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet"> 20 <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet">
21 <!-- Trumbowyg --> 21 <!-- Trumbowyg -->
22 <link href="bower_components/trumbowyg/dist/ui/trumbowyg.min.css" rel="stylesheet"> 22 <link href="bower_components/trumbowyg/dist/ui/trumbowyg.min.css" rel="stylesheet">
23 <!-- Local style --> -  
24 <link href="css/text/style.css" rel="stylesheet"> -  
-   23  
25 <!-- Site-wide style CCS --> 24 <!-- Site-wide style CCS -->
26 <link href="css/style.css" rel="stylesheet"> 25 <link href="css/style.css" rel="stylesheet">
-   26
-   27 <!-- Local style -->
-   28 <link href="css/text/style.css" rel="stylesheet">
27 </head> 29 </head>
Line 28... Line 30...
28   30  
Line -... Line 31...
-   31 <body>
-   32  
29 <body> 33 <!-- Main component for a primary marketing message or call to action -->
-   34 <div class="paralax-background"></div>
-   35 <div class="jumbotron">
-   36 <h1>scratch copy</h1>
Line 30... Line -...
30   -  
31 <div class="container"> -  
32   37 <p class="quote">the asset sharer</p>
33 <!-- Main component for a primary marketing message or call to action --> -  
34 <div class="paralax-background"></div> -  
35 <div class="jumbotron"> -  
Line 36... Line 38...
36 <h1>Scratch</h1> 38 </div>
37 <p class="lead">Asset sharing platform</p> 39  
38 </div> 40 <div class="container">
39 41
Line 87... Line 89...
87   89  
Line 88... Line 90...
88 </div> <!-- /container --> 90 </div> <!-- /container -->
89 91
90 <div id="footer"> 92 <div id="footer">
91 <div class="container"> 93 <div class="container">
92 <p class="text-muted credit">Copyright <i class="glyphicon glyphicon-copyright-mark"></i> 2017 <a href="http://grimore.org">Wizardry and Steamworks</a>.</p> 94 <p class="text-muted credit text-center">Copyright <i class="glyphicon glyphicon-copyright-mark"></i> 2017 <a href="http://grimore.org">Wizardry and Steamworks</a>.</p>
Line 93... Line 95...
93 </div> 95 </div>
94 </div> 96 </div>
Line 357... Line 359...
357 }); 359 });
358 }); 360 });
359 }); 361 });
360 }); 362 });
361 </script> 363 </script>
-   364 <!-- Jumbotron parallax effect -->
362 <script> 365 <script>
363 var jumboHeight = $('.jumbotron').outerHeight(); 366 var jumboHeight = $('.jumbotron').outerHeight();
364 function parallax(){ 367 function parallax(){
365 var scrolled = $(window).scrollTop(); 368 var scrolled = $(window).scrollTop();
366 $('.paralax-background').css('height', (jumboHeight-scrolled) + 'px'); 369 $('.paralax-background').css('height', (jumboHeight-scrolled) + 'px');