From eed3c67c06835e7b2f07c80cf9708ab119b33c4f Mon Sep 17 00:00:00 2001 From: Keshav Garg Date: Sun, 4 Aug 2019 14:06:47 +0530 Subject: [PATCH] Use White bg-color Remove usage of green-color, as using white bg-color give a better and nice look. And the green font color has also been replaced with gray color font. In short, the usage of any green color in website has been omitted. --- community/views.py | 5 ++++- static/css/build_logs.css | 6 ++---- static/css/contributors.css | 4 ++-- static/css/gamification.css | 4 ++-- static/css/gci_students.css | 8 ++++---- static/css/index.css | 9 +++++++-- static/css/main.css | 17 ++++------------ static/css/meta-reviewers.css | 4 ++-- static/js/forms.js | 2 -- static/js/main.js | 4 ++-- templates/base.html | 36 +++++++++++++++++----------------- templates/build_logs.html | 2 +- templates/community_forms.html | 24 +++++++++++------------ templates/gci_students.html | 4 ++-- templates/index.html | 10 +++++----- templates/issues.html | 2 +- templates/mentors.html | 8 ++++---- templates/teams.html | 4 ++-- 18 files changed, 74 insertions(+), 79 deletions(-) diff --git a/community/views.py b/community/views.py index 4989acb8..ade02639 100644 --- a/community/views.py +++ b/community/views.py @@ -143,7 +143,10 @@ def get_team_details(self, org_name): team_details = {} for team_name in teams: team = Team.objects.get(name=team_name) - team_details[team_name] = team.contributors.count() + contributors_count = team.contributors.count() + team_details[ + team_name.replace(org_name, '').strip().capitalize() + ] = contributors_count return team_details def get_quote_of_the_day(self): diff --git a/static/css/build_logs.css b/static/css/build_logs.css index 36d1af38..5a9f53de 100644 --- a/static/css/build_logs.css +++ b/static/css/build_logs.css @@ -32,9 +32,8 @@ width: 25%; min-width: 150px; border-radius: 100px; - box-shadow: 0px 0px 25px 2px black; + box-shadow: 0 0 25px 2px black; color: #454343; - background-color: #c7da99; padding-left: 10px; margin: auto; margin-right: 0; @@ -52,8 +51,7 @@ } .form-fields { - margin: auto; - margin-right: 0; + margin: auto 0 auto auto; width: 60%; padding-top: 10px; } diff --git a/static/css/contributors.css b/static/css/contributors.css index 90f3d4fe..f51433a3 100644 --- a/static/css/contributors.css +++ b/static/css/contributors.css @@ -85,9 +85,9 @@ .user-statistics { display: none; - position: relative; - margin-top: -380px; + position: fixed; left: 10%; + top: 15%; width: 80%; height: 70vh; background-color: white; diff --git a/static/css/gamification.css b/static/css/gamification.css index 4fbf2dbb..68fdb726 100644 --- a/static/css/gamification.css +++ b/static/css/gamification.css @@ -30,7 +30,7 @@ .gamifier-image img{ width: 90%; - margin-right: 0px; + margin-right: 0; margin-left: 1%; min-width: 100px; @@ -56,7 +56,7 @@ .filter-btn .btn { text-transform: none; border-radius: 100px; - box-shadow: 0px 0px 25px 2px black; + box-shadow: 0 0 25px 2px black; } .social-icons { diff --git a/static/css/gci_students.css b/static/css/gci_students.css index 7f99b287..97785370 100644 --- a/static/css/gci_students.css +++ b/static/css/gci_students.css @@ -1,5 +1,5 @@ .data-fetch-error { - padding: 20px 20px 0px 20px; + padding: 20px 20px 0 20px; } .gci-students { @@ -7,10 +7,10 @@ } .gci-students .student-card { - box-shadow: 0px 0px 25px 2px black; - background-color: #c7da99; + box-shadow: 0 0 25px 2px black; + background-color: #e3e5e6; font-size: large; - border: 4px #6c9a55 solid; + border: 4px darkgray solid; } diff --git a/static/css/index.css b/static/css/index.css index fb737e6d..1049d906 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -26,8 +26,8 @@ margin-top: 3%; box-shadow: 0 0 25px 2px black; border-radius: 100px; - background-color: #edf5af; - color: #636060; + background-color: #37474f; + color: white; text-transform: full-width; font-size: 1em; letter-spacing: 0; @@ -41,6 +41,11 @@ border-bottom-left-radius: 1000px; } +.org-teams-stats { + width: 70%; + margin: auto; +} + .organization_map { text-align: center; padding: 2% 0; diff --git a/static/css/main.css b/static/css/main.css index bd6ef00d..c4af739a 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -6,7 +6,6 @@ body { font-family: 'Ubuntu Mono', monospace; - background-color: #edf5af; } .bold-text, @@ -30,26 +29,22 @@ body { cursor: pointer; } -.custom-green-color-font { - color: #2d5d13 -} - .center-content { justify-content: center; } .community-form, .feedback { - position: absolute; + position: fixed; width: 70%; min-width: 330px; - top: 15%; left: 15%; border-radius: 20px; box-shadow: 0 -5px 15px black; - background-color: #edf5af; + background-color: white; padding: 20px; height: 80%; + z-index: 1002; overflow-x: auto; } @@ -162,7 +157,6 @@ footer .social-buttons { } .main-content { - background-color: #edf5af; padding-bottom: 3%; } @@ -248,7 +242,6 @@ p { border-radius: 100px; box-shadow: 0 0 25px 2px black; color: #454343; - background-color: #edf5af; padding: 0 20px; flex-flow: row; margin: auto auto auto 0; @@ -262,11 +255,10 @@ p { } #search::placeholder { - color: grey; + color: #37474f; } #search:focus:not(.browser-default) { - background-color: #edf5af; border-radius: 100px; font-size: medium; padding-left: 15px; @@ -312,7 +304,6 @@ strong { .data-fetch-error { text-align: center; font-size: large; - color: #2d5d13; } @media only screen and (max-width: 600px) { diff --git a/static/css/meta-reviewers.css b/static/css/meta-reviewers.css index 6b734844..77bf0c1e 100644 --- a/static/css/meta-reviewers.css +++ b/static/css/meta-reviewers.css @@ -17,9 +17,9 @@ } .meta-reviewer { - background-color: #c7da99; + background-color: #e3e5e6; width: 580px; - border: 4px #6c9a55 solid; + border: 4px darkgray solid; } .metareviewer-details { diff --git a/static/js/forms.js b/static/js/forms.js index efd88aa6..0246edb5 100644 --- a/static/js/forms.js +++ b/static/js/forms.js @@ -90,8 +90,6 @@ $(document).ready(function () { }); feedback_form_op.on('click', function () { - var top_offset = feedback_form_op.offset().top; - feedback_form.css('top', (top_offset-440).toString()+'px'); feedback_form.css('display', 'block'); $('.user-feeling-level i').on('click', function () { var experience = $(this).attr('experience'); diff --git a/static/js/main.js b/static/js/main.js index e1d4af0d..a7522913 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -10,7 +10,7 @@ $(document).ready(function(){ var userAuthenticated = urlParams.get('auth'); var current_search_location = window.location; - console.log(current_search_location); + if(current_search_location.toString().search('teams')>0){ var is_authenticated = Cookies.set('authenticated'); var username = Cookies.set('username'); @@ -86,7 +86,7 @@ $(document).ready(function(){ $('.user-profile').css('display', profile_option_display); logout_user_el.css('display', logout__option_display); $('.forms-dropdown-option').css('display', form_option_display); - $('.teams-dropdown-option'.css('display', teams_option_display)); + $('.teams-dropdown-option').css('display', teams_option_display); } function manipulate_web_page_data(oauth_provider, http_response_text) { diff --git a/templates/base.html b/templates/base.html index 455b6109..a78115a5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -160,23 +160,6 @@
Enjoy Coding 'n' Learning
-
- {% block main-content %} - {% endblock %} -
- - - -
- -
-