From 85749c6e8979adf004a64371e593f347f52beb57 Mon Sep 17 00:00:00 2001 From: Sourav Badami Date: Tue, 6 Jun 2017 19:49:39 +0530 Subject: [PATCH 1/3] Moved issue reporting form to top navbar and minor changes. #181 --- website/static/css/style.css | 6 +-- website/templates/base.html | 49 ++++++++++++++++++++++- website/templates/index.html | 76 ++---------------------------------- 3 files changed, 54 insertions(+), 77 deletions(-) diff --git a/website/static/css/style.css b/website/static/css/style.css index a0bb1ba569..a3b8a28b7d 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -19,10 +19,10 @@ body{ } .navbar-default .tagline{ - font-size: 18px; + font-size: 14px; color: #999; - line-height: 54px; - + line-height: 20px; + padding-left: 5px; font-weight: 300; } diff --git a/website/templates/base.html b/website/templates/base.html index 5dc19b46cb..906ce13aa1 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -37,7 +37,6 @@
diff --git a/website/templates/index.html b/website/templates/index.html index aeab4f8519..2cec82a0cb 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -12,82 +12,12 @@ .ds-btn li a span small{width:100%; display:inline-block; text-align:left;} .huge {overflow:auto;} -
-
-

Win points for reporting bugs on any website! -

-
-
-
-
-
- {% csrf_token %} -
- - {% if request.GET.url %} - - {% else %} - - {% endif %} - {% if form.url.errors %} - - {% endif %} -
-
- - - - - {% if form.description.errors %} - - {% endif %} -
- -
- - {% if request.GET.hash %}
- - - {% else %} - - - -   - - - {% endif %} - {% if form.screenshot.errors %} - - {% endif %} -
- -
- - - - - - -
- -
- -
- -
+
- + -
-
- +
From a5ddb9c0139a17fb2f5a286dcacdd00090aab60c Mon Sep 17 00:00:00 2001 From: Sourav Badami Date: Tue, 6 Jun 2017 20:03:31 +0530 Subject: [PATCH 2/3] Fixing conflicts. --- website/templates/index.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/website/templates/index.html b/website/templates/index.html index 2cec82a0cb..edb30aef23 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -6,12 +6,7 @@ {% providers_media_js %} {% block content %} - +
From a75735160e7530ca47d048f0f07ce2da6cd1fb63 Mon Sep 17 00:00:00 2001 From: Sourav Badami Date: Tue, 6 Jun 2017 20:06:38 +0530 Subject: [PATCH 3/3] Fixing conflicts. --- website/templates/index.html | 71 +++++++++++++++--------------------- 1 file changed, 30 insertions(+), 41 deletions(-) diff --git a/website/templates/index.html b/website/templates/index.html index edb30aef23..112e9318e6 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -6,23 +6,21 @@ {% providers_media_js %} {% block content %} - -
-
- - - -
+ +
+
+ + + +
-

Featured Websites -

+

Featured Websites

- {% for domain in domains %}
@@ -33,9 +31,7 @@

Featured Websites

{{domain.get_name}}
- -
{% if domain.prize %}Grand Prize ${{domain.prize}}{% endif %} 
- +
{% if domain.prize %}Grand Prize ${{domain.prize}}{% endif %}
@@ -101,41 +97,33 @@

Activity

{% now "F" %} Leaderboard -
-
-
-
The 1st Place Hunter for {% now "F" %} will receive
- -
- $?? - from - - [ Your Website Here ]
- - - - - -
- +
+ The 1st Place Hunter for {% now "F" %} will receive +
+ $?? from [ Your Website Here ] +
+ + + + + +
{% if leaderboard %} {% for leader in leaderboard %} -
- {{forloop.counter|ordinal}} +
{% if leader.socialaccount_set.all.0.get_avatar_url %} {% else %} - {% gravatar leader.email 50 %} + {% endif %} - {{leader.username}} - {{leader.total_score}} points - + {{leader.username}} + {{leader.total_score}} Points + {{forloop.counter|ordinal}}
{% endfor %} {% else %} @@ -148,9 +136,11 @@

Activity

- + +
- + {% endblock %}