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.
KVGarg · Aug 4, 2019 · eed3c67 · eed3c67
1 parent e822faf
commit eed3c67
Show file tree

Hide file tree

Showing 18 changed files with 74 additions and 79 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,16 +1,16 @@
 .data-fetch-error {
-    padding: 20px 20px 0px 20px;
+    padding: 20px 20px 0 20px;
 }
 
 .gci-students {
     padding: 2% 2%;
 }
 
 .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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -160,31 +160,14 @@ <h6>Enjoy Coding 'n' Learning</h6>
       </div>
     </div>
 
-    <div class="main-content">
-      {% block main-content %}
-      {% endblock %}
-    </div>
-
-    <div class="community-form apply-flex center-content display-none">
-      <div class="apply-flex close-form">
-        <i class="fa fa-times" aria-hidden="true"></i>
-      </div>
-      {% include 'community_forms.html' %}
-    </div>
-
-  <div class="feedback-icon">
-    <img alt="feedback" class="feedback-comment"
-         src="//www.agcsoftware.com/wp-content/uploads//2017/06/feedback-icon.png">
-  </div>
-
   <div class="feedback display-none">
     <div class="apply-flex close-form">
       <i class="fa fa-times" aria-hidden="true"></i>
     </div>
     <form name="{{ feedback_form_name }}" method="post"
           netlify-honeypot="bot-field" class="feedback-form"
           data-netlify="true" action="/">
-      <h5 class="text-center custom-green-color-font bold-text">
+      <h5 class="text-center gray-font-color bold-text">
         Feedback
       </h5>
       {% csrf_token %}
@@ -216,6 +199,23 @@ <h6 class="experience">Feeling about {{ org.name }} organization?</h6>
     </form>
   </div>
 
+  <div class="community-form apply-flex center-content display-none">
+    <div class="apply-flex close-form">
+      <i class="fa fa-times" aria-hidden="true"></i>
+    </div>
+    {% include 'community_forms.html' %}
+  </div>
+
+  <div class="main-content">
+    {% block main-content %}
+    {% endblock %}
+  </div>
+
+  <div class="feedback-icon">
+    <img alt="feedback" class="feedback-comment"
+         src="//www.agcsoftware.com/wp-content/uploads//2017/06/feedback-icon.png">
+  </div>
+
   <footer class="page-footer">
     <div class="row">
       <div class="col m3 s12">

diff --git a/templates/build_logs.html b/templates/build_logs.html
@@ -42,7 +42,7 @@ <h3>Logs</h3>
             <i class="fa fa-search social-icons small-screen"></i>
             <div class="input-field apply-flex center-content search-field">
               <i class="fa fa-search social-icons"></i>
-              <input id="search" type="search" required>
+              <input id="search" type="search" required autocomplete="off">
               <i class="fa fa-close social-icons"></i>
             </div>
             <div class="input-field log-chooser">

diff --git a/templates/community_forms.html b/templates/community_forms.html
@@ -1,7 +1,7 @@
 <form name="{{ community_google_form_name }}" method="post"
       netlify-honeypot="bot-field" class="community-google-form display-none"
       data-netlify="true" action="/">
-  <h5 class="text-center custom-green-color-font bold-text">
+  <h5 class="text-center gray-font-color bold-text">
     Community Google Form Details
   </h5>
   {% csrf_token %}
@@ -55,7 +55,7 @@ <h5 class="text-center custom-green-color-font bold-text">
 <form name="{{ community_event_form_name }}" method="post"
       netlify-honeypot="bot-field" class="calendar-event-form display-none"
       data-netlify="true" action="/">
-  <h5 class="text-center custom-green-color-font bold-text">
+  <h5 class="text-center gray-font-color bold-text">
     Community Event Details
   </h5>
   {% csrf_token %}
@@ -109,7 +109,7 @@ <h5 class="text-center custom-green-color-font bold-text">
 <form name="{{ organization_mentor_form_name }}" method="post"
       netlify-honeypot="bot-field" class="mentor-students-form display-none"
       data-netlify="true" action="/">
-  <h5 class="text-center custom-green-color-font bold-text">
+  <h5 class="text-center gray-font-color bold-text">
     Mentoring Program Details
   </h5>
   {% csrf_token %}
