Merge branch 'develop' of github.com:creativecommons/caselaw into bugfix/content-alignment

Author: Krystle Salazar

.github/CODEOWNERS

@@ -1,4 +1,5 @@
 # These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence, they will 
+# the repo. Unless a later match takes precedence, they will
 # be requested for review when someone opens a pull request.
-* @creativecommons/ct-legal-database-core-committers @creativecommons/internal-tech
+* @creativecommons/internal-tech
+* @creativecommons/ct-legal-database-core-committers

README.md

@@ -9,10 +9,20 @@
 
 :warning:  **This project, CC’s Legal Database, is undergoing a reimplementation using Django, you can see a preview running on [Heroku](https://cc-caselaw.herokuapp.com/).**
 
+
 Visit the current website: **[CC Legal Database [Beta]][website]**.
 
 [website]: https://labs.creativecommons.org/caselaw/
 
+> :warning: **This project is under active development in the
+> [`develop`][devbranch] branch.** For more information, see:
+> - [Posts in the Outreachy May 2020 round: CC Legal Database
+>   series][blogseries]
+
+[devbranch]: https://github.com/creativecommons/caselaw/tree/develop
+[blogseries]: https://opensource.creativecommons.org/blog/entries/legal-database-a-new-beginning/#series
+
+
 
 ## Code of Conduct
 

legal_db/static/styles.scss

@@ -2,10 +2,10 @@
 $color-tomato: rgb(237, 89, 47);
 $color-brighter-tomato: rgb(255, 105, 51);
 $color-dark-turquoise: rgb(5, 181, 218);
+$color-forest-green:rgb(4,166,53);
 $color-dark-slate-blue: rgb(60, 92, 153);
 $color-dark-gray: rgb(118, 118, 118);
 $color-dark-slate-gray: rgb(51, 51, 51);
-$color-gray: rgb(176, 176, 176);
 $color-light-gray: rgb(216, 216, 216);
 $color-lighter-gray: rgb(245, 245, 245);
 
@@ -61,22 +61,22 @@ a, a:hover {
     }
   }
   &.scholarship {
-    background-color: $color-dark-turquoise;
-    border-color: $color-dark-turquoise;
+    background-color: $color-forest-green;
+    border-color: $color-forest-green;
     color: white;
 
     &.tag {
       background-color: white;
       color: $color-dark-gray;
 
       &.outline {
-        border-color: $color-dark-turquoise;
+        border-color: $color-forest-green;
         text-decoration: none;
       }
 
       &:hover, &.selected {
-        background-color: $color-dark-turquoise;
-        border-color: $color-dark-turquoise;
+        background-color: $color-forest-green;
+        border-color: $color-forest-green;
         color: white;
       }
     }
@@ -258,7 +258,7 @@ footer a:hover {
   }
 
   &.scholarship {
-    box-shadow: inset 0px 6px 0px $color-dark-turquoise;
+    box-shadow: inset 0px 6px 0px $color-forest-green;
   }
 
   &-title, &-description, .breadcrumb {

legal_db/templates/legal_db/index.html

@@ -42,7 +42,7 @@ <h3 class="subtitle is-4 padding-bottom-big">Scholarship</h3>
         </div>
         <div class="column is-half">
           <article class="card entry-post link no-border">
-            <a href="{% url 'scholarship_index' %}" class="has-background-dark-turquoise">
+            <a href="{% url 'scholarship_index' %}" class="has-background-forest-green">
               <span class="card-content has-bottom-link">
                 <h3 class="b-header has-text-white">Legal Scholarship Database</h3>
                 <span class="content">The Scholarship Database aims to provide users with resources concerning the use, interpretation, and enforceability of Creative Commons licenses.</span>

legal_db/templates/legal_db/scholarship/index.html

@@ -8,7 +8,7 @@
     <h1 class="hero-title title is-2">Scholarship</h1>
     <div class="contribute-card">
       <article class="card entry-post link no-border is-hidden-touch">
-        <a href="{% url 'scholarship_submit' %}" class="has-background-dark-turquoise">
+        <a href="{% url 'scholarship_submit' %}" class="has-background-forest-green">
           <span class="card-content has-bottom-link">
             <h2 class="card-title">Contribute</h2>
             <span class="content">Do you want to submit a scholarly article to the database?</span>