Download as
Browse Code »

Commit 978f8a3f42d8fbdc4d9fb665e7b9817505e24b53

Authored by Zambom
1 parent 0417a741
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adjusting outside pages responsive

Showing 2 changed files with 45 additions and 35 deletions   Show diff stats
users/templates/users/forgot_password.html
  Diff comments   View file @978f8a3
... ... @@ -14,14 +14,13 @@
14 14  
15 15 {% block content %}
16 16 <div class="row">
17   - <div class="col-sm-7 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-8 col-xs-offset-3 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-4 ">
18   - <div class="col-sm-9 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-9 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
19   - <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
20   - </div>
21   - </div>
  17 + <div class="col-lg-offset-1 col-md-offset-1">
  18 + <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">
  19 + </div>
22 20 </div>
  21 +
23 22 <div class="row">
24   - <div class="col-lg-8 col-lg-offset-3 col-md-8 col-md-offset-3 col-sm-9 col-sm-offset-3 col-xs-10 col-xs-offset-2">
  23 + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-9 col-md-9 col-sm-10">
25 24 {% if messages %}
26 25 {% for message in messages %}
27 26 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
... ... @@ -32,11 +31,12 @@
32 31 </div>
33 32 {% endfor %}
34 33 {% endif %}
  34 +
35 35 <div class="card">
36 36 <div class="card-block">
37 37 <div class="row">
38   - <div class="col-md-12 text-center">
39   - <h2 style="color:#43a251"><strong> {% trans 'Forgot Password' %} </strong></h2>
  38 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">
  39 + <h2 class="outside-title"><strong> {% trans 'Forgot Password' %} </strong></h2>
40 40 <p>{% trans 'Enter your email below (the one used to access the platform) to recover your password' %}</p>
41 41 </div>
42 42 </div>
... ... @@ -44,16 +44,19 @@
44 44 <form id="form-reset" method="post" action="">
45 45 {% csrf_token %}
46 46 {% for field in form %}
47   - <div class="col-md-10 col-md-offset-1">
  47 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
48 48 <div class="form-group{% if form.has_error %} has-error {% endif %}">
49 49 {% if field.field.required %}
50 50 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }} <span>*</span></label>
51 51 {% else %}
52 52 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
53 53 {% endif %}
54   - {% render_field field class='form-control' %}
55   - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
56   - {% if field.errors %}
  54 +
  55 + {% render_field field class='form-control' %}
  56 +
  57 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
  58 +
  59 + {% if field.errors %}
57 60 <div class="alert alert-danger alert-dismissible" role="alert">
58 61 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
59 62 <span aria-hidden="true">&times;</span>
... ... @@ -70,12 +73,14 @@
70 73 {% endfor %}
71 74 </form>
72 75 <div class="row">
73   - <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 col-md-offset-1 text-center">
74   - <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Recover' %} </button>
75   - </div>
76   - <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
77   - <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>
78   - </div>
  76 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  77 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  78 + <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Recover' %} </button>
  79 + </div>
  80 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  81 + <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>
  82 + </div>
  83 + </div>
79 84 </div>
80 85 </div>
81 86 </div>
... ...
users/templates/users/new_password.html
  Diff comments   View file @978f8a3
... ... @@ -14,14 +14,13 @@
14 14  
15 15 {% block content %}
16 16 <div class="row">
17   - <div class="col-sm-7 col-sm-offset-4 col-md-6 col-md-offset-4 col-xs-8 col-xs-offset-3 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-4 ">
18   - <div class="col-sm-9 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-9 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
19   - <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
20   - </div>
21   - </div>
  17 + <div class="col-lg-offset-1 col-md-offset-1">
  18 + <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus">
  19 + </div>
22 20 </div>
  21 +
23 22 <div class="row">
24   - <div class="col-lg-8 col-lg-offset-3 col-md-8 col-md-offset-3 col-sm-9 col-sm-offset-3 col-xs-10 col-xs-offset-2">
  23 + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-9 col-md-9 col-sm-10">
25 24 {% if messages %}
26 25 {% for message in messages %}
27 26 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
... ... @@ -32,27 +31,31 @@
32 31 </div>
33 32 {% endfor %}
34 33 {% endif %}
  34 +
35 35 <div class="card">
36 36 <div class="card-block">
37 37 <div class="row">
38   - <div class="col-md-12 text-center">
39   - <h2 style="color:#43a251"><strong> {% trans 'Set new password' %} </strong></h2>
  38 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">
  39 + <h2 class="outside-title"><strong> {% trans 'Set new password' %} </strong></h2>
40 40 </div>
41 41 </div>
42 42  
43 43 <form id="form-reset" method="post" action="">
44 44 {% csrf_token %}
45 45 {% for field in form %}
46   - <div class="col-md-10 col-md-offset-1">
  46 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
47 47 <div class="form-group{% if form.has_error %} has-error {% endif %}">
48 48 {% if field.field.required %}
49 49 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }} <span>*</span></label>
50 50 {% else %}
51 51 <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
52 52 {% endif %}
  53 +
53 54 {% render_field field class='form-control' %}
54   - <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
55   - {% if field.errors %}
  55 +
  56 + <span id="helpBlock" class="help-block">{{ field.help_text }}</span>
  57 +
  58 + {% if field.errors %}
56 59 <div class="alert alert-danger alert-dismissible" role="alert">
57 60 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
58 61 <span aria-hidden="true">&times;</span>
... ... @@ -69,12 +72,14 @@
69 72 {% endfor %}
70 73 </form>
71 74 <div class="row">
72   - <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 col-md-offset-1 text-center">
73   - <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Reset' %} </button>
74   - </div>
75   - <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
76   - <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>
77   - </div>
  75 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  76 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  77 + <button type="submit" class="btn btn-success btn-raised btn-block" form="form-reset" style="position: initial;"> {% trans 'Reset' %} </button>
  78 + </div>
  79 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  80 + <a class="btn btn-default btn-raised btn-block" href="{% url 'users:login' %}" formaction="#" style="position: initial;">{% trans 'Back' %}</a>
  81 + </div>
  82 + </div>
78 83 </div>
79 84 </div>
80 85 </div>
... ...