a few changes

fastcast · Nov 2, 2014 · 6f53c6c · 6f53c6c
1 parent 2fab875
commit 6f53c6c
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 92 deletions.
diff --git a/CNAME b/CNAME
diff --git a/about.html b/about.html
@@ -5,16 +5,20 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="description" content="Contact">
+    <meta name="description" content="Learn more about Fastcast.">
     <meta name="author" content="Jake Fulton Buckle">
+    <link rel="icon" href="favicon.ico">
+    <link rel="apple-touch-icon" sizes="120x120" href="touch-icon-iphone-retina.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="touch-icon-ipad-retina.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="touch-icon-iphone-6-plus.png">
 
-    <title>About</title>
+    <title>About Fastcast</title>
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
 
     <!-- Custom styles for this template -->
-    <link href="offcanvas.css" rel="stylesheet">
+    <link href="css/offcanvas.css" rel="stylesheet">
 
     <!-- Fastclick -->
     <script type='application/javascript' src='js/fastclick.js'></script>
@@ -24,22 +28,6 @@
       }, false);
     </script>
 
-    <!-- Flattr -->
-    <script type="text/javascript">
-    /* <![CDATA[ */
-    (function() {
-        var s = document.createElement('script');
-        var t = document.getElementsByTagName('script')[0];
-
-        s.type = 'text/javascript';
-        s.async = true;
-        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
-
-        t.parentNode.insertBefore(s, t);
-     })();
-    /* ]]> */
-    </script>
-
   </head>
 
   <body>
@@ -53,11 +41,11 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-           <a class="navbar-brand" href="index.html">Fastcast</a>
+          <a class="navbar-inner" href="/"><img src="logo.png" alt="Fastcast" height="50px" width="50px"></a>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">
-            <li><a href="index.html">Home</a></li>
+            <li><a href="/">Home</a></li>
              <li class="active"><a href="about.html">About</a></li>
              <li><a href="contact.html">Contact</a></li>
           </ul>
@@ -77,8 +65,6 @@
 
             <h1>About</h1>
 
-            <div class="g-follow" data-annotation="bubble" data-height="24" data-href="https://plus.google.com/107211927297048400212" data-rel="publisher"></div>
-
             <p>
               Imagine if sharing video and audio content on the web had no boundaries and all that people needed were each other. Fastcast aims to make peer-to-peer file sharing easy to use and leave the rest for the community to make great content. The only limit to the amount of possibilities is the creativity of the individuals. 
             </p>
@@ -93,15 +79,6 @@ <h1>About</h1>
 
         <div class="col-xs-6 col-sm-3 sidebar-offcanvas" id="sidebar" role="navigation">
           <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://fastcast.co.nz" data-text="Stream nonprofit video and audio content with BitTorrent" data-via="fastcastnz" data-count="vertical">Tweet</a>
-          <a class="FlattrButton" style="display:none;"
-            title="Support Fastcast"
-            data-flattr-uid="codex"
-            data-flattr-tags="video, torrent"
-            data-flattr-category="video"
-            href="http://fastcast.co.nz/">
-
-            Consider donating and support the development of Fastcast; a website for sharing torrent videos on the web
-          </a>
           <div class="list-group">
             <p><b>Links</b></p>
             <a href="http://www.bittorrent.com/help/guides/beginners-guide" class="list-group-item">What is BitTorrent?</a>

diff --git a/contact.html b/contact.html
@@ -5,16 +5,20 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="description" content="Contact">
+    <meta name="description" content="Get in touch with Fastcast.">
     <meta name="author" content="Jake Fulton Buckle">
+    <link rel="icon" href="favicon.ico">
+    <link rel="apple-touch-icon" sizes="120x120" href="touch-icon-iphone-retina.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="touch-icon-ipad-retina.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="touch-icon-iphone-6-plus.png">
 
-    <title>Fastcast</title>
+    <title>Contact Fastcast</title>
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
 
     <!-- Custom styles for this template -->
-    <link href="contact.css" rel="stylesheet">
+    <link href="css/contact.css" rel="stylesheet">
 
     <!-- Font-Awesome -->
     <link href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
@@ -40,11 +44,11 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-           <a class="navbar-brand" href="index.html">Fastcast</a>
+          <a class="navbar-inner" href="/"><img src="logo.png" alt="Fastcast" height="50px" width="50px"></a>
         </div>
           <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
