Merge pull request 'Correcties voor banner placement' (#10) from dev into main

Reviewed-on: #10

public/css/style.css

@@ -958,13 +958,6 @@ div.pp_default .pp_close:hover {
   color: #282828;
 }
 
-ins[data-revive-zoneid="2"] {
-  width: 100%;
-  height: 275px;
-  margin: 11px auto 50px auto;
-  background-color: #efefef;
-}
-
 @media (max-width: 768px) {
   .sidebar {
     width: 100%;
@@ -1174,10 +1167,14 @@ ins[data-revive-zoneid="2"] {
   white-space: nowrap;
 }
 
-ins[data-revive-zoneid] {
+@media (max-width: 576px) {
-  margin-top: -30px;
+  ins[data-revive-zoneid] img {
-  text-align: center;
+    max-width: 100%;
-  margin-bottom: 30px;
+    height: auto;
+  }
+}
+.homepage-body-banners {
+  margin-top: -4rem;
 }
 
 .news .blog .post {

public/css/style.css.map

@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../resources/assets/sass/abstracts/_fonts.scss","../../resources/assets/sass/base/_clearfix.scss","../../resources/assets/sass/base/_container.scss","../../resources/assets/sass/abstracts/_mixin.scss","../../resources/assets/sass/abstracts/_variables.scss","../../resources/assets/sass/components/_button.scss","../../resources/assets/sass/components/_pretty_photo.scss","../../resources/assets/sass/components/_cookie.scss","../../resources/assets/sass/components/_list.scss","../../resources/assets/sass/components/_banners.scss","../../resources/assets/sass/components/_header.scss","../../resources/assets/sass/components/_menu.scss","../../resources/assets/sass/components/_now-playing.scss","../../resources/assets/sass/components/_main_news.scss","../../resources/assets/sass/components/_box.scss","../../resources/assets/sass/components/_blog.scss","../../resources/assets/sass/components/_sidebar.scss","../../resources/assets/sass/components/_radio_box.scss","../../resources/assets/sass/components/_contact_box.scss","../../resources/assets/sass/components/_featured.scss","../../resources/assets/sass/components/_podcast_items.scss","../../resources/assets/sass/layout/_home.scss","../../resources/assets/sass/layout/_news.scss","../../resources/assets/sass/components/_bread_crumb.scss","../../resources/assets/sass/components/_page_title.scss","../../resources/assets/sass/components/_post.scss","../../resources/assets/sass/components/_schedule.scss","../../resources/assets/sass/components/_page.scss","../../resources/assets/sass/components/_input.scss","../../resources/assets/sass/components/_podcast_item.scss","../../resources/assets/sass/components/_media.scss","../../resources/assets/sass/components/_footer.scss","../../resources/assets/sass/base/_base.scss"],"names":[],"mappings":";AAAQ;AACA;AACA;ACFR;EACE;EACA;EACA;;;ACAF;EACE;EACA;;;AAKF;ECPE;EACA;EDQA;EAIA,kBEfa;;AFYb;EAHF;IAII;;;;AAIJ;ECfE;EACA;;;ADiBF;EACE;IACE,kBEtBW;;;AFyBf;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;IACE;;EAEF;IACE;;;AGtCJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,ODJoB;ECKpB;EACA;EACA;;AAEA;EACE,ODVkB;;ACapB;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;;AAEF;EACE;EACA;;;ACnCJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EASE;EACA;;;AAEF;EAEE;;;AAEF;EAEE;EACA;EACA;EACA;EACA,OFXuB;;;AEazB;EAEE;EACA;;;AAEF;EAEE;EACA;;;AChCF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA,OHPoB;;;AGStB;EACE;EACA;EACA;EACA,OHXgB;;;AGalB;EACE;EACA;EACA;EACA,OHjBgB;;;AIVlB;ELME;EACA;EACA;;;AMTF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;ACPF;EACE;;AACA;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;;;AAIJ;EACE;IACE;;;AAGJ;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAIN;EACE;IACE;;;AC/BF;EADF;IAEI;IACA;;;AAGF;EACE;;AACA;EACE;EACA;EACA;EACA;;AAIJ;ERZA;EACA;EACA;EQYE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA,OPnCK;EOoCL,aPxCU;EOyCV,WPxCQ;EOyCR;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAMV;EACE;ERtGA;EACA;EQuGA;;AAEA;EACE;ERvGF;EACA;EACA;;AQwGE;EACE;EACA;EACA;EACA;EACA;EACA;AAYA;AAAA;AAAA;;AAVA;EACE;EACA;;AAGF;EACE;EACA;;AAOF;EACE;EACA;EACA;EACA;EACA;EACA,OPpIc;EOqId;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE,MPrJY;EOsJZ;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA,kBP3KG;EO4KH;EACA;EACA;EACA;EACA,OPpLG;;AOsLL;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;;AAEA;EACE;;AAGA;EACE;;AAIJ;EACE;;AACA;EACE;EACA;;AAEF;EACE;;AAIJ;EACE;;;AAOV;EACE;;AAEA;EACE;EACA;;AAGF;ERtQA;EACA;EACA;;AQsQE;EACE;EACA;EACA;EACA;EACA,OP5QO;EO6QP;EACA;EACA;EACA;;AAEF;EACE;;AAIJ;EACE;EACA;EACA;EACA,kBPvRS;EOwRT;EACA;EACA;;AAGE;EACE;;AACA;EACE;;AAIN;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAMR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAKR;EACE;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;EACA;;;AAKE;EACE,YPpbS;EOqbT,cPrbS;;AO2bT;EACE,YP5bO;;AOgcP;EACE,kBPjcK;;AOscP;EACE,YPvcK;;;AQDf;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC9CV;EADF;IAEI;IACA;AAKA;AAMA;;EAVA;IACE;;EAIF;IACE;IACA;;EAIF;IACE;IACA;;EAEF;IACE;;;AAGJ;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACLine truncated
+{"version":3,"sourceRoot":"","sources":["../../resources/assets/sass/abstracts/_fonts.scss","../../resources/assets/sass/base/_clearfix.scss","../../resources/assets/sass/base/_container.scss","../../resources/assets/sass/abstracts/_mixin.scss","../../resources/assets/sass/abstracts/_variables.scss","../../resources/assets/sass/components/_button.scss","../../resources/assets/sass/components/_pretty_photo.scss","../../resources/assets/sass/components/_cookie.scss","../../resources/assets/sass/components/_list.scss","../../resources/assets/sass/components/_banners.scss","../../resources/assets/sass/components/_header.scss","../../resources/assets/sass/components/_menu.scss","../../resources/assets/sass/components/_now-playing.scss","../../resources/assets/sass/components/_main_news.scss","../../resources/assets/sass/components/_box.scss","../../resources/assets/sass/components/_blog.scss","../../resources/assets/sass/components/_sidebar.scss","../../resources/assets/sass/components/_radio_box.scss","../../resources/assets/sass/components/_contact_box.scss","../../resources/assets/sass/components/_featured.scss","../../resources/assets/sass/components/_podcast_items.scss","../../resources/assets/sass/layout/_home.scss","../../resources/assets/sass/layout/_news.scss","../../resources/assets/sass/components/_bread_crumb.scss","../../resources/assets/sass/components/_page_title.scss","../../resources/assets/sass/components/_post.scss","../../resources/assets/sass/components/_schedule.scss","../../resources/assets/sass/components/_page.scss","../../resources/assets/sass/components/_input.scss","../../resources/assets/sass/components/_podcast_item.scss","../../resources/assets/sass/components/_media.scss","../../resources/assets/sass/components/_footer.scss","../../resources/assets/sass/base/_base.scss"],"names":[],"mappings":";AAAQ;AACA;AACA;ACFR;EACE;EACA;EACA;;;ACAF;EACE;EACA;;;AAKF;ECPE;EACA;EDQA;EAIA,kBEfa;;AFYb;EAHF;IAII;;;;AAIJ;ECfE;EACA;;;ADiBF;EACE;IACE,kBEtBW;;;AFyBf;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;IACE;;EAEF;IACE;;;AGtCJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA,ODJoB;ECKpB;EACA;EACA;;AAEA;EACE,ODVkB;;ACapB;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;;AAEF;EACE;EACA;;;ACnCJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;EASE;EACA;;;AAEF;EAEE;;;AAEF;EAEE;EACA;EACA;EACA;EACA,OFXuB;;;AEazB;EAEE;EACA;;;AAEF;EAEE;EACA;;;AChCF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA,OHPoB;;;AGStB;EACE;EACA;EACA;EACA,OHXgB;;;AGalB;EACE;EACA;EACA;EACA,OHjBgB;;;AIVlB;ELME;EACA;EACA;;;AMTF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;ACPF;EACE;;AACA;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;;;AAIJ;EACE;IACE;;;AAGJ;EACE;IACE;;EACA;IACE;;EAEF;IACE;;;AAIN;EACE;IACE;;;AC/BF;EADF;IAEI;IACA;;;AAGF;EACE;;AACA;EACE;EACA;EACA;EACA;;AAIJ;ERZA;EACA;EACA;EQYE;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;;AAGF;EACE;;AAGF;EACE;EACA;EACA,OPnCK;EOoCL,aPxCU;EOyCV,WPxCQ;EOyCR;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIJ;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAMV;EACE;ERtGA;EACA;EQuGA;;AAEA;EACE;ERvGF;EACA;EACA;;AQwGE;EACE;EACA;EACA;EACA;EACA;EACA;AAYA;AAAA;AAAA;;AAVA;EACE;EACA;;AAGF;EACE;EACA;;AAOF;EACE;EACA;EACA;EACA;EACA;EACA,OPpIc;EOqId;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAGF;EACE;EACA;;AAGF;EACE,MPrJY;EOsJZ;EACA;EACA;EACA;EACA;;AAGF;EACE;EACA;EACA;EACA;;AAIJ;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;EACA,kBP3KG;EO4KH;EACA;EACA;EACA;EACA,OPpLG;;AOsLL;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;;AAEE;EACE;EACA;;AAEA;EACE;;AAGA;EACE;;AAIJ;EACE;;AACA;EACE;EACA;;AAEF;EACE;;AAIJ;EACE;;;AAOV;EACE;;AAEA;EACE;EACA;;AAGF;ERtQA;EACA;EACA;;AQsQE;EACE;EACA;EACA;EACA;EACA,OP5QO;EO6QP;EACA;EACA;EACA;;AAEF;EACE;;AAIJ;EACE;EACA;EACA;EACA,kBPvRS;EOwRT;EACA;EACA;;AAGE;EACE;;AACA;EACE;;AAIN;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAMR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;;AAGF;EACE;;AAGF;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;;AAKR;EACE;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAKJ;EACE;EACA;EACA;EACA;;AAGF;EACE;EACA;;;AAIJ;EACE;EACA;;;AAKE;EACE,YPpbS;EOqbT,cPrbS;;AO2bT;EACE,YP5bO;;AOgcP;EACE,kBPjcK;;AOscP;EACE,YPvcK;;;AQDf;EACE;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACE;;;AC9CV;EADF;IAEI;IACA;AAKA;AAMA;;EAVA;IACE;;EAIF;IACE;IACA;;EAIF;IACE;IACA;;EAEF;IACE;;;AAGJ;EACE;EACA;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AACA;EAJF;IAKI;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAGF;EACE;;AAGF;EACE;EACA;EACA;EACLine truncated

resources/assets/sass/components/_sidebar.scss

@@ -1,10 +1,3 @@
-ins[data-revive-zoneid="2"] {
-  width: 100%;
-  height: 275px;
-  margin: 11px auto 50px auto;
-  background-color: #efefef;
-}
-
 @media (max-width: 768px) {
   .sidebar {
     width: 100%;

resources/assets/sass/layout/_home.scss

@@ -7,15 +7,13 @@
 @use "../components/featured";
 @use "../components/podcast_items";
 
-ins[data-revive-zoneid] {
-  margin-top: -30px;
-  text-align: center;
-  margin-bottom: 30px;
-}
-
 @media (max-width: 576px) {
-  ins[data-revive-zoneid] {
+  ins[data-revive-zoneid] img {
     max-width: 100%;
     height: auto;
   }
 }
+
+.homepage-body-banners {
+  margin-top: -4rem;
+}

resources/views/home.blade.php

@@ -136,8 +136,10 @@
         <div class="grey_background">
             <div class="body_container row">
                 @if(!isset($disableBanners) || !$disableBanners)
-                    <ins data-revive-zoneid="3" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+                    <div class="homepage-body-banners d-none d-md-flex justify-content-center mb-4">
-                    <ins data-revive-zoneid="4" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+                        <ins data-revive-zoneid="3" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+                        <ins data-revive-zoneid="4" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+                    </div>
                 @endif
                 <div class="col-12 col-md content_container">
                     <div class="row">
@@ -217,8 +219,6 @@
                     @include('widgets.banner_sidebar')
 
                     @include('widgets/contact', [])
-
-                    @include('widgets.banner_sidebar')
                 </div>
             </div>
         </div>

resources/views/layouts/master.blade.php

@@ -88,6 +88,12 @@
         @include('widgets.menu')
     </div>
 
+    @if(!isset($disableBanners) || !$disableBanners)
+        <div class="mobile-banner-fullwidth d-flex d-md-none justify-content-center mt-4">
+            <ins data-revive-zoneid="6" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+        </div>
+    @endif
+
     <!-- Content -->
 
     <div class="page @yield('page_container_class')">

resources/views/layouts/sidebar.blade.php

@@ -58,13 +58,11 @@
                         </div>
                     @endif
 
-                    @include('widgets.banner_sidebar')
-
                     @include('widgets/nhgooiradiotv', ['headerClass' => 'small'])
 
-                    @include('widgets/contact', [])
-
                     @include('widgets.banner_sidebar')
+
+                    @include('widgets/contact', [])
                 @show
             </div>
         </div>

resources/views/news.blade.php

@@ -41,18 +41,16 @@
                 <div class="col-12 col-md-auto sidebar">
                     @include('widgets/nhgooiradiotv', ['headerClass' => 'small'])
 
-                    @include('widgets/contact', [])
-
                     @include('widgets.banner_sidebar')
 
+                    @include('widgets/contact', [])
+
                     <div class="podcast_items">
                         <h4 class="box_header small"><span>Fragment gemist</span></h4>
                         <div class="box">
                             @include('partial/podcastitems', ['showTime' => false, 'showImage' => false, 'podcasts' => $podcasts, 'isPodcast' => false])
                         </div>
                     </div>
-
-                    @include('widgets.banner_sidebar')
                 </div>
             </div>
         </div>

resources/views/widgets/banner_sidebar.blade.php

@@ -1,3 +1,5 @@
 @if (!isset($disableBanners) || !$disableBanners)
-    <ins data-revive-zoneid="2" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+    <div class="d-flex justify-content-center my-4">
+        <ins data-revive-zoneid="2" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
+    </div>
 @endif

resources/views/widgets/menu.blade.php

@@ -146,9 +146,3 @@ function buildMenu($menu, $ismobile)
 	</ul>
 	</nav>
 </div>
-@if(!isset($disableBanners) || !$disableBanners)
-	<div class="mobile-banner-fullwidth d-flex d-md-none">
-		<ins data-revive-zoneid="6" data-revive-id="{{ env('REVIVE_ID') }}"></ins>
-	</div>
-@endif
-

resources/views/widgets/nhgooiradiotv.blade.php

@@ -5,7 +5,7 @@
         <h4 data-tab-content-id="tab_gooi_tv_live" class="box_header {{$headerClass ?? ''}}">
             <span>NH Gooi TV live</span></h4>
     </div>
-    <div id="tab_gooi_radio_live" class="tab_content active box radio_box">
+    <div id="tab_gooi_radio_live" class="tab_content active box radio_box mb-0">
         <img class="logo-radio" src="/images/logo-NHGooi-radio.svg"/>
         @include('widgets.nustraks')
         <a class="btn" href="/gids">Programmering</a>
@@ -13,7 +13,7 @@
         <a class="btn player" href="/luister/live">Luister live</a>
         <a class="btn" href="/kijk/live">Kijk live mee</a>
     </div>
-    <div id="tab_gooi_tv_live" class="tab_content box radio_box">
+    <div id="tab_gooi_tv_live" class="tab_content box radio_box mb-0">
         <img class="logo-radio" src="/images/logo-NHGooi-televisie.svg"/>
         <h2 class="post_title">Live</h2>
         @include('widgets.mediaplayer')