[extensions-web: 37/37] Merge branch 'wip/tomtryf/redesign'



commit 8bb1d8e5e4f205bdd78820a8c9679fe233fb0c17
Merge: a070ffc 6b37703
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Sun Mar 26 01:16:20 2017 +0400

    Merge branch 'wip/tomtryf/redesign'

 sweettooth/auth/forms.py                           |    5 +-
 sweettooth/auth/templates/registration/login.html  |   43 +-
 .../templates/registration/login_popup_form.html   |   29 +-
 .../registration/password_change_form.html         |   17 +-
 .../registration/password_reset_confirm.html       |   16 +-
 .../registration/password_reset_form.html          |   18 +-
 .../templates/registration/registration_form.html  |   14 +-
 .../templates/errorreports/report.html             |    6 +-
 .../extensions/templates/extensions/comments.html  |   22 +-
 .../extensions/templates/extensions/detail.html    |   28 +-
 .../templates/extensions/detail_edit.html          |    8 +-
 .../extensions/templates/extensions/list.html      |   12 +-
 .../extensions/templates/extensions/upload.html    |    6 +-
 sweettooth/ratings/templates/comments/form.html    |   10 +-
 sweettooth/ratings/templates/comments/preview.html |   23 +-
 sweettooth/review/templates/review/list.html       |    4 +-
 sweettooth/review/templates/review/review.html     |   80 +-
 sweettooth/static/css/960.css                      |  405 -
 sweettooth/static/css/bootstrap.css                | 6754 +++++++++
 sweettooth/static/css/review.css                   |    2 +-
 sweettooth/static/css/style.css                    |  769 +-
 sweettooth/static/css/sweettooth.css               |  264 +-
 sweettooth/static/css/text.css                     |   27 +-
 sweettooth/static/images/avatar-default.svg        |  152 +
 sweettooth/static/images/edit.svg                  |   36 +
 sweettooth/static/images/gnome-extensions.svg      |  139 +
 sweettooth/static/images/search-icon.png           |  Bin 491 -> 0 bytes
 sweettooth/static/images/search.svg                |   32 +
 sweettooth/static/js/bootstrap.min.js              |    7 +
 sweettooth/static/js/jquery.hashchange.js          |   92 +-
 sweettooth/static/js/jquery.js                     |14928 +++++++++++---------
 sweettooth/static/js/main.js                       |   26 +-
 sweettooth/static/js/modal.js                      |    2 +-
 sweettooth/templates/base.html                     |  177 +-
 sweettooth/templates/footer_links.html             |   66 +-
 sweettooth/templates/usermenu.html                 |   15 +-
 36 files changed, 16102 insertions(+), 8132 deletions(-)
---
diff --cc sweettooth/templates/base.html
index 7408451,269a99e..c0d1f9e
--- a/sweettooth/templates/base.html
+++ b/sweettooth/templates/base.html
@@@ -2,9 -3,9 +2,10 @@@
  <html>
    <head>
      {% load static from staticfiles %}
++    {% load gravatar %}
      <meta charset="utf-8" />
-     <meta name="google-site-verification" content="FqL97fLHaUM8zWWqkc4ZrvY-u9MikPkV0QshIzc-Bp8" />
-     <link rel="chrome-webstore-item" 
href="https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep";>
+     <meta name="viewport" content="width=device-width, initial-scale=1">
+     <link rel="stylesheet" href="{% static 'css/bootstrap.css' %}" />
      <link rel="stylesheet" href="{% static 'css/style.css' %}" />
      <link rel="shortcut icon" href="{% static 'images/favicon.png' %}" />
      <link rel="alternate" type="application/rss+xml"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]