Skip to content

O
OKU-GIS
Commit e7c2bd79 authored by Muhamad's avatar Muhamad
Browse files
Options

Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis

parents ceb27a33 2be5a845
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 64 deletions
static/css/layout-style.css
View file @ e7c2bd79
......@@ -808,6 +808,51 @@ li.active>a:after {
color: black!important;
}
.modal-login{
top: 80%;
background-color: white;
z-index:999;
border-radius:8px
}
#btn-signin{
border-radius: 5px;
background: linear-gradient(147.95deg, #4C97DC -38.4%, #4969DA 140.26%);
margin-right: 8px;
color: white;
}
.row-full-height {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
display: -webkit-flex;
display: flex;
}
.img-centered{
top: 50%;
position: absolute;
left: 50%;
transform: translate(-50%, -50%);
}
.vertical-centered{
top: 50%;
transform: translateY(-50%);
}
.img-features{
position: absolute;
background: url(/static/img/icon-1/bg4.svg);
width: 742px;
height: 130px;
top: 65%;
right: 0;
margin-right: 24px;
}
input#change_stat {
display: block!important;
}
......@@ -872,6 +917,31 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
#map>div.col-md-6.col-md-offset-3.input-group.content-group.foot>div>div.col-md-2>button {
right: 0px!important;
}
.modal-login{
background-color: white;
z-index:999;
border-radius:8px;
}
#btn-signin{
border-radius: 5px;
background: linear-gradient(147.95deg, #4C97DC -38.4%, #4969DA 140.26%);
color: white;
padding-right: 16px;
}
#searchbar{
margin-left: 16px;
margin-right: 16px;
}
.centered{
top: 50% !important;
transform: translateY(-50%) !important;
margin-left: auto !important;
margin-right: auto !important;
}
}
@media (max-width: 720px) {
......
templates/layout/layout.html
View file @ e7c2bd79
......@@ -185,20 +185,20 @@
{% if user.is_authenticated %} {% else %}
<div class="col-md-6 col-md-offset-3 input-group content-group foot" style="top: 80%;background-color: white;z-index:999;border-radius:8px">
<div class="row">
<div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered">
<div class="row row-full-height">
<div class="col-md-1">
<img src="/static/img/logo-ok.png" alt="" style="margin-top: 20%;margin-left: 46%;max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;">
<img src="/static/img/logo-ok.png" alt="" class="img-centered" style="max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;">
</div>
<div class="col-md-9">
<div style="margin-top: 2%;font-size: 15px;margin-left: 3%;">
<div style="font-size: 15px;margin: 8px;">
<span><b>Welcome to TEMANKU!</b>
Login untuk menikmati fitur lengkap TEMANKU
</span>
</div>
</div>
<div class="col-md-2">
<a href="{% url 'login' %}" class="btn btn-primary" style="margin-top: 3%;border-radius: 5px;background: linear-gradient(147.95deg, #4C97DC -38.4%, #4969DA 140.26%);margin-bottom: 3%;right: -15%;color: white;">SIGN IN</a>
<a href="{% url 'login' %}" class="btn btn-primary vertical-centered" id="btn-signin">SIGN IN</a>
</div>
</div>
</div>
......
templates/user/login.html
View file @ e7c2bd79
......@@ -18,6 +18,7 @@
<link href="{% static 'css/core.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'css/components.css' %}" rel="stylesheet" type="text/css">
<link href="{% static 'css/colors.css' %}" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="{% static 'css/layout-style.css' %}">
</head>
......@@ -28,21 +29,16 @@
height: 100%;
background-size: 100% 100%;">
<!-- <div> -->
<div style=" position: absolute;
background: url(/static/img/icon-1/bg4.svg);
width: 742px;
height: 130px;
top: 65%;
right: 10%;"></div>
<div style="position: absolute;background: url(/static/img/icon-1/bg3.svg);width: 65%;height: 75%;top: 0;left: 35%;background-size: 100% 100%;z-index: 9;"></div>
<div class="img-features"></div>
<div class="d-none d-md-block" style="position: absolute;background: url(/static/img/icon-1/bg3.svg);width: 65%;height: 75%;top: 0;left: 35%;background-size: 100% 100%;z-index: 9;"></div>
<!-- </div> -->
<div>
<div class="row" style="height: 100vh;width: 100%;background-color: rgba(9, 9, 9, 0.3);margin:0px;">
<div class="col-md-4" style="background:#1E2233;color:white">
<div style="margin-left: 10%;">
<div class="col-md-4 col-sm-12" style="background:#1E2233;color:white">
<div style="margin-left: 10%; margin-right: 10%;">
<div class="text-center " style="margin-top: 40%;">
<div>
<div class="row" style=" width: 200px;
margin-left: 23%;">
<div class="row">
<div class="col-md-3">
<img src="{% static 'img/icon-1/MapTrifold.svg' %}" alt="">
</div>
......@@ -60,7 +56,7 @@
<span>Login</span><span>&nbsp;Temanku!</span>
</div>
</div>
<form method="POST" style="width: 355px;">
<form method="POST">
{% csrf_token %}
<div class="form-group has-feedback has-feedback-left">
......@@ -95,11 +91,12 @@
</div>
<div class="col-md-8">
<div class="col-md-8 d-none d-md-block">
</div>
</div>
</div>
</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment