Merge pull request #1452 from 18F/fix/tooltip-under-alignment

Fix/tooltip under alignment
fecgov · Nov 7, 2017 · eb1e1c9 · eb1e1c9
2 parents 4f6fc20 + 8442d64
commit eb1e1c9
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 9 deletions.
diff --git a/fec/data/views.py b/fec/data/views.py
@@ -304,6 +304,7 @@ def committee(request, committee_id):
         'totals': totals,
         'min_receipt_date': utils.three_days_ago(),
         'context_vars': context_vars,
+        'party_full': committee['party_full']
     }
 
 
@@ -322,10 +323,10 @@ def committee(request, committee_id):
         # If there's no reports, find the first year with reports and redirect there
         for c in sorted(committee['cycles'], reverse=True):
             financials = api_caller.load_cmte_financials(committee['committee_id'], cycle=c)
-            if financials['reports']:
-                return redirect(
-                    url_for('committee_page', c_id=committee['committee_id'], cycle=c)
-                )
+            # if financials['reports']:
+            #     return redirect(
+            #         url_for('committee_page', c_id=committee['committee_id'], cycle=c)
+            #     )
 
     # If it's not a senate committee and we're in the current cycle
     # check if there's any raw filings in the last three days

diff --git a/fec/fec/static/img/tooltip-point.svg b/fec/fec/static/img/tooltip-point.svg
diff --git a/fec/fec/static/scss/components/_calendar.scss b/fec/fec/static/scss/components/_calendar.scss
@@ -244,10 +244,11 @@
 // Event details
 .cal-details {
   font-size: u(1.4rem);
-  left: auto;
-  top: auto;
-  margin-top: u(1rem);
-  padding: 0;
+  left: auto !important;
+  top: auto !important;
+  margin-top: u(1.5rem);
+  margin-left: u(-8rem);
+  padding: 0 !important;
   text-align: left;
   width: u(26rem);
   white-space: initial;
@@ -256,6 +257,7 @@
     @include triangle(2rem, $primary, up);
     background-image: none;
     left: 20%;
+    top: u(-2rem) !important;
   }
 
   .button--close--primary {
@@ -265,6 +267,17 @@
   }
 }
 
+.fc-event-container:nth-child(1) {
+  .cal-details {
+    margin-left: unset;
+
+    &::before {
+      right: auto;
+      left: u(2rem);
+    }
+  }
+}
+
 .fc-event-container:nth-child(7) {
   .cal-details {
     right: 0;

diff --git a/fec/fec/static/scss/components/_tooltips.scss b/fec/fec/static/scss/components/_tooltips.scss
@@ -87,7 +87,7 @@
 //
 
 .tooltip--under {
-  $top: u(1rem);
+  $top: u(1.5rem);
   width: u(30rem);
   left: u(-14rem);
   top: calc(100% + #{$top});