Download as
Browse Code »

Commit 0417a741e6e3c6782812a25ae56dad75cf92da0a

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

Adjusting register page responsive

Showing 3 changed files with 44 additions and 35 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @0417a74
... ... @@ -729,17 +729,30 @@ ul, li {
729 729  
730 730  
731 731 /* core/index.html classes*/
  732 +.outside-title {
  733 + color: #43a251;
  734 +}
732 735  
733 736 .logo-login{
734 737 margin-top: 15px;
735 738 margin-bottom: 15px;
736 739 width: 20%;
737 740 }
  741 +
  742 +.logo-register {
  743 + width: 10%;
  744 +}
  745 +
738 746 .forgotPassword{
739   - padding-bottom: 10px;
  747 + padding-bottom: 10px;
740 748 }
741 749 .form-group{
742   - margin-top: 5px;
  750 + margin-top: 5px;
  751 +}
  752 +
  753 +.form-group.form-group-sm label.control-label {
  754 + font-size: 10px;
  755 + margin: 0px;
743 756 }
744 757  
745 758 /* core/register_user.html classes*/
... ...
users/templates/users/login.html
  Diff comments   View file @0417a74
... ... @@ -36,7 +36,7 @@
36 36 <div class="card-block">
37 37 <div class="row">
38 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>
  39 + <h2 class="outside-title"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2>
40 40 </div>
41 41 </div>
42 42 <form id="form-login" method="post" action="">
... ...
users/templates/users/register.html
  Diff comments   View file @0417a74
... ... @@ -13,49 +13,45 @@
13 13 {% endblock sidebar %}
14 14  
15 15 {% block content %}
16   - {% if messages %}
17   - {% for message in messages %}
18   - <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
19   - <button type="button" class="close" data-dismiss="alert" aria-label="Close">
20   - <span aria-hidden="true">&times;</span>
21   - </button>
22   - <p>{{ message }}</p>
23   - </div>
24   - {% endfor %}
25   - {% endif %}
26   -
27 16 <div class="row">
28   - <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 ">
29   - <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">
30   - <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
31   - </div>
32   - </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>
33 20 </div>
34 21  
35 22 <div class="row">
36   - <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">
  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 +
37 35 <div class="card">
38 36 <div class="card-body">
39 37 <div class="row">
40   - <div class="col-md-12 text-center">
41   -
42   - <h2 style="color:#43a251"><strong>{% trans "User Register" %}</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 "User Register" %}</strong></h2>
43 40 </div>
44 41 </div>
45 42  
46   - <form class="{% if form.has_error %} has-error {% endif %} is-fileinput" method="post" enctype="multipart/form-data">
  43 + <form class="{% if form.has_error %} has-error {% endif %} form-horizontal is-fileinput" method="post" enctype="multipart/form-data">
47 44 {% csrf_token %}
48 45 {% for field in form %}
49   - <div class="col-md-10 col-md-offset-1 col-sm-12 col-xs-12 col-lg-10 col-lg-offset-1">
50   - <div class="row form-group">
51   - <div class="col-md-3 col-sm-3 col-xs-5 col-lg-3 text-right">
52   - {% if field.field.required %}
53   - <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}<span>*</span></label>
54   - {% else %}
55   - <label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
56   - {% endif %}
57   - </div>
58   - <div class="col-md-9 col-sm-9 col-xs-7 col-lg-9">
  46 + <div class="col-lg-12 col-md-12 col-sm-12">
  47 + <div class="form-group form-group-sm">
  48 + {% if field.field.required %}
  49 + <label for="{{ field.auto_id }}" class="col-md-2 col-sm-2 col-xs-3 col-lg-2 control-label">{{ field.label }}<span>*</span></label>
  50 + {% else %}
  51 + <label for="{{ field.auto_id }}" class="col-md-2 col-sm-2 col-xs-3 col-lg-2 control-label">{{ field.label }}</label>
  52 + {% endif %}
  53 +
  54 + <div class="col-md-10 col-sm-10 col-xs-9 col-lg-10">
59 55 {% if field.auto_id == 'id_image' %}
60 56 {% render_field field class='form-control' %}
61 57 <div class="input-group">
... ... @@ -89,7 +85,7 @@
89 85 </div>
90 86 {% endfor %}
91 87 <div class="row">
92   - <div class="col-md-10 col-md-offset-1 col-sm-12 col-xs-12 col-lg-10 col-lg-offset-1">
  88 + <div class="col-lg-12 col-md-12 col-sm-12">
93 89 <div class="pull-left">
94 90 <input type="submit" value="{% trans 'Register' %}" class="btn btn-raised btn-primary" />
95 91 </div>
... ...