Download as
Browse Code »

Commit 492b3748c05e6fa157ec1b0bed1d85f6069d235f

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

Fixing login responsive

Showing 2 changed files with 61 additions and 59 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @492b374
... ... @@ -731,9 +731,9 @@ ul, li {
731 731 /* core/index.html classes*/
732 732  
733 733 .logo-login{
734   - margin-top: 15px;
735   - margin-bottom: 15px;
736   - width:50%;
  734 + margin-top: 15px;
  735 + margin-bottom: 15px;
  736 + width: 20%;
737 737 }
738 738 .forgotPassword{
739 739 padding-bottom: 10px;
... ...
users/templates/users/login.html
  Diff comments   View file @492b374
... ... @@ -13,66 +13,68 @@
13 13 {% endblock sidebar %}
14 14  
15 15 {% block content %}
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>
22   -</div>
23   -
24   -<div class="row">
25   - <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">
26   - {% if messages %}
27   - {% for message in messages %}
28   - <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
29   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
30   - <span aria-hidden="true">&times;</span>
31   - </button>
32   - <p>{{ message }}</p>
33   - </div>
34   - {% endfor %}
35   - {% endif %}
36   - <div class="card">
37   - <div class="card-block">
38   - <div class="row">
39   - <div class="col-md-12 text-center">
40   - <h2 style="color:#43a251"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2>
41   - </div>
  16 + <div class="row">
  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 " alt="logo amadeus">
42 19 </div>
43   - <form id="form-login" method="post" action="">
44   - {% csrf_token %}
45   - <div class="col-md-10 col-md-offset-1">
46   - <div class="form-group">
47   - <label for="inputEmail" class="control-label"> {% trans 'Email' %}</label>
48   - <input form="form-login" for="inputSmall" type="text" name="email" class="form-control" placeholder="{% trans 'Email' %}" id="inputEmail" value="{% if username %}{{username}}{% endif %}">
49   - </div>
50   - </div>
51   - <div class="col-md-10 col-md-offset-1">
52   - <div class="form-group">
53   - <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>
54   - <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="{% trans 'Password' %}">
  20 + </div>
  21 +
  22 + <div class="row">
  23 + <div class="col-lg-offset-2 col-md-offset-2 col-sm-offset-1 col-lg-9 col-md-9 col-sm-10">
  24 + {% if messages %}
  25 + {% for message in messages %}
  26 + <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
  27 + <button type="button" class="close" data-dismiss="alert" aria-label="Close">
  28 + <span aria-hidden="true">&times;</span>
  29 + </button>
  30 + <p>{{ message }}</p>
  31 + </div>
  32 + {% endfor %}
  33 + {% endif %}
  34 +
  35 + <div class="card">
  36 + <div class="card-block">
  37 + <div class="row">
  38 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center">
  39 + <h2 style="color:#43a251"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2>
  40 + </div>
  41 + </div>
  42 + <form id="form-login" method="post" action="">
  43 + {% csrf_token %}
  44 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  45 + <div class="form-group">
  46 + <label for="inputEmail" class="control-label"> {% trans 'Email' %}</label>
  47 + <input form="form-login" for="inputSmall" type="text" name="email" class="form-control" placeholder="{% trans 'Email' %}" id="inputEmail" value="{% if username %}{{username}}{% endif %}">
  48 + </div>
  49 + </div>
  50 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  51 + <div class="form-group">
  52 + <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>
  53 + <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="{% trans 'Password' %}">
  54 + </div>
  55 + </div>
  56 + </form>
  57 + <div class="row">
  58 + <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
  59 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  60 + <button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;"> {% trans 'Log in' %} </button>
  61 + </div>
  62 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
  63 + <a class="btn btn-default btn-raised btn-block" href="{% url 'users:signup' %}" formaction="#" style="position: initial;">{% trans 'Sign Up' %}</a>
  64 + </div>
  65 + </div>
  66 + </div>
  67 + <div class="row">
  68 + <div class="col-sm-offset-1 col-md-10 col-lg-10 col-sm-10 col-xs-12">
  69 + <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-right forgotPassword">
  70 + <a href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a>
  71 + </div>
  72 + </div>
  73 + </div>
  74 + </div>
55 75 </div>
56   - </div>
57   - </form>
58   - <div class="row">
59   - <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 col-md-offset-1 text-center">
60   - <button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;"> {% trans 'Log in' %} </button>
61   - </div>
62   - <div class="col-md-5 col-xs-6 col-sm-6 col-lg-5 text-center">
63   - <a class="btn btn-default btn-raised btn-block" href="{% url 'users:signup' %}" formaction="#" style="position: initial;">{% trans 'Sign Up' %}</a>
64   - </div>
65   - </div>
66   - <div class="row">
67   - <div class="col-md-offset-1 col-md-10 text-right forgotPassword">
68   - <a href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a>
69   - </div>
70 76 </div>
71   - </div>
72 77 </div>
73   - </div>
74   -</div>
75   -
76 78 {% endblock%}
77 79  
78 80 {% block bottommenu %}
... ...