Merge remote-tracking branch 'origin/master' into stable

gitcoinco · Apr 4, 2019 · f8a3262 · f8a3262
2 parents 9f20889 + 16781f8
commit f8a3262
Show file tree

Hide file tree

Showing 101 changed files with 3,315 additions and 1,216 deletions.
diff --git a/Makefile b/Makefile
@@ -71,6 +71,9 @@ load_initial_data: ## Load initial development fixtures.
 logs: ## Print and actively tail the docker compose logs.
 	@docker-compose logs -f
 
+cypress: ## Open cypress testing UI
+	@npx cypress open
+
 pytest: ## Run pytest (Backend)
 	@docker-compose exec -e DJANGO_SETTINGS_MODULE="app.settings" web pytest -p no:ethereum
 

diff --git a/app/app/urls.py b/app/app/urls.py
@@ -159,6 +159,11 @@
         name='funder_payout_reminder_modal'
     ),
 
+    # Rating
+    path('modal/rating/<int:bounty_id>/<str:username>/', dashboard.views.rating_modal, name='rating_modal'),
+    path('modal/rating_capture/', dashboard.views.rating_capture, name='rating_capture'),
+    url(r'^api/v0.1/unrated_bounties/', dashboard.views.unrated_bounties, name='unrated_bounties'),
+
     # Notify Funder Modal Submission
     path(
         'actions/bounty/<str:bounty_network>/<int:stdbounties_id>/notify/funder_payout_reminder/',
@@ -383,6 +388,11 @@
     path('_administration/email/quarterly_roundup', retail.emails.quarterly_roundup, name='quarterly_roundup'),
     path('_administration/email/new_work_submission', retail.emails.new_work_submission, name='new_work_submission'),
     path('_administration/email/weekly_founder_recap', retail.emails.weekly_recap, name='weekly_founder_recap'),
+    path(
+        '_administration/email/weekly_unread_notifications_email',
+        retail.emails.unread_notification_email_weekly_roundup,
+        name='unread_notifications_email_weekly_roundup'
+    ),
     path('_administration/email/new_bounty_rejection', retail.emails.new_bounty_rejection, name='new_bounty_rejection'),
     path(
         '_administration/email/new_bounty_acceptance',

diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css
@@ -1013,49 +1013,6 @@ input.is-invalid {
   width: auto;
 }
 
-.rating {
-  width:160px;
-}
-.rating span { float:right; position:relative; }
-.rating span input {
-  position:absolute;
-  top:0px;
-  left:0px;
-  opacity:0;
-}
-.rating span label {
-  display:inline-block;
-  width:30px;
-  height:30px;
-  text-align:center;
-  color:#FFF;
-  font-size:25px;
-  margin-right:2px;
-  line-height:30px;
-  border-radius:50%;
-  -webkit-border-radius:50%;
-}
-.rating span label i {
-  color:#ccc;
-}
-
-.rating span:hover ~ span label i,
-.rating span:hover label i {
-  opacity: 0.5;
-}
-.rating span.checked label i,
-.rating span.checked ~ span label i
-{
-  opacity: 1;
-}
-
-.rating span:hover ~ span label i,
-.rating span:hover label i,
-.rating span.checked label i,
-.rating span.checked ~ span label i {
-  color: rgb(18,199,113);
-}
-
 .bounty_box {
   border: 5px solid white;
   width: 100%;

diff --git a/app/assets/v2/css/forms/select.css b/app/assets/v2/css/forms/select.css
@@ -75,7 +75,8 @@
 }
 
 /* Multi-select */
-.g-multiselect .select2-container--default .select2-selection--multiple .select2-selection__rendered li:not(.select2-search){
+.g-multiselect .select2-container--default .select2-selection--multiple .select2-selection__rendered li:not(.select2-search),
+li.select2-available__choice{
   align-items: center;
   border: 1px solid #3E00FF;
   background-color: #3E00FF;
@@ -86,6 +87,13 @@
   border-radius: 3px;
 }
 
+li.select2-available__choice {
+  margin-right: 5px;
+  margin-top: 5px;
+  padding: 0 5px;
+  cursor: pointer;
+}
+
 .g-multiselect .select2 {
   font-size: 12px;
 }
@@ -154,7 +162,8 @@
   display: none;
 }
 
-.select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+.select2-container--default .select2-selection--multiple .select2-selection__choice__remove,
+.select2-available__choice__remove {
   color: #ffffff;
   margin-right: 10px;
 }

diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css
@@ -110,6 +110,18 @@ h4,
   color: #ffffff;
 }
 
+.text-black-60 {
+  color: rgba(0, 0, 0, 0.6)!important;
+}
+
+.text-black-70 {
+  color: rgba(0, 0, 0, 0.7)!important;
+}
+
+.text-current {
+  color: currentColor !important;
+}
+
 .underline {
   text-decoration: underline;
 }