with other tabs

Ri7Sh · Feb 19, 2018 · 605f517 · 605f517
1 parent 7d16aca
commit 605f517
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 6 deletions.
diff --git a/main/static/assets/css/logggin.css b/main/static/assets/css/logggin.css
@@ -3,6 +3,15 @@
 	margin-top: 100px;
 }
 
+.title{
+
+	position: absolute;
+    top: 0;
+    z-index: 100;
+
+
+}
+
 
 #wrapper{
 	position: absolute;

diff --git a/main/static/assets/css/ssstyle.css b/main/static/assets/css/ssstyle.css
@@ -1175,7 +1175,7 @@ h1 span, #navbar h1 a {
 #navbar {
   z-index: 99;
   position: absolute;
-  top: 0;
+  top: 55;
   left: 0;
   padding: 16px;
   width: 100%;
@@ -1471,13 +1471,13 @@ body {
    	width: 58%;
    	position: fixed;
     color: white;
-    top: 0%;
+    top: 15%;
     left: 2%;
     border-radius: 12px;
     bottom: 1%;
     background-color: rgba(0,0,0,0.5);
     z-index: 2;
-    cursor: pointer;
+
     font-size: 2em;
 
    }
@@ -1486,13 +1486,13 @@ body {
    	width: 38%;
    	position: fixed;
     color: lime;
-    top: 0%;
+    top: 15%;
     left: 60%;
     border-radius: 12px;
     bottom: 1%;
     background-color: rgba(0,0,0,0.5);
     z-index: 2;
-    cursor: pointer;
+
     font-size: 2em;
    }
 

diff --git a/main/templates/login.html b/main/templates/login.html
@@ -9,6 +9,9 @@
 
     <link href="{% static '/assets/css/logggin.css' %}" rel="stylesheet">
     <link href="{% static '/assets/css/normalize.min.css' %}" rel="stylesheet">
+    <link href="{% static '/assets/css/common.css' %}" rel="stylesheet">
+	<link href="{% static '/assets/css/main.css' %}" rel="stylesheet">
+	<link href="{% static '/assets/css/puzzle.css' %}" rel="stylesheet">
 
 
     <script src="{% static '/assets/js/jquery.min.js' %}"></script>
@@ -26,9 +29,26 @@
 
 </head>
 <body>
+<div class="title">
+
+      <nav>
+
+        <li class="instr button" onclick="openRegis()">$Register</li>
+        <li class="instr button" onclick="openInst()">$Instructions</li>
+
+
+
+
+      </nav>
+    </div>
+
+
 	<div id="wrapper">
+
 
 		<div id="dummy">
+
+
 		<div id="form">
 
 			<div id="logo"> 
@@ -150,6 +170,14 @@ <h2> </h2>
 	$('.msg').show();
 }
 </script>
+<script>
+function openInst(){
+			window.location.href = "/main/welcome"
+		}
+function openRegis(){
+			window.location.href = "/main/register"
+		}
+		</script>
 
 </body>
 </html>
diff --git a/main/templates/ss.html b/main/templates/ss.html
@@ -1,16 +1,37 @@
 {% load static %}
+
 <html>
 <head>
 <link rel  = "stylesheet" href = "{% static '/assets/css/ssstyle.css' %}">
 <link rel  = "stylesheet" href = "{% static '/assets/css/fonts.css' %}">
+<link href="{% static '/assets/css/common.css' %}" rel="stylesheet">
+  <link href="{% static '/assets/css/main.css' %}" rel="stylesheet">
+  <link href="{% static '/assets/css/puzzle.css' %}" rel="stylesheet">
 </head>
 
 
   <body class="opening hide-UI view-2D zoom-large data-close controls-close" onload = "typeWriter()">
+  <div class="title">
+      <h1>CHECKMATE 18<span class="letter6">_</span></h1>
+      <nav>
+        {% if stat %}
+        <li class="instr button" action="/">$Register</li>
+        <li class="button" action="/main/login">$Login</li>
+        {% else %}
+        <li class="instr button" action="/">$Play</li>
+        <li class="button" action="/main/logout">$Logout</li>
+        {% endif %}
+      </nav>
+    </div>
   <div id = "see1" class="holographic-text-blue"><br><br>
                   <br><br></div>
    <div id = "see2" class="holographic-text-blue"><br><br>
-                  <br><br>Quick Instructions</div>
+                  <br><br>Quick Instructions
+
+
+
+
+                          </div>
     <div id="navbar" class="holographic-text-blue">
            <h1>Instructions<br></h1>