Merge pull request #87 from silinternational/develop

fillup · web-flow · commit 5ec13e9474e2 · 2020-01-21T13:43:07.000-05:00
tall images were getting cropped on the bottom of cards, e.g., SIL Pa…
diff --git a/themes/material/common-head-elements.php b/themes/material/common-head-elements.php
@@ -32,7 +32,7 @@
 $colors = htmlentities($this->configuration->getValue('theme.color-scheme') ?: 'indigo-purple');
 ?>
 <link rel="stylesheet" href="material.<?= $colors ?>.1.2.1.min.css">
-<link rel="stylesheet" href="styles.2.3.5.css">
+<link rel="stylesheet" href="styles.2.3.6.css">
 
 <script async src="material.1.2.1.min.js"></script>
 
diff --git a/www/styles.2.3.6.css b/www/styles.2.3.6.css
@@ -110,8 +110,9 @@ i.material-icons.mdl-typography--display-4 {
   background-color: white;
 }
 
+/* file entire card, so need to match mdl-card's min-height of 200px */
 .fixed-height {
-  height: 185px;
+  height: 200px;
 }
 
 .fill-parent {
@@ -121,6 +122,7 @@ i.material-icons.mdl-typography--display-4 {
 
 .scale-to-parent {
   max-width: 90%;
+  max-height: 90%;
 }
 
 .hide {

Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,9 @@ i.material-icons.mdl-typography--display-4 {`
`110`	`110`	`background-color: white;`
`111`	`111`	`}`
`112`	`112`
	`113`	`+/* file entire card, so need to match mdl-card's min-height of 200px */`
`113`	`114`	`.fixed-height {`
`114`		`- height: 185px;`
	`115`	`+ height: 200px;`
`115`	`116`	`}`
`116`	`117`
`117`	`118`	`.fill-parent {`
`@@ -121,6 +122,7 @@ i.material-icons.mdl-typography--display-4 {`
`121`	`122`
`122`	`123`	`.scale-to-parent {`
`123`	`124`	`max-width: 90%;`
	`125`	`+ max-height: 90%;`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`.hide {`