Merge branch 'safe' into ultrasafe

bitsacm · Feb 21, 2018 · 510b6eb · 510b6eb
2 parents 3ffea24 + 299120a
commit 510b6eb
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 145 deletions.
diff --git a/main/static/assets/css/logggin.css b/main/static/assets/css/logggin.css
@@ -107,7 +107,7 @@ Stark Industries Logo
 ========================================= */
 #logo {
 	animation: logo-entry 4s ease-in;
-	width: 500px;
+	width: 100vw;
 	margin: 0 auto;
 	position: relative;
 	z-index: 40;
@@ -121,8 +121,22 @@ Stark Industries Logo
 	-webkit-align-items: center;
 	align-items: center;
 	margin-top:100px;
+	align-content: center;
+}
+
+#logo h1, #logo i{
+	width: 100vw;
+	text-align: center;
+	display: block;
 }
 
+#logo h1{
+	position: relative;
+	font-size: 29px !important;
+}
+
+
+
 h1 {
 	animation: text-glow 2s ease-out infinite alternate;
 	font-family: 'Ubuntu', sans-serif;
@@ -141,7 +155,7 @@ h1:before {
 	content: ' ';
 	height: 0;
 	position: absolute;
-	right: -74px;
+	right: calc(50vw - 267px);
 	top: -10px;
 	width: 0;
 }
@@ -152,7 +166,7 @@ h1:after {
 	content: ' ';
 	height: 0;
 	position: absolute;
-	right: -85px;
+	right: calc(50vw - 277px);
 	top: 24px;
 	transform: rotate(-47deg);
 	width: 0;
@@ -198,7 +212,7 @@ Log in form
 	display: block;
 	font-family: 'Cabin', helvetica, arial, sans-serif;
 	font-size: 13px;
-	font-size: 1.3rem;
+	/*font-size: 1.3rem;*/
 	height: 40px;
 	margin: 20px auto 10px;
 	padding: 0 10px;

diff --git a/main/static/assets/css/loggin.css b/main/static/assets/css/loggin.css
@@ -2,7 +2,11 @@
 .stark-login, #logo, .hexagons, #circle1{
 	margin-top: 100px;
 }
-
+.title{
+	position: absolute;
+    top: 0;
+    z-index: 100;
+}
 
 #wrapper{
 		position: absolute;
@@ -26,7 +30,7 @@
 		height: 100vh;
 		z-index: 10;
 		overflow: hidden;
-		background-size: cover;
+		/*background-size: cover;*/
 		background-position-x: center;
 		background-position-y: center;
 		/*
@@ -97,7 +101,7 @@ Stark Industries Logo
 ========================================= */
 #logo {
 	animation: logo-entry 4s ease-in;
-	width: 500px;
+	width: 100vw;
 	margin: 0 auto;
 	position: relative;
 	z-index: 40;
@@ -111,14 +115,28 @@ Stark Industries Logo
 	-webkit-align-items: center;
 	align-items: center;
 	margin-top:100px;
+	align-content: center;
+}
+
+#logo h1, #logo i{
+	width: 100vw;
+	text-align: center;
+	display: block;
+}
+
+#logo h1{
+	position: relative;
+	font-size: 29px !important;
 }
 
+
+
 h1 {
 	animation: text-glow 2s ease-out infinite alternate;
 	font-family: 'Ubuntu', sans-serif;
 	color: #00a4a2;
 	font-size: 48px;
-	font-size: 4.8rem;
+	font-size: 3rem !important; 
 	font-weight: bold;
 	position: absolute;
 	text-shadow: 0 0 10px #000, 0 0 20px #000, 0 0 30px #000, 0 0 40px #000, 0 0 50px #000, 0 0 60px #000, 0 0 70px #000;
@@ -131,7 +149,7 @@ h1:before {
 	content: ' ';
 	height: 0;
 	position: absolute;
-	right: -74px;
+	right: calc(50vw - 267px);
 	top: -10px;
 	width: 0;
 }
@@ -142,7 +160,7 @@ h1:after {
 	content: ' ';
 	height: 0;
 	position: absolute;
-	right: -85px;
+	right: calc(50vw - 277px);
 	top: 24px;
 	transform: rotate(-47deg);
 	width: 0;
@@ -165,7 +183,7 @@ Log in form
 	border-radius: 5px;
 	display: inline-block;
 	height: 340px;
-	margin: 50px auto 0;
+	/*margin: 50px auto 0;*/
 	position: relative;
 	z-index: 4;
 	width: 500px;
@@ -186,7 +204,7 @@ Log in form
 	display: block;
 	font-family: 'Cabin', helvetica, arial, sans-serif;
 	font-size: 13px;
-	font-size: 1.3rem;
+	/*font-size: 1.3rem;*/
 	height: 40px;
 	margin: 20px auto 10px;
 	padding: 0 10px;

diff --git a/main/static/assets/css/main.css b/main/static/assets/css/main.css
@@ -55,7 +55,7 @@
 	align-items: center;
 	font-size: 30px;
 	color: #fff;
-	background: #46464687;
+	background: #222222cf;
 	animation: num_anim .5s linear;
 }
 
@@ -359,6 +359,7 @@ li{
 	-webkit-align-items: center;
 	align-items: center;
 	text-shadow: 4px 4px 6px #3f00ff;
+	z-index: 999;
 }
 
 .lo{

diff --git a/main/static/assets/js/main.js b/main/static/assets/js/main.js
@@ -300,8 +300,16 @@ function explodeAnimate(ele){
 }
 
 function chooseEle(bomb_cells, ele){
+	// console.log(bomb_cells, ele)
 	if(bomb_cells.length == 0){
 		// setTimeout(randBomb, 300);
+		var a = ele.children;
+		var b = Array.from(a);
+		exploded(ele);
+		setTimeout(()=>{
+			b.forEach((e)=>e.remove())
+		}, 500);
+
 		return;
 	}
 	var index = Math.floor(bomb_cells.length * Math.random());
@@ -313,6 +321,7 @@ function chooseEle(bomb_cells, ele){
 }
 
 function exploded(ele){
+	console.log("exploded", ele)
 	ele.setAttribute("data","b");
 	ele.className += " exploded";
 
@@ -403,7 +412,7 @@ function hideQuestionDiv(){
 // }, 300)
 
 $('#submit_answer').click(function(e){
-	var ans = $("#answer").val();
+	var ans = $("#answer").val().trim();
 	var data = JSON.stringify({answer: ans});
 	submitAns(data, submitSuccess);
 })

diff --git a/main/templates/login.html b/main/templates/login.html
@@ -71,71 +71,7 @@ <h1><i> CHECKMATE 2018</i></h1>
 					</div>
 				</form>
 				<div class="msg"></div>
-				<div class="hexagons">
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<br>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<br>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span> 
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-
-					<br>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<br>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-					<span>&#x2B22;</span>
-				</div>      
+
 			</section> 
 
 			<div id="circle1">