Merge pull request #860 from uw-it-aca/hotfix/MUWM-3933

Hotfix/muwm 3933
uw-it-aca · Sep 11, 2017 · 496ad49 · 496ad49
2 parents 748845b + b06cde9
commit 496ad49
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/myuw/static/css/photo_list.less b/myuw/static/css/photo_list.less
@@ -2,6 +2,14 @@
 
 .myuw-photo-list {
 
+    @media @two-column {
+        margin-top: 0;
+        margin-left: -16px;
+        margin-right: -16px;
+        margin-bottom: 16px;
+        padding: 16px !important;
+    }
+
     .myuw-photo-list-controls {
         .myuw-photo-list-controls-view { display:inline-block; margin-right:16px; }
         .myuw-photo-list-controls-sort { display:inline-block; }
@@ -39,9 +47,9 @@
 
             &:after { visibility: hidden; display: block; content: ""; clear: both; height: 0; }
 
-            li { float: left;  margin-right: 16px; width: 100%; height: 230px;
+            li { float: left; margin-right: 16px; width: 100%; height: 230px; padding: 8px;
 
-                @media @two-column { width: 200px; margin-bottom: 0;}
+                @media @two-column { width: 200px; margin-bottom: 16px;}
 
                 &:last-child { margin: 0; }
 
@@ -68,7 +76,8 @@
             }
 
             &.grid-view {
-                li { width: 200px; }
+                li { width: 120px; overflow: hidden; padding: 0; margin: 0 4px;
+                }
             }
         }
     }

diff --git a/myuw/templates/handlebars/teaching/photo_list.html b/myuw/templates/handlebars/teaching/photo_list.html
@@ -72,7 +72,6 @@ <h3 class="scheduleHeading myuw-card-title">{{ toTitleCase quarter }} {{ year }}
                                     </div>
                                 </div>
 
-
                             </li>
                         {{ /each }}