moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #422 from tiwariav/bugfix/3621/mobile_signup

Browse source 
bugfix #3621 signup page layout fix mobile, confirm-reset-page layout fix
This commit is contained in:
Pcoder 2017-08-04 19:59:00 +02:00 committed by GitHub
commit c1ad5e0b30
7 changed files with 96 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
hosting/static/hosting/css/commons.css
View file

@ -7,10 +7,10 @@
} }
.content-dashboard{ .content-dashboard{
min-height: 100vh; min-height: calc(100vh - 120px);
width: 80%; width: 80%;
margin: 0 auto; margin: 0 auto;
max-width: 1120px; max-width: 1120px;
} }
.container-table{ .container-table{
margin-top: 35px; margin-top: 35px;

27
hosting/static/hosting/css/landing-page.css
View file

@ -45,6 +45,11 @@ h6 {
padding: 20px; padding: 20px;
} }
.navbar-transparent.topnav {
z-index: 1005;
margin-bottom: 0;
}
.navbar-transparent .navbar-nav>li>a { .navbar-transparent .navbar-nav>li>a {
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
@ -61,6 +66,7 @@ h6 {
.navbar-transparent #logoWhite{ .navbar-transparent #logoWhite{
display: block; display: block;
width: 220px; width: 220px;
/* color: #fff; */
} }
.lead { .lead {
@ -220,8 +226,12 @@ h6 {
/*------Auth section---------*/ /*------Auth section---------*/
.auth-container { .auth-container {
height: 100vh; min-height: calc(100vh - 120px);
position: relative; position: relative;
/* flex-grow: 1; */
display: flex;
flex-direction: column;
justify-content: center;
} }
.auth-bg { .auth-bg {
@ -260,11 +270,11 @@ h6 {
} }
.auth-container .auth-center { .auth-container .auth-center {
position: absolute; /* position: absolute; */
left: 50%; /* left: 50%; */
top: 50%; /* top: 50%; */
transform: translate(-50%, -50%); /* transform: translate(-50%, -50%); */
width: 100%; /* width: 100%; */
} }
.auth-container .auth-title { .auth-container .auth-title {
@ -416,6 +426,11 @@ h6 {
} }
} }
.auth-box .msg-list {
padding: 15px 25px 5px;
text-align: center;
}
@media (max-width: 540px) { @media (max-width: 540px) {
.auth-container .auth-title h2 { .auth-container .auth-title h2 {
font-size: 32px; font-size: 32px;

10
hosting/templates/hosting/confirm_reset_password.html
View file

@ -2,6 +2,10 @@
{% load staticfiles bootstrap3%} {% load staticfiles bootstrap3%}
{% load i18n %} {% load i18n %}
{% block navbar %}
{% include 'hosting/includes/_navbar_transparent.html' %}
{% endblock navbar %}
{% block content %} {% block content %}
<div class="auth-container"> <div class="auth-container">
<div class="auth-bg"></div> <div class="auth-bg"></div>
@ -13,7 +17,7 @@
<div class="intro-message auth-box sign-up"> <div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Set your new password"%}</h2> <h2 class="section-heading">{% trans "Set your new password"%}</h2>
{% if messages %} {% if messages %}
<ul class="list-unstyled"> <ul class="list-unstyled msg-list">
{% for message in messages %} {% for message in messages %}
<li>{{ message }}</li> <li>{{ message }}</li>
{% endfor %} {% endfor %}
@ -25,7 +29,7 @@
{% bootstrap_field field show_label=False %} {% bootstrap_field field show_label=False %}
{% endfor %} {% endfor %}
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-default"> <button type="submit" class="btn btn-block btn-success">
{% trans "Reset"%} {% trans "Reset"%}
</button> </button>
{% endbuttons %} {% endbuttons %}
@ -40,7 +44,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
hosting/templates/hosting/includes/_navbar_transparent.html
View file

@ -1,6 +1,6 @@
{% load static i18n %} {% load static i18n %}
<nav class="navbar navbar-default navbar-fixed-top topnav navbar-transparent" role="navigation"> <nav class="navbar navbar-default topnav navbar-transparent" role="navigation">
<div class="container topnav"> <div class="container topnav">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">

71
hosting/templates/hosting/login.html
View file

@ -7,46 +7,47 @@
{% endblock navbar %} {% endblock navbar %}
{% block content %} {% block content %}
<div class="auth-container"> <div class="auth-container">
<div class="auth-bg"></div> <div class="auth-bg"></div>
<div class="auth-center">
<div class="auth-center"> <div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2>
<div class="auth-title"> </div>
<h2>{% trans "Your VM hosted in Switzerland"%}</h2> <div class="auth-content">
</div> <div class="intro-message auth-box">
<div class="auth-content"> <h2 class="section-heading">{% trans "Login"%}</h2>
{% if messages %}
<div class="intro-message auth-box"> <ul class="list-unstyled msg-list">
<h2 class="section-heading">{% trans "Login"%}</h2> {% for message in messages %}
<form action="{% url 'hosting:login' %}" method="post" class="form" novalidated> <li>{{ message }}</li>
{% csrf_token %} {% endfor %}
{% for field in form %} </ul>
{% bootstrap_field field show_label=False type='fields'%} {% endif %}
{% endfor %} <form action="{% url 'hosting:login' %}" method="post" class="form" novalidated>
<p class="red">{{form.non_field_errors|striptags}}</p> {% csrf_token %}
{% buttons %} {% for field in form %}
<button type="submit" class="btn btn-block btn-success"> {% bootstrap_field field show_label=False type='fields'%}
{% trans "Login"%} {% endfor %}
</button> <p class="red">{{form.non_field_errors|striptags}}</p>
{% endbuttons %} {% buttons %}
<button type="submit" class="btn btn-block btn-success">
<input type='hidden' name='next' value='{{request.GET.next}}'/> {% trans "Login"%}
</form> </button>
<div class="auth-footer"> {% endbuttons %}
<div class="text"> <input type='hidden' name='next' value='{{request.GET.next}}'/>
<span>{% trans "Don't have an account yet ? "%}</span> </form>
</div> <div class="auth-footer">
<div class="links"> <div class="text">
<a class="unlink" href="{% url 'hosting:signup' %}">{% trans "Sign up"%}</a> <span>{% trans "Don't have an account yet ? "%}</span>
<span class="text"> or </span> </div>
<a class="unlink" href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ? "%}</a> <div class="links">
</div> <a class="unlink" href="{% url 'hosting:signup' %}">{% trans "Sign up"%}</a>
<span class="text"> or </span>
<a class="unlink" href="{% url 'hosting:reset_password' %}">{% trans "Forgot your password ? "%}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
{% endblock %} {% endblock %}

1
hosting/templates/hosting/reset_password.html
View file

@ -15,7 +15,6 @@
<h2>{% trans "Your VM hosted in Switzerland"%}</h2> <h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div> </div>
<div class="auth-content"> <div class="auth-content">
<div class="intro-message auth-box sign-up"> <div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Reset your password"%}</h2> <h2 class="section-heading">{% trans "Reset your password"%}</h2>
<form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate> <form action="{% url 'hosting:reset_password' %}" method="post" class="form" novalidate>

55
hosting/templates/hosting/signup.html
View file

@ -8,35 +8,34 @@
{% block content %} {% block content %}
<div class="auth-container auth-signup"> <div class="auth-container auth-signup">
<div class="auth-bg"></div> <div class="auth-bg"></div>
<div class="auth-center "> <div class="auth-center ">
<div class="auth-title"> <div class="auth-title">
<h2>{% trans "Your VM hosted in Switzerland"%}</h2> <h2>{% trans "Your VM hosted in Switzerland"%}</h2>
</div> </div>
<div class="auth-content"> <div class="auth-content">
<div class="intro-message auth-box sign-up"> <div class="intro-message auth-box sign-up">
<h2 class="section-heading">{% trans "Sign up"%}</h2> <h2 class="section-heading">{% trans "Sign up"%}</h2>
<form action="{% url 'hosting:signup' %}" method="post" class="form" novalidate> <form action="{% url 'hosting:signup' %}" method="post" class="form" novalidate>
{% csrf_token %} {% csrf_token %}
{% for field in form %} {% for field in form %}
{% bootstrap_field field show_label=False %} {% bootstrap_field field show_label=False %}
{% endfor %} {% endfor %}
{% buttons %} {% buttons %}
<button type="submit" class="btn btn-block btn-info"> <button type="submit" class="btn btn-block btn-info">
{% trans "Sign up"%} {% trans "Sign up"%}
</button> </button>
{% endbuttons %} {% endbuttons %}
</form> </form>
<div class="auth-footer"> <div class="auth-footer">
<div class="text"> <div class="text">
<span>{% trans "Already have an account ?"%}</span> <span>{% trans "Already have an account ?"%}</span>
</div> </div>
<div class="links"> <div class="links">
<a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a> <a class="unlink" href="{% url 'hosting:login' %}">{% trans "Login"%}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}