Merge pull request #11 from antioxidants/development

Merge the new list function, and the new changes to the main page.
darkstarteam · May 15, 2017 · 3f21837 · 3f21837
2 parents 4de7cdd + f7037f8
commit 3f21837
Show file tree

Hide file tree

Showing 5 changed files with 907 additions and 10 deletions.
diff --git a/css/main.css b/css/main.css
@@ -14,13 +14,66 @@ body {
 }
 
 #name {
-    font-size: 16pt;
+    font-size: 18pt;
+}
+
+#type {
+    font-size: 14pt;
 }
 
 #flavortext {
     font-size: 12pt;
 }
 
+.type-filter {
+    position: relative;
+    float: left;
+    overflow: hidden;
+    width: auto;
+    padding: 0 10px 0 0;
+    margin-right: 9px;
+    background: rgba(245, 245, 245, 1);
+    border: 1px solid rgba(30,36,43,0.1);
+    border-radius: .278rem;
+    font-size: 11px;
+}
+
+select {
+	width: 130%;
+    height: 130%;
+	padding: .8em 1em;;
+	color: rgba(30,36,43, 1);
+	border: 0;
+    border-radius: .278rem;
+	box-shadow: none;
+	background: rgba(245, 245, 245, 1);
+	background-image: none;
+	font-size: 15px;
+	-moz-appearance: none;
+	-webkit-appearance: none;
+	appearance: none;
+}
+
+select:focus {
+	outline: none;
+}
+
+select:hover
+{
+	background: rgba(250, 250, 250, 1);
+}
+
+.type-filter:after
+{
+	content: "\f0d7";
+	font-family: FontAwesome;
+    font-size: 15px;
+	position: absolute;
+	top: 14px;
+	right: 16px;
+	color: rgba(30,36,43, 1);
+}
+
 .button {
     vertical-align: middle;
     cursor: pointer;
@@ -40,6 +93,10 @@ body {
     background-color: #ffce1f;
 }
 
+.button:focus {
+  outline: none;
+}
+
 .footer {
     position: relative;
     width: 100%;

diff --git a/index.html b/index.html
@@ -8,7 +8,7 @@
         <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
         <link rel="shortcut icon" type="image/png" href="/favicon.ico"/>
     </head>
-    <body>
+    <body onload="GrabRandomFlavorText()">
         <script>
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
         (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -19,12 +19,14 @@
         ga('send', 'pageview');
         </script>
         <script src="js/jquery-3.2.1.min.js"></script>
-        <script src="js/flavortext.js"></script>
+        <script src="https://use.fontawesome.com/b28bdd3e8c.js"></script>
+        <script src="js/flavortext.min.js"></script>
         <div class="container">
         <br>
         <p id="name"></p>
+        <p id="type"></p>
         <p id="flavortext"></p>
-        <button class="button" id="refresh_button" onclick="Refresh()">One more</button> <button class="button" id="about_button" onclick="About()">About</button>
+        <button class="button" id="refresh_button" onclick="Refresh()">One more</button>&nbsp;&nbsp;<button class="button" id="list_button" onclick="goToLists()">Lists</button>&nbsp;&nbsp;<button class="button" id="about_button" onclick="About()">About</button>
         </div>
     </body>
-</html>
+</html>