Standardise use of .business-section__secondary__item

Ensuring that each item in the business section sidebar is wrapped in a .business-section__secondary__item allows us to simplify the vertical spacing styles, and prevents awkward double space above calendars.
mysociety · Mar 11, 2021 · f832dac · f832dac
1 parent dfbeaa3
commit f832dac
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/www/docs/style/sass/pages/_business.scss b/www/docs/style/sass/pages/_business.scss
@@ -97,9 +97,12 @@
     }
 
     .rss-feed {
-        margin-top: 2em;
         font-size: 0.8em;
     }
+
+    .calendar {
+        margin: 1em 0 2em 0;
+    }
 }
 
 .business-section__secondary__item {
@@ -114,9 +117,7 @@
     }
 }
 
-.business-section__secondary__item + .business-section__secondary__item,
-.business-section__secondary .calendar,
-.business-section__secondary .minisurvey {
+.business-section__secondary__item + .business-section__secondary__item {
     margin-top: 2em;
 
     @media (min-height: 700px) {

diff --git a/www/includes/easyparliament/templates/html/section/_business_section.php b/www/includes/easyparliament/templates/html/section/_business_section.php
@@ -14,18 +14,24 @@
                         <h3>What is this?</h3>
                         <?php include '_' . $section . '_desc.php'; ?>
                     </div>
-                <?php
-                $calendar = $content['calendar']['years'];
-                include '_calendar_section.php';
-                if ( !isset($no_survey) ) {
-                    include( dirname(__FILE__) . '/../sidebar/looking_for.php' );
-                }
-                ?>
-                <?php if ( isset($content['rssurl']) ) { ?>
-                <p class="rss-feed">
-                    <a href="<?= WEBPATH . $content['rssurl'] ?>">RSS feed of <?= $title ?></a>
-                </p>
-                <?php } ?>
+                    <div class="business-section__secondary__item">
+                        <?php
+                        $calendar = $content['calendar']['years'];
+                        include '_calendar_section.php';
+                        ?>
+                    </div>
+                  <?php if ( !isset($no_survey) ) { ?>
+                    <div class="business-section__secondary__item">
+                        <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ); ?>
+                    </div>
+                  <?php } ?>
+                  <?php if ( isset($content['rssurl']) ) { ?>
+                    <div class="business-section__secondary__item">
+                        <p class="rss-feed">
+                            <a href="<?= WEBPATH . $content['rssurl'] ?>">RSS feed of <?= $title ?></a>
+                        </p>
+                    </div>
+                  <?php } ?>
                 </div>
             <?php } else { ?>
              <div class="business-section__primary">

diff --git a/www/includes/easyparliament/templates/html/section/day.php b/www/includes/easyparliament/templates/html/section/day.php
@@ -72,10 +72,12 @@
                 <h3>What is this?</h3>
                 <?php include '_' . $section . '_desc.php'; ?>
             </div>
-            <?php
-                include '_calendar_section.php';
-                include( dirname(__FILE__) . '/../sidebar/looking_for.php' );
-            ?>
+            <div class="business-section__secondary__item">
+                <?php include '_calendar_section.php'; ?>
+            </div>
+            <div class="business-section__secondary__item">
+                <?php include( dirname(__FILE__) . '/../sidebar/looking_for.php' ); ?>
+            </div>
         </div>
       <?php } else { ?>
         <div class="business-section__primary">