mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge branch 'inventree:master' into matmair/issue2181
This commit is contained in:
commit
037f2a9438
@ -15,25 +15,23 @@
|
||||
}
|
||||
|
||||
.login-screen {
|
||||
background-image: url("/static/img/paper_splash.jpg");
|
||||
background: url(/static/img/paper_splash.jpg) no-repeat center fixed;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
height: 100%;
|
||||
height: 100vh;
|
||||
font-family: 'Numans', sans-serif;
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
.login-container {
|
||||
left: 50%;
|
||||
position: fixed;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
width: 30%;
|
||||
align-content: center;
|
||||
align-self: center;
|
||||
border-radius: 15px;
|
||||
padding: 20px;
|
||||
padding-bottom: 35px;
|
||||
background-color: rgba(50, 50, 50, 0.75);
|
||||
|
||||
width: 100%;
|
||||
max-width: 330px;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
.login-header {
|
||||
|
@ -13,7 +13,7 @@
|
||||
<!-- CSS -->
|
||||
<link rel="stylesheet" href="{% static 'fontawesome/css/brands.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'fontawesome/css/solid.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'css/bootstrap_3.3.7_css_bootstrap.min.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'bootstrap/css/bootstrap.min.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'select2/css/select2.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'select2/css/select2-bootstrap-5-theme.css' %}">
|
||||
<link rel="stylesheet" href="{% static 'css/inventree.css' %}">
|
||||
@ -34,7 +34,7 @@
|
||||
Background Image Attribution: https://unsplash.com/photos/Ixvv3YZkd7w
|
||||
-->
|
||||
|
||||
<div class='main body-wrapper login-screen'>
|
||||
<div class='main body-wrapper login-screen d-flex'>
|
||||
|
||||
<div class='login-container'>
|
||||
<div class="row">
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
<div class='panel'>
|
||||
<div class='panel-heading'>
|
||||
<div class='d-flex flex-row'>
|
||||
<div class='d-flex flex-wrap'>
|
||||
<h4>
|
||||
{% block heading %}
|
||||
<i>-- page header goes here --</i>
|
||||
|
Loading…
Reference in New Issue
Block a user