content and style changes

bakana808 · Jun 12, 2016 · 0335eea · 0335eea
1 parent 53def11
commit 0335eea
Show file tree

Hide file tree

Showing 8 changed files with 186 additions and 174 deletions.
diff --git a/_includes/head.html b/_includes/head.html
@@ -16,9 +16,21 @@
 	<!-- skrollr -->
 	<script type="text/javascript" src="https://rawgit.com/Prinzhorn/skrollr/master/dist/skrollr.min.js"></script>
 	<script type="text/javascript">
-	window.onload = function() {
-		var s = skrollr.init();
-	}
+		window.addEventListener('load', function() {
+			var s = skrollr.init();
+		});
+	</script>
+
+	<script src="https://www.gstatic.com/firebasejs/live/3.0/firebase.js"></script>
+	<script>
+	  // Initialize Firebase
+	  var config = {
+	    apiKey: "AIzaSyCvx7SAtRhHYNqLIntBQoTh0vtSa4XzVjI",
+	    authDomain: "club-shen.firebaseapp.com",
+	    databaseURL: "https://club-shen.firebaseio.com",
+	    storageBucket: "firebase-club-shen.appspot.com",
+	  };
+	  firebase.initializeApp(config);
 	</script>
 
 	<!-- tabletop -->

diff --git a/_includes/header.html b/_includes/header.html
@@ -17,6 +17,7 @@
 				<li class="navbar-item"><a href="/facebook/"><i class="fa fa-facebook"></i></a></li>
 				<li class="navbar-item"><a href="/trello/"><i class="fa fa-trello"></i></a></li>
 				<li class="navbar-item"><a href="/slack/"><i class="fa fa-slack"></i></a></li>
+				<li class="navbar-item"><a id="sign-in-button" href="">Sign in with Google</a></li>
 			</ul>
 		</div>
 

diff --git a/css/style.scss b/css/style.scss
@@ -19,6 +19,98 @@ html, body {
 	letter-spacing: 1px;
 }
 
+#sign-in-button {
+	background-color: white;
+	font-size: 14px;
+	color: #01A361;
+	text-transform: none;
+	padding: 5px 10px;
+	border-radius: 5px;
+
+	&.signed-in {
+		background-color: transparent;
+		padding: 3px 8px;
+		box-shadow: 0 0 0 2pt white;
+		color: white;
+	}
+}
+
+.match-list {
+	.match {
+		background-color: #444444;
+		box-shadow: 0 2px 3px 1px #c8c8c8;
+		border-radius: 2px;
+		line-height: 14px;
+		color: #c1c1c1;
+		margin-bottom: 5px;
+
+		.match--title {
+			display: inline-block;
+			vertical-align: middle;
+			width: 50%;
+
+			.player {
+				display: inline-block;
+				font-size: 14px;
+				font-weight: bolder;
+				padding: 8px 8px;
+				margin: 0px 5px;
+				border-radius: 5px;
+
+				&.player--0 {
+					color: #d59b4c;
+					width: 120px;
+				}
+
+				&.player--1 {
+					color: #42a7d1;
+				}
+			}
+		}
+
+		.match--games {
+			display: inline-block;
+			vertical-align: middle;
+			width: 50%;
+			padding-right: 10px;
+			box-sizing: border-box;
+
+			.game {
+				display: inline-block;
+				float: right;
+				height: 16px;
+
+				.winner {
+					display: inline-block;
+					width: 16px;
+					height: 16px;
+					border-radius: 8px;
+					margin: 0px 5px;
+
+					&.winner--0 {
+						background-color: #d59b4c;
+						box-shadow: inset 0px -4px 8px #deab66;
+					}
+
+					&.winner--1 {
+						background-color: #42a7d1;
+						box-shadow: inset 0px -4px 8px #6cc1e3;
+					}
+
+					&.winner--null {
+						background-color: #656565;
+						box-shadow: inset 0px 1px 4px #575757;
+					}
+				}
+			}
+		}
+
+
+
+
+	}
+}
+
 .page-header {
 
 	height: 50px;

diff --git a/discord/index.html b/discord/index.html
@@ -0,0 +1,4 @@
+
+<head>
+	<meta http-equiv="refresh" content="0; url=https://discord.gg/0yOmjgsbOyTGgMG6"/>
+</head>
diff --git a/index.html b/index.html
@@ -1,4 +1,7 @@
 ---
+extra_js:
+  - /src/ladder.js
+  - /src/firebase.js
 ---
 
 <section id="top"
@@ -22,8 +25,7 @@
 	data-500-start="padding-top: 610px;"
 >
 	<div class="wrapper">
-		<div class="stream-window">
-			<iframe width="640" height="360" src="https://www.youtube.com/embed/5mPyCW9A_3U" frameborder="0" allowfullscreen></iframe>
-		</div>
+		<div class="match-list-title">Recent Matches</div>
+		<div class="match-list"></div>
 	</div>
 </section>
diff --git a/ladder/ssb4/index.html b/ladder/ssb4/index.html
@@ -4,6 +4,7 @@
 extra_js:
   - /src/tabletop.js
   - /src/ladder.js
+  - /src/firebase.js
 ---
 
 <section id="top"

diff --git a/rankings/index.html b/rankings/index.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+
+  <head>
+
+    <title>Club Shenanigans</title>
+    <meta name="description" content="">
+    <link rel="stylesheet" href="/style.css">
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
+
+	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+
+
+		<link rel="stylesheet" href="/rankings/style.css">
+
+
+
+		<script type="text/javascript" src="/src/tabletop.js"></script>
+
+		<script type="text/javascript" src="/src/rankings.js"></script>
+
+
+</head>
+
+
+  <body>
+
+    <div class="page-header">
+
+	<div class="wrapper">
+
+		<div><a class="logo" href="/"></a></div>
+		<div class="title">club shen</div>
+
+		<div class="navbar">
+			<ul>
+				<li class="navbar-item"><a href="trello/"><i class="fa fa-trello"></i></a></li>
+				<li class="navbar-item"><a href="slack/"><i class="fa fa-slack"></i></a></li>
+			</ul>
+		</div>
+
+	</div>
+
+</div>
+
+
+    <div class="page-content">
+	<div class="wrapper">
+		<div class="player-ranks">
+
+			<h2 class="title">Player Rankings 2016</h2>
+			<h3 class="subtitle">Super Smash Bros. 4</h3>
+
+			<ul></ul> <!-- player rankings inserted here -->
+
+		</div>
+	</div>
+</div>
+
+
+    <footer class="site-footer">
+
+</footer>
+
+
+  </body>
+
+</html>