Merge branch 'release/3.0.1'

azavea · Dec 12, 2019 · 6ce7ef9 · 6ce7ef9
2 parents d4d9da5 + c5dae8e
commit 6ce7ef9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/src/app/styles/components/_place-card.scss b/src/app/styles/components/_place-card.scss
@@ -272,6 +272,7 @@
     }
 
     .place-card-badges {
+        margin-top: auto;
     }
 
     .place-card-actions {

diff --git a/src/app/styles/components/_tour-place-card.scss b/src/app/styles/components/_tour-place-card.scss
@@ -81,16 +81,3 @@
         background-color: transparent;
     }
 }
-
-.tour-place-card-badges {
-    display: flex;
-    flex-flow: row nowrap;
-    align-items: center;
-    justify-content: flex-end;
-    font-size: 1.8rem;
-    line-height: 1;
-
-    .badge {
-        margin-left: .8rem;
-    }
-}
diff --git a/src/app/styles/layouts/_info.scss b/src/app/styles/layouts/_info.scss
@@ -474,7 +474,7 @@
 
     .tour-locations-list {
         display: grid;
-        grid-template-columns: 1fr 1fr;
+        grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
         grid-gap: 2.4rem;
         justify-items: stretch;
         align-items: stretch;
-Original file line number
+Diff line change
@@ Expand Up / @@ -272,6 +272,7 @@ @@
         }
         .place-card-badges {
+            margin-top: auto;
         }
         .place-card-actions {
@@ Expand Down @@