Skip to content

Commit

Permalink
Unfucked the Login Page
Browse files Browse the repository at this point in the history
  • Loading branch information
@bblam
bblam committed Feb 11, 2017
1 parent 600b691 commit e90232c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 101 deletions.
100 changes: 4 additions & 96 deletions Login.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Makar | Log In</title>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="dist/css/bootstrap.min.css">

<style>
body{
Expand All @@ -13,28 +13,16 @@
z-index: 0;
}
.bg{
<<<<<<< HEAD
background-size: 100%;
=======
>>>>>>> 5da3734ff5fd8d9d6191979db838525c27a011bb
background-image: url("img/11.png");
filter: blur(5px);
-webkit-filter: blur(5px);
position: absolute;
z-index: 2;
<<<<<<< HEAD
width: 543px;
height: 600px;
}
#login-box{
margin-top: 50px;
=======
width: 511px;
height: 600px;
}
#login-box{
margin-top: 100px;
>>>>>>> 5da3734ff5fd8d9d6191979db838525c27a011bb
border-radius: 3px;
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.25);
}
Expand Down Expand Up @@ -123,86 +111,7 @@
<div class='container-fluid'>
<div class="row">
<div id="login-box">
<<<<<<< HEAD
<div class="col-lg-5 col-lg-offset-1">
<div class="bg"></div>
<div id="desc">
<div>
<img src="img/logo2.png" id="logo">
</div>
<div>
<h4 class="words" id="words">A million dollars isn’t cool.</h4>
<h4 class="words" id="words2">You know what’s cool? A basilisk, the Arctic, silence, today's air quality, the policeman in the intersection, a bolo tie, Werner Herzog, that blinking red light in the night sky, and also writing. Welcome to Makar.</h4>
</div>
</div>
</div>
<div class="col-lg-5" id="login">
<ul class="breadcrumb">
<li role="presentation"><a class="log h4" href="#">Login</a></li>
<li role="presentation"><a class="sign h4" href="#">Sign up</a></li>
</ul>
<div class="row">
<div class="col-lg-12 center-dc l">
<div>
<div class="input-group space1">
<input type="text" class="form-control" placeholder="Email" aria-describedby="basic-addon2">
<span class="input-group-addon" id="basic-addon2"><span class="glyphicon glyphicon-user"></span></span>
</div>

<div class="input-group space2">
<input type="text" class="form-control" placeholder="Password" aria-describedby="basic-addon2">
<span class="input-group-addon" id="basic-addon2"><span class="glyphicon glyphicon-link"></span></span>
</div>

<div id="loginb">
<button type="button" class="btn btn-primary">Login</button>
</div>
</div>
</div>

<div class="col-lg-12 center-dc s">
<div>
<div class="input-group space1">
<input type="text" class="form-control" placeholder="Username" aria-describedby="basic-addon2">
<span class="input-group-addon" id="basic-addon2"><span class="glyphicon glyphicon-asterisk"></span></span>
</div>

<div class="input-group space2">
<input type="text" class="form-control" placeholder="Email" aria-describedby="basic-addon2">
<span class="input-group-addon" id="basic-addon2"><span class="glyphicon glyphicon-user"></span></span>
</div>

<div class="input-group space2">
<input type="text" class="form-control" placeholder="Password" aria-describedby="basic-addon2">
<span class="input-group-addon" id="basic-addon2"><span class="glyphicon glyphicon-link"></span></span>
</div>

<div class="input-group space2">
<input type="text" class="form-control" placeholder="Do that one more time" aria-describedby="basic-addon2">
<span class="input-group-addon" id="basic-addon2"><span class="glyphicon glyphicon-link"></span></span>
</div>

<div id="signb">
<button type="button" class="btn btn-primary">Sign up</button>
</div>
</div>
</div>

</div>
<footer class="center-dc">
<div class="col-lg-3">
<button type="button" class="btn btn-link h4">ABOUT US</button>
</div>

<div class="col-lg-3">
<button type="button" class="btn btn-link h4">TERMS</button>
</div>

<div class="col-lg-3">
<button type="button" class="btn btn-link h4">PRIVACY</button>
</div>
=======
<div class="col-lg-4 col-lg-offset-2">
<div class="bg"></div>
<div id="desc">
<div>
Expand All @@ -214,7 +123,7 @@ <h4 class="words" id="words2">You know what’s cool? A basilisk, the Arctic, si
</div>
</div>
</div>
<div class="col-lg-4" id="login">
<div class="col-lg-5" id="login">
<ul class="breadcrumb">
<li role="presentation"><a class="log h4" href="#">Login</a></li>
<li role="presentation"><a class="sign h4" href="#">Sign up</a></li>
Expand Down Expand Up @@ -279,7 +188,6 @@ <h4 class="words" id="words2">You know what’s cool? A basilisk, the Arctic, si
<div class="col-lg-3">
<button type="button" class="btn btn-link h4">PRIVACY</button>
</div>
>>>>>>> 5da3734ff5fd8d9d6191979db838525c27a011bb
</footer>
</div>
</div>
Expand All @@ -288,7 +196,7 @@ <h4 class="words" id="words2">You know what’s cool? A basilisk, the Arctic, si
</body>
</html>

<script src="js/jquery.min.js"></script>
<script src="jq/jquery.min.js"></script>

<script>
$(document).ready(function(){
Expand All @@ -308,4 +216,4 @@ <h4 class="words" id="words2">You know what’s cool? A basilisk, the Arctic, si


});
</script>
</script>
6 changes: 1 addition & 5 deletions Makar.html
View file
@@ -1,11 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<<<<<<< HEAD
<link rel="stylesheet" type="text/css" href="dist/css/bootstrap.min.css">
=======
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css">
>>>>>>> 5da3734ff5fd8d9d6191979db838525c27a011bb
<title>Makar</title>
<style>
body{
Expand Down Expand Up @@ -168,7 +164,7 @@ <h5><span class="badge">1</span> Contributors</h5>
</body>
</html>

<script src="js/jquery.min.js"></script>
<script src="jq/jquery.min.js"></script>
<script>
$(".list-group").hide();
$(document).ready(function(){
Expand Down

0 comments on commit e90232c

Please sign in to comment.