-              <li><a href="index.html">Home</a></li>
+              <li><a href="/">Home</a></li>
               <li><a href="about.html">About</a></li>
               <li class="active"><a href="contact.html">Contact</a></li>
           </ul>

diff --git a/contact.css → css/contact.css b/contact.css → css/contact.css
diff --git a/cover.css → css/cover.css b/cover.css → css/cover.css
@@ -115,9 +115,14 @@ body {
   .masthead-nav {
     float: right;
   }
+  .icon {
+  float: left;
+  }
 }
 
 
+
+
 /*
  * Cover
  */
@@ -130,10 +135,6 @@ body {
   font-weight: bold;
 }
 
-.carousel {
-  margin-top: 10%;
-}
-
 h4 {
   color: #000000;
   text-shadow: none; /* Prevent inheritence from `body` */
@@ -179,6 +180,9 @@ a:hover {
   .cover-container {
     width: 100%; /* Must be percentage or pixels for horizontal alignment */
   }
+  .carousel {
+  margin-top: 15%;
+  }
 }
 
 @media (min-width: 992px) {

diff --git a/offcanvas.css → css/offcanvas.css b/offcanvas.css → css/offcanvas.css
diff --git a/favicon.ico b/favicon.ico
diff --git a/slide1.jpg → img/slide1.jpg b/slide1.jpg → img/slide1.jpg
diff --git a/slide2.jpg → img/slide2.jpg b/slide2.jpg → img/slide2.jpg
diff --git a/slide3.jpg → img/slide3.jpg b/slide3.jpg → img/slide3.jpg
diff --git a/index.html b/index.html
@@ -1,22 +1,24 @@
+
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="description" content="Cover">
+    <meta name="description" content="Welcome to Fastcast. P2P video and audio streaming for the web. Available soon.">
     <meta name="author" content="Jake Fulton Buckle">
+    <link rel="icon" href="favicon.ico">
+    <link rel="apple-touch-icon" sizes="120x120" href="touch-icon-iphone-retina.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="touch-icon-ipad-retina.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="touch-icon-iphone-6-plus.png">
 
     <title>Fastcast</title>
 
     <!-- Bootstrap core CSS -->
     <link rel="stylesheet" href="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
 
     <!-- Custom styles for this template -->
-    <link href="cover.css" rel="stylesheet">
-
-    <!-- Google Fonts -->
-    <link href='http://fonts.googleapis.com/css?family=Audiowide' rel='stylesheet' type='text/css'>
+    <link href="css/cover.css" rel="stylesheet">
 
     <!-- Font-Awesome -->
     <link href="http://netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
@@ -25,20 +27,11 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 
     <!-- fancyBox -->
-    <link rel="stylesheet" href="/fancybox/source/jquery.fancybox.css?v=2.1.5" type="text/css" media="screen" />
-    <script type="text/javascript" src="/fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></script>
+    <link rel="stylesheet" href="fancybox/source/jquery.fancybox.css?v=2.1.5" type="text/css" media="screen" />
+    <script type="text/javascript" src="fancybox/source/jquery.fancybox.pack.js?v=2.1.5"></script>
 
     <!-- Fastclick -->
     <script type='application/javascript' src='js/fastclick.js'></script>
-    <script type='application/javascript'>
-      $(document).ready(function() {
-        $(".various").fancybox({
-          closeClick  : false,
-          openEffect  : 'none',
-          closeEffect : 'none'
-        });
-      });
-    </script>
 
   </head>
 
@@ -52,17 +45,21 @@
 
           <div class="masthead clearfix">
             <div class="inner">
-              <h3 class="masthead-brand"> <img src="logo.svg" height="32"> Fastcast</h3>
+              <a href="/">
+                <svg class="icon" height="64" width="64" viewBox="0 0 114 114" version="1.1">
+                  <rect stroke-dashoffset="0" height="110" width="110" stroke="#FFF" stroke-dasharray="none" stroke-miterlimit="4" y="2" x="2" stroke-width="4" fill="none"/>
+                  <path stroke-linejoin="miter" d="m12,12,0,80,10,0,0,10,10,0,10-10,0-20,20,0,10-10,0-10-30,0,0-20,60,0,0-20z" stroke="#FFF" stroke-linecap="butt" stroke-miterlimit="4" stroke-dasharray="none" stroke-width="2" fill="none"/>
+                  <path fill="#FFF" d="m12,12,0,70,10,0,0,10,20,0,0-20,20,0,10-10,0-10-30,0,0-20,60,0,0-20z"/>
+                </svg>
+              </a>
               <ul class="nav masthead-nav">
-                <li class="active"><a href="index.html">Home</a></li>
+                <li class="active"><a href="/">Home</a></li>
                 <li><a href="about.html">About</a></li>
                 <li><a href="contact.html">Contact</a></li>
               </ul>
             </div>
           </div>
 
-          <br>
-
           <!-- Carousel -->
           <div id="carousel-videos" class="carousel slide" data-ride="carousel">
             <!-- Indicators -->
@@ -75,31 +72,31 @@ <h3 class="masthead-brand"> <img src="logo.svg" height="32"> Fastcast</h3>
             <!-- Wrapper for slides -->
             <div class="carousel-inner">
               <div class="item active">
-                <img src="slide1.jpg" alt="First slide">
+                <img src="img/slide1.jpg" alt="First slide">
                 <div class="container">
                   <div class="carousel-caption">
                     <h3>
-                      <a class="various fancybox.iframe" href="http://player.vimeo.com/video/93003441">Watch AWAKENING <i class="fa fa-play-circle"></i></a>
+                      <a class="fancybox fancybox.iframe" href="http://player.vimeo.com/video/93003441">Watch AWAKENING <i class="fa fa-play-circle"></i></a>
                     </h3>
                   </div>
                 </div>
               </div>
               <div class="item">
-                <img src="slide2.jpg" alt="Second slide">
+                <img src="img/slide2.jpg" alt="Second slide">
                 <div class="container">
                   <div class="carousel-caption">
                     <h3>
-                      <a class="various fancybox.iframe" href="http://player.vimeo.com/video/88558298">Watch Lavabatch <i class="fa fa-play-circle"></i></a>
+                      <a class="fancybox fancybox.iframe" href="http://player.vimeo.com/video/88558298">Watch Lavabatch <i class="fa fa-play-circle"></i></a>
                     </h3>
                   </div>
                 </div>
               </div>
               <div class="item">
-                <img src="slide3.jpg" alt="Third slide">
+                <img src="img/slide3.jpg" alt="Third slide">
                 <div class="container">
                   <div class="carousel-caption">
                     <h3>
-                      <a class="various fancybox.iframe" href="http://player.vimeo.com/video/87701971">Watch Yosemite HD II <i class="fa fa-play-circle"></i></a></a>
+                      <a class="fancybox fancybox.iframe" href="http://player.vimeo.com/video/87701971">Watch Yosemite HD II <i class="fa fa-play-circle"></i></a>
                     </h3>
                   </div>
                 </div>
@@ -111,14 +108,14 @@ <h3>
             <a class="right carousel-control" href="#carousel-videos" data-slide="next"><span class="glyphicon glyphicon-chevron-right"></span></a>
           </div><!-- /.carousel -->
 
-          <div class="inner cover">
+          <br>
 
-            <br>
+          <div class="inner cover">
 
             <p class="lead">Stream nonprofit video and audio content with BitTorrent.</p>
 
             <p class="lead">
-              <a href="https://github.com/fastcast/fastcast" class="btn btn-lg btn-default">View on GitHub <i class="fa fa-lg fa-github"></i></a>
+              <a href="about.html" class="btn btn-lg btn-default">Learn more about Fastcast</a>
             </p>
 
           </div>
@@ -129,10 +126,23 @@ <h3>
 
     </div>
 
+    <script type='application/javascript'>
+      $(document).ready(function() {
+        $(".fancybox").fancybox({
+          closeClick  : false,
+          openEffect  : 'none',
+          closeEffect : 'none',
+          iframe: {
+            preload: false
+          },
+        });
+      });
+    </script>
+
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     <script src="https://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
     <script src="js/docs.min.js"></script>
   </body>
-</html>
+</html>
diff --git a/logo.png b/logo.png
diff --git a/logo.svg b/logo.svg
diff --git a/touch-icon-ipad-retina.png b/touch-icon-ipad-retina.png
diff --git a/touch-icon-iphone-6-plus.png b/touch-icon-iphone-6-plus.png
diff --git a/touch-icon-iphone-retina.png b/touch-icon-iphone-retina.png