Package display white, member wraps around its packages - incomplete

diff --git a/css/front.css b/css/front.css
index 0c63d1f..2a0976f 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -14,35 +14,44 @@ div.member {
 }
 .member h2 {
     background: #f5f5f5 none repeat scroll 0 0;
-    border: 1px solid #ccc;
     color: #73bf45;
     display: block;
-    font-size: 16px;
+    font-size: 20px;
     overflow: hidden;
     padding: 5px 10px;
-    width: 100%;
+    width: auto;
 }
 div.member div.address {
     overflow: hidden;
-    padding: 20px 3%;
+    padding: 5px 3%;
+}
+.glm-member-package-wrapper {
+    border: 1px solid #ccc;
+}
+.glm-member-package-container {
+    background: #f5f5f5 none repeat scroll 0 0;
+}
+.glm-member-package-container .package {
+    overflow: hidden;
 }
 .glm-member-package-container .member > h2,
 .glm-member-package-container .member > h2 a {
     color: #73bf45;
     font-weight: normal;
 }
-#content-wrapper .package-info > h3 {
+#content-wrapper .member > .member-title,
+#content-wrapper .package-info > .package-title {
     clear: left;
 }
 .glm-member-package-container .package-info {
-    background: #f5f5f5 none repeat scroll 0 0;
+    background: white none repeat scroll 0 0;
     border: 1px solid #ccc;
     clear: both;
     display: block;
     float: left;
     margin: 0 3% 20px;
     overflow: hidden;
-    padding: 20px;
+    padding: 10px 20px;
     width: 94%;
     font-size: 16px;
 }
@@ -51,6 +60,7 @@ div.member div.address {
         margin: 0 0 20px;
         width: 100%;
         padding: 15px;
+        border-width: 1px 0;
     }
 }
 .glm-member-package-container h3.package-title {

diff --git a/views/front/packaging/list.html b/views/front/packaging/list.html
index 318df70..aa7e757 100644 (file)
--- a/views/front/packaging/list.html
+++ b/views/front/packaging/list.html
@@ -6,20 +6,19 @@
 -->
 
 <!-- Container for entire list of packages -->
-<div class="glm-member-package-container">
+<div class="glm-member-package-wrapper">
     
 {if $havePackages}
    
   {foreach $packages as $p}
-  
+  <div class="glm-member-package-container">
     {if $byMember && $p.firstForMember}
         <!-- Container for member information if multiple packages are listed under one member. - Only shows before first package for this member -->
         <div class="member">
-            <h2 class="member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.member_slug}/">{$p.ref_dest_name}</a></h2>
-            
             {if $p.logo}
             <img src="{$glmPluginMediaURL}/images/medium/{$p.logo}">
           {/if}
+            <h2 class="member-title"><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$p.member_slug}/">{$p.ref_dest_name}</a></h2>
             <div class="address">
                 <div class="addr1">{$p.addr1}</div>
               {if $p.addr2}
@@ -93,8 +92,8 @@
                 {$p.short_descr}
               {/if}
                 <div class="details">
-                    <span class="title">Expires: </span><span class="data">{$p.expire_date.date}</span>
-                    <span class="title">Pricing: </span><span class="data">{$p.pricing}</span>
+                    <div><span class="title">Expires: </span><span class="data">{$p.expire_date.date}</span></div>
+                    <div><span class="title">Pricing: </span><span class="data">{$p.pricing}</span></div>
                 </div>
             </div>
         
@@ -105,7 +104,7 @@
 {else}
     (Sorry, no packages currently listed.)
 {/if}
-
-</div> <!-- /package list -->
+  </div> <!-- /package container -->
+</div> <!-- /package wrapper -->
 
 {include file='front/footer.html'}