Merge branch 'develop'

uriweb · Mar 1, 2019 · 70f3793 · 70f3793
2 parents 540416c + 104d4c5
commit 70f3793
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/assets/people.css b/assets/people.css
@@ -39,24 +39,12 @@
 	max-width: 100%;
 }
 
-
-.thirds .peopleitem.has-thumbnail figure,
-.fourths .peopleitem.has-thumbnail figure,
-.fifths .peopleitem.has-thumbnail figure {
+.peopleitem.has-thumbnail figure {
 	float: none;
 	margin: -1rem -1rem 1rem;
 }
 
-.halves .peopleitem.has-thumbnail img {
-	border-top-left-radius: 2px;
-	border-bottom-left-radius: 2px;
-	margin: -1rem 0 0 -1rem;
-	max-width: 200px;
-}
-
-.thirds .peopleitem.has-thumbnail img,
-.fourths .peopleitem.has-thumbnail img,
-.fifths .peopleitem.has-thumbnail img {
+.peopleitem.has-thumbnail img {
 	border-top-left-radius: 2px;
 	border-top-right-radius: 2px;
 	border-bottom-left-radius: 0;
@@ -66,6 +54,22 @@
 }
 
 
+@media (min-width: 600px) {
+
+	.halves .peopleitem.has-thumbnail figure {
+		display: block;
+		float: left;
+		margin: 0 1rem 0 0;
+	}
+
+	.halves .peopleitem.has-thumbnail img {
+		border-top-left-radius: 2px;
+		border-bottom-left-radius: 2px;
+		margin: -1rem 0 0 -1rem;
+		max-width: 200px;
+	}
+}
+
 /**
  * Legacy Department Theme Compatibility Styles
  */

diff --git a/uri-people-tool.php b/uri-people-tool.php
@@ -3,7 +3,7 @@
 Plugin Name: URI People Tool
 Plugin URI: http://www.uri.edu
 Description: Create custom people post type for WordPress Department Sites
-Version: 1.0
+Version: 1.1
 Author: John Pennypacker
 Author URI: 
 */