Update homepage boxes to always wrap contents

This will not ensure that the boxes are always the same height. JavaScript will be required if that is the case.
ckan · May 8, 2012 · 284d7ba · 284d7ba
1 parent 20d06d6
commit 284d7ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css
@@ -422,8 +422,11 @@ body.index.home .front-page .action-box {
   background:  #FFF7C0;
 }
 body.index.home .front-page .action-box-inner {
-  margin: 0 20px 5px;
-  min-height: 15em;
+  padding: 0 20px 20px;
+  min-height: 13.4em;
+}
+body.index.home .front-page .action-box-inner :last-child {
+  margin-bottom: 0;
 }
 body.index.home .front-page .action-box-inner.collaborate {
   background:url(../img/collaborate.png) no-repeat right top;
@@ -456,7 +459,6 @@ body.index.home .front-page .action-box-inner .create-button {
   float: right;
   font-weight: normal;
   font-family: 'Ubuntu';
-  margin-top: 1.5em;
   border-radius: 10px;
   background-color: #B22;
   border: 0px;

diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
@@ -15,24 +15,24 @@ <h1 class="page_heading">Welcome to ${g.site_title}!</h1>
     <div class="row">
       <div class="span4">
         <div class="action-box">
-          <div class="action-box-inner find">
+          <div class="action-box-inner find clearfix">
             <h1>Find data</h1>
 
             <form action="${h.url_for(controller='package', action='search')}" method="GET"> 
               <input name="q" value="" class="search-field" placeholder="${_('Find datasets')}" /> 
             </form> 
-            ${g.site_title} contains <a href="${h.url_for(controller='package', action='search')}">${c.package_count} datasets</a> that you can 
-            browse, learn about and download. 
+            <p>${g.site_title} contains <a href="${h.url_for(controller='package', action='search')}">${c.package_count} datasets</a> that you can 
+            browse, learn about and download.</p>
           </div>
         </div>
       </div>
       <div class="span4">
         <div class="action-box">
-          <div class="action-box-inner share">
+          <div class="action-box-inner share clearfix">
           <h1>Share data</h1>
 
-          Add your own datasets to share them with others and
-          to find other people interested in your data.
+          <p>Add your own datasets to share them with others and
+          to find other people interested in your data.</p>
 
           <py:choose test="h.check_access('package_create')">
             <a py:when="" href="${h.url_for(controller='package', action='new')}" class="create-button">Create a dataset &raquo;</a>
@@ -45,11 +45,11 @@ <h1>Share data</h1>
       </div>
       <div class="span4">
         <div class="action-box">
-          <div class="action-box-inner collaborate">
+          <div class="action-box-inner collaborate clearfix">
           <h1>Collaborate</h1>
 
-          Find out more about working with open data by exploring 
-          these resources: 
+          <p>Find out more about working with open data by exploring 
+          these resources:</p>
           <ul>
             <li><a href="http://getthedata.org">GetTheData.org</a></li>
             <li><a href="http://datapatterns.org">DataPatterns.org</a></li>