Merge branch 'master' of https://github.com/team4334/team4334.github.io

johnb8 · johnb8 · commit 886cc42313bf · 2019-04-08T21:02:54.000-06:00
diff --git a/404.md b/404.md
@@ -1,4 +1,5 @@
 ---
+#404 code
 layout: default
 title: 404 Not Found
 permalink: /404.html
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# team4334.github.io
+# team4334.github.io #
 
 FRC team ATA 4334's team website. Visit us at http://www.4334.ca/.
diff --git a/_config.yml b/_config.yml
@@ -1,7 +1,10 @@
+#Sets the name of the website
 name: "Team 4334"
+#Sets the description of the website
 description: "Official website of Team 4334 - Alberta Tech Alliance"
 
 permalink: pretty
+#Sets the url of the website
 url: http://4334.ca
 
 paginator: 10
diff --git a/first.md b/first.md
@@ -1,4 +1,5 @@
 ﻿---
+#FIRST page
 layout: first
 title: FIRST
 vid: https://www.youtube.com/embed/GZXngCu99rs
diff --git a/first/2012.md b/first/2012.md
@@ -1,4 +1,5 @@
 ﻿---
+#2012 FRC game page
 layout: first
 title: Rebound Rumble
 year: 2012
diff --git a/first/2013.md b/first/2013.md
@@ -1,4 +1,5 @@
 ﻿---
+#2013 FRC game page
 layout: first
 title: Ultimate Ascent
 year: 2013
diff --git a/first/2014.md b/first/2014.md
@@ -1,4 +1,5 @@
 ﻿---
+#2014 FRC game page
 layout: first
 title: Aerial Assist
 year: 2014
diff --git a/first/2015.md b/first/2015.md
@@ -1,4 +1,5 @@
 ﻿---
+#2015 FRC game page
 layout: first
 title: Recycle Rush
 year: 2015
diff --git a/first/2016.md b/first/2016.md
@@ -1,4 +1,5 @@
 ﻿---
+#2016 FRC game page
 layout: first
 title: Stronghold
 year: 2016
diff --git a/first/2017.md b/first/2017.md
@@ -1,4 +1,5 @@
 ﻿---
+#2017 FRC game page
 layout: first
 title: Steamworks
 year: 2017
diff --git a/first/2018.md b/first/2018.md
@@ -1,4 +1,5 @@
 ﻿---
+#2018 FRC game page
 layout: first
 title: POWER UP
 year: 2018
diff --git a/first/2019.md b/first/2019.md
@@ -1,4 +1,5 @@
 ---
+#2019 FRC game page
 layout: first
 title: "Destination: Deep Space"
 year: 2019
diff --git a/resources/css/awards.css b/resources/css/awards.css
@@ -1,5 +1,6 @@
 a:link, a:visited, a:hover, a:active {
-    color: #333333;
+    /* Sets the text colour */
+        color: #333333;
 }
 
 .tg {
@@ -8,10 +9,14 @@ a:link, a:visited, a:hover, a:active {
 }
 
 .tg td {
+    /* Sets the font */
     font-family: Calibri, sans-serif;
+    /* Sets the font size */
     font-size: 14px;
     padding: 10px 5px;
+    /* Sets the border style */
     border-style: solid;
+    /* Sets the border width */
     border-width: 0px;
     overflow: hidden;
     word-break: normal;
@@ -29,6 +34,7 @@ a:link, a:visited, a:hover, a:active {
 }
 
 .tg .tg-ee5k {
+    /* Sets the font to bold */
     font-weight: bold;
     color: #000000;
     vertical-align: top;
diff --git a/resources/css/card.css b/resources/css/card.css
@@ -1,5 +1,7 @@
 .card {
     background-color: #f0f0f0;
+    /* Has no border edge */
     border-radius: 0;
+    /* Calculates the height */
     height: calc(100% - 24px);
 }
diff --git a/resources/css/home.css b/resources/css/home.css
@@ -2,7 +2,9 @@
     left: 0;
     right: 0;
     bottom: 0;
+    /* Aligns the text to the left side */
     text-align: left;
+    /* Sets the padding thickness */
     padding: 10px;
     background: rgba(0, 0, 0, 0.6);
     text-shadow: none;
diff --git a/resources/css/thumb.css b/resources/css/thumb.css
@@ -1,3 +1,4 @@
+/* Creates a thumbnail class */
 .thumbnail {
     padding: 0 0 1px 0;
     border: none;
diff --git a/slack.md b/slack.md
@@ -1,3 +1,4 @@
+<!-- Slack redirect -->
 <head>
     <meta http-equiv="refresh" content="0; url=https://ataa2014.slack.com/" />
 </head>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#404 code`
`2`	`3`	`layout: default`
`3`	`4`	`title: 404 Not Found`
`4`	`5`	`permalink: /404.html`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-# team4334.github.io`
	`1`	`+# team4334.github.io #`
`2`	`2`
`3`	`3`	`FRC team ATA 4334's team website. Visit us at http://www.4334.ca/.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#FIRST page`
`2`	`3`	`layout: first`
`3`	`4`	`title: FIRST`
`4`	`5`	`vid: https://www.youtube.com/embed/GZXngCu99rs`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#2012 FRC game page`
`2`	`3`	`layout: first`
`3`	`4`	`title: Rebound Rumble`
`4`	`5`	`year: 2012`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#2013 FRC game page`
`2`	`3`	`layout: first`
`3`	`4`	`title: Ultimate Ascent`
`4`	`5`	`year: 2013`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#2014 FRC game page`
`2`	`3`	`layout: first`
`3`	`4`	`title: Aerial Assist`
`4`	`5`	`year: 2014`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#2015 FRC game page`
`2`	`3`	`layout: first`
`3`	`4`	`title: Recycle Rush`
`4`	`5`	`year: 2015`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#2016 FRC game page`
`2`	`3`	`layout: first`
`3`	`4`	`title: Stronghold`
`4`	`5`	`year: 2016`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`---`
	`2`	`+#2017 FRC game page`
`2`	`3`	`layout: first`
`3`	`4`	`title: Steamworks`
`4`	`5`	`year: 2017`