Download as
Browse Code »

Commit 3f0712dfa915f23f929bc9fb5bd9b6649f31a374

Authored by Julio Toscano
Committed by GitHub
2 parents d1d566d3 fbe27cdc
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Merge pull request #217 from amadeusproject/edit_front 

modifying login #205
Showing 2 changed files with 43 additions and 35 deletions   Show diff stats
core/static/css/base/amadeus.css
  Diff comments   View file @3f0712d
... ... @@ -344,4 +344,12 @@ ul, li {
344 344  
345 345 .logo-login{
346 346 margin-top: 15px;
347   - margin-bottom: 15px;
348 347 \ No newline at end of file
  348 + margin-bottom: 15px;
  349 + width:50%;
  350 +}
  351 +.forgotPassword{
  352 + padding-bottom: 10px;
  353 +}
  354 +.form-group{
  355 + margin-top: 5px;
  356 +}
349 357 \ No newline at end of file
... ...
core/templates/index.html
  Diff comments   View file @3f0712d
... ... @@ -11,18 +11,18 @@
11 11  
12 12 {% block content %}
13 13 <div class="row">
14   - <div class="col-sm-4 col-sm-offset-3 col-md-4 col-md-offset-3
15   - col-xs-4 col-xs-offset-3 col-lg-4 col-lg-offset-3 col-xl-4 col-xl-offset-3 ">
  14 + <div class="col-sm-6 col-sm-offset-4 col-md-6 col-md-offset-4
  15 + col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-4 ">
16 16 <div class="col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2 col-xs-8 col-xs-offset-2 col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2">
17   -
  17 +
18 18 <img src="{% static 'img/amadeus.png' %}" class="img-responsive center-block logo-login " alt="logo amadeus">
19   -
  19 +
20 20 </div>
21 21 </div>
22 22 </div>
23 23  
24 24 <div class="row">
25   - <div class="col-md-6 col-sm-6 col-sm-offset-2 col-xs-6 col-xs-offset-2 col-lg-6 col-lg-offset-2 col-xl-6 col-xl-offset-2">
  25 + <div class="col-md-6 col-md-offset-4 col-sm-6 col-sm-offset-4 col-xs-6 col-xs-offset-4 col-lg-6 col-lg-offset-4 col-xl-6 col-xl-offset-4">
26 26 {% if messages %}
27 27 {% for message in messages %}
28 28 <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
... ... @@ -37,35 +37,35 @@
37 37 <div class="card-block">
38 38 <form id="form-login" class="form-group" method="post" action="">
39 39 {% csrf_token %}
40   - <div class="form-group is-empty">
41   - <label for="inputEmail" class="col-md-4 col-xs-4 col-sm-4 col-lg-4 control-label"> {% trans 'Username' %}</label>
42   - <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">
43   - <input form="form-login" type="text" name="username" class="form-control" id="inputEmail" placeholder="Username" value="{% if username %}{{username}}{% endif %}">
44   - </div>
45   - </div>
46   - <div class="form-group is-empty">
47   - <label for="inputPassword" class="col-md-4 col-xs-4 col-lg-4 col-sm-4 control-label"> {% trans 'Password' %}</label>
48   - <div class="col-md-8 col-xs-8 col-lg-8 col-sm-8">
49   - <input form="form-login" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
50   - </div>
51   - </div>
52   - <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10">
53   - <div class="checkbox">
54   - <label>
55   - <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
56   - </label>
57   - </div>
58   - </div>
59   - </form>
60   - <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10">
61   - <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>
62   - </div>
63   - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
64   - <a class="btn btn-flat" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
65   - </div>
66   - <div class="col-md-6 col-xs-6 col-sm-6 col-lg-6 text-center">
67   - <button type="submite" class="btn btn-flat btn-success" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
68   - </div>
  40 + <div class="col-md-8 col-xs-8 col-lg-10 col-lg-offset-1 col-sm-10">
  41 + <div class="form-group">
  42 + <label for="inputEmail" class="control-label"> {% trans 'Username' %}</label>
  43 + <input form="form-login" for="inputSmall" type="text" name="username" class="form-control" placeholder="Username" id="inputEmail" value="{% if username %}{{username}}{% endif %}">
  44 + </div>
  45 + </div>
  46 + <div class="col-md-8 col-xs-8 col-lg-10 col-lg-offset-1 col-sm-10">
  47 + <div class="form-group">
  48 + <label for="inputPassword" class="control-label"> {% trans 'Password' %}</label>
  49 + <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="Password">
  50 + </div>
  51 + </div>
  52 + <div class="col-md-10 col-sm-10 col-xs-10 col-lg-10 col-lg-offset-1">
  53 + <div class="checkbox">
  54 + <label>
  55 + <input form="form-login" type="checkbox" name="checkbox"><span class="checkbox-material"><span class="check"></span></span> {% trans 'Remember Email' %}
  56 + </label>
  57 + </div>
  58 + </div>
  59 + </form>
  60 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 col-lg-offset-1 text-center">
  61 + <button type="submite" class="btn btn-success btn-raised btn-block" form="form-login" style="position: initial;">{% trans 'Login' %}</button>
  62 + </div>
  63 + <div class="col-md-6 col-xs-6 col-sm-6 col-lg-5 text-center">
  64 + <a class="btn btn-default btn-raised btn-block" href="{% url 'core:guest' %}" formaction="#" style="position: initial;">{% trans 'Guest' %}</a>
  65 + </div>
  66 + <div class="col-md-10 col-sm-10 col-xs-10 col-lg-6 col-lg-offset-7 forgotPassword">
  67 + <a href="{% url 'core:password_reset' %}">{% trans "Forgot your password?" %}</a>
  68 + </div>
69 69 </div>
70 70 </div>
71 71 <a class="btn btn-raised btn-primary btn-block" href="{% url 'core:register' %}">{% trans 'Sign Up' %} </a>
... ...