@@ -159,7 +159,7 @@ <h5 class="text-center custom-green-color-font bold-text">
 <form name="{{ gsoc_student_form_name }}" method="post"
       netlify-honeypot="bot-field" class="participated-in-gsoc-form display-none"
       data-netlify="true" action="/">
-  <h5 class="text-center custom-green-color-font bold-text">
+  <h5 class="text-center gray-font-color bold-text">
     Google Summer of Code, Participation Student Details
   </h5>
   {% csrf_token %}
@@ -213,7 +213,7 @@ <h5 class="text-center custom-green-color-font bold-text">
 <form name="{{ assign_issue_form_name }}" method="post"
       netlify-honeypot="bot-field" class="get-issue-assigned-form display-none"
       data-netlify="true" action="/">
-  <h5 class="text-center custom-green-color-font bold-text">
+  <h5 class="text-center gray-font-color bold-text">
     On which Issue you want to work?
   </h5>
   {% csrf_token %}
@@ -267,12 +267,12 @@ <h5 class="text-center custom-green-color-font bold-text">
 <form name="{{ newcomer_promotion_form_name }}" method="post"
       netlify-honeypot="bot-field" class="newcomer-promotion-form display-none"
       data-netlify="true" action="/">
-  <h5 class="text-center custom-green-color-font bold-text">
-    On which Issue you want to work?
+  <h5 class="text-center gray-font-color bold-text">
+    Newcomer Promotion Request Form
   </h5>
   {% csrf_token %}
   <div class="form-step-div">
-    <h6 class="bold-text custom-green-color-font">User Details</h6>
+    <h6 class="bold-text gray-font-color">User Details</h6>
     <div class="row">
       <div class="input-field col s12">
         <p>{{ newcomer_promotion_form.github_username.label_tag }}</p>
@@ -287,7 +287,7 @@ <h6 class="bold-text custom-green-color-font">User Details</h6>
     </div>
   </div>
   <div class="form-step-div">
-    <h6 class="bold-text custom-green-color-font">Personal Project Details</h6>
+    <h6 class="bold-text gray-font-color">Personal Project Details</h6>
     <div class="row">
       <div class="input-field col s12">
         {{ newcomer_promotion_form.project_web_url.label_tag }}
@@ -296,7 +296,7 @@ <h6 class="bold-text custom-green-color-font">Personal Project Details</h6>
       </div>
     </div>
     <div style="padding-left: 10px">
-      <h6 class="bold-text custom-green-color-font">Files Relative Path
+      <h6 class="bold-text gray-font-color">Files Relative Path
         (to project root)
       </h6>
       <div class="row">
@@ -323,7 +323,7 @@ <h6 class="bold-text custom-green-color-font">Files Relative Path
     </div>
   </div>
   <div class="form-step-div">
-    <h6 class="bold-text custom-green-color-font">Newcomer Issue Related
+    <h6 class="bold-text gray-font-color">Newcomer Issue Related
       Details</h6>
     <div class="row">
       <div class="input-field col s12">
@@ -348,7 +348,7 @@ <h6 class="bold-text custom-green-color-font">Newcomer Issue Related
     </div>
   </div>
   <div class="form-step-div">
-    <h6 class="bold-text custom-green-color-font">Low Difficulty Issue
+    <h6 class="bold-text gray-font-color">Low Difficulty Issue
       Related Details</h6>
     <div class="row">
       <div class="input-field col s12">

diff --git a/templates/gci_students.html b/templates/gci_students.html
@@ -31,13 +31,13 @@ <h3 style="padding-left: 15px">~</h3>
   </div>
 
   {% if gci_students.data %}
-  <div class="gci-students apply-flex evenly-spread-content custom-green-color-font">
+  <div class="gci-students apply-flex evenly-spread-content gray-font-color">
   {% for student in gci_students.data %}
     <div class="student-card card horizontal">
       <div class="student-image card-image apply-flex">
         <img src="//github.com/{{ student.username }}.png/">
       </div>
-      <div class="student-details card-content">
+      <div class="student-details card-content gray-font-color">
         <a class="user-name bold-text" href="//github.com/{{ student.username }}" target="_blank">
           {% if student.display_name %}
             {{ student.display_name }}