Merge branch 'feature/autocomplete-users' of https://github.com/octav…

…ioamu/web into feature/autocomplete-users
gitcoinco · Aug 28, 2018 · 30ce720 · 30ce720
2 parents 71f4d2b + 719183e
commit 30ce720
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/dashboard/templates/onepager/base.html b/app/dashboard/templates/onepager/base.html
@@ -33,17 +33,19 @@
     <link rel="stylesheet" href="{% static "v2/css/forms/button.css" %}">
     <link rel="stylesheet" href="{% static "cookielaw/css/cookielaw.css" %}">
 
-    <!-- TODO: remove this css if bootstrap is used -->
     <style>
       .d-flex {
         display: flex;
       }
+
       .align-items-baseline {
         align-items: center;
       }
+
       .mr-2 {
         margin-right: 1rem;
       }
+
       .rounded-circle {
         border-radius: 50%;
         vertical-align: middle;
@@ -53,9 +55,11 @@
         height: 34px;
         text-align: left;
       }
+
       .select2-container--default .select2-selection--single .select2-selection__rendered {
         line-height: 32px;
       }
+
       .select2-container--default .select2-selection--single .select2-selection__arrow {
         height: 32px;
       }

diff --git a/app/dashboard/views.py b/app/dashboard/views.py
@@ -28,7 +28,6 @@
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.http import Http404, HttpResponse, JsonResponse
-
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.templatetags.static import static