Merge release/dev to release/live #1

Merged
mischa.spelt merged 40 commits from release/dev into release/live 2024-04-25 15:49:03 +02:00
11 changed files with 144 additions and 22 deletions
Showing only changes of commit 04b4a3b3e5 - Show all commits
+32
View File
@@ -92,6 +92,38 @@ div.pp_default .pp_close:hover {
background-position: 0 -30px; background-position: 0 -30px;
} }
.light.cc_dialog button.cc_b_ok, .light.cc_dialog button.cc_b_cp {
padding: 10px 39px;
border-radius: 3px;
font-family: Nunito, serif;
font-size: 14px;
font-weight: bold;
line-height: 0.93;
text-align: center;
margin-bottom: 10px;
text-decoration: none;
text-transform: uppercase;
}
.light.cc_dialog button.cc_b_ok {
background-image: linear-gradient(to right, #0f259d, #5ba8f4);
color: #fff;
}
.light.cc_dialog .cc_dialog_headline {
font-family: Montserrat, serif;
font-weight: 600;
line-height: 1.15;
color: #282828;
}
.light.cc_dialog .cc_dialog_text {
font-family: Nunito, serif;
font-size: 15px;
line-height: 1.6;
color: #282828;
}
.header { .header {
height: 110px; height: 110px;
} }
File diff suppressed because one or more lines are too long
+1
View File
@@ -3,6 +3,7 @@
@use "container"; @use "container";
@use "../components/button"; @use "../components/button";
@use "../components/pretty_photo"; @use "../components/pretty_photo";
@use "../components/cookie";
@use "../layout"; @use "../layout";
+28
View File
@@ -0,0 +1,28 @@
.light.cc_dialog button.cc_b_ok, .light.cc_dialog button.cc_b_cp {
padding: 10px 39px;
border-radius: 3px;
font-family: Nunito, serif;
font-size: 14px;
font-weight: bold;
line-height: 0.93;
text-align: center;
margin-bottom: 10px;
text-decoration: none;
text-transform: uppercase;
}
.light.cc_dialog button.cc_b_ok {
background-image: linear-gradient(to right, #0f259d, #5ba8f4);
color: #fff;
}
.light.cc_dialog .cc_dialog_headline {
font-family: Montserrat, serif;
font-weight: 600;
line-height: 1.15;
color: #282828;
}
.light.cc_dialog .cc_dialog_text {
font-family: Nunito, serif;
font-size: 15px;
line-height: 1.6;
color: #282828;
}
@@ -0,0 +1,19 @@
@extends('layouts/full')
@section('title')
Cookie statement
@endsection
@section('breadcrumb')
<ul class="bread_crumb">
<li><a title="Home" href="/">Home</a></li>
<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
<li>Cookie statement</li>
</ul>
@endsection
@section('content')
<div class="page_body">
</div>
@endsection
+19
View File
@@ -0,0 +1,19 @@
@extends('layouts/full')
@section('title')
Disclaimer
@endsection
@section('breadcrumb')
<ul class="bread_crumb">
<li><a title="Home" href="/">Home</a></li>
<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
<li>Disclaimer</li>
</ul>
@endsection
@section('content')
<div class="page_body">
</div>
@endsection
+19 -19
View File
@@ -29,7 +29,7 @@
<div class="top_menu_container"> <div class="top_menu_container">
<ul> <ul>
<li> <li>
<a href="/contact">Tip de redactie <i class="fa-solid fa-circle-plus"></i></a> <a href="{{url('contact')}}">Tip de redactie <i class="fa-solid fa-circle-plus"></i></a>
</li> </li>
@if(isset($searchURL)) @if(isset($searchURL))
<li> <li>
@@ -78,29 +78,29 @@
<div class="col-3"> <div class="col-3">
<h4 class="box_header"><span>Contact</span></h4> <h4 class="box_header"><span>Contact</span></h4>
<p class="buttons"> <p class="buttons">
<a href="/">Contactgegevens</a> <a href="{{url('contact')}}">Contactgegevens</a>
<a href="/">Klachtenregeling</a> <a href="{{url('klachten')}}">Klachtenregeling</a>
<a href="/">Frequenties</a> <a href="{{url('frequenties')}}">Frequenties</a>
<a href="/">Adverteren</a> <a href="{{url('adverteren')}}">Adverteren</a>
<a href="/">NH Nieuws</a> <a href="https://nhnieuws.nl/" target="_blank">NH Nieuws</a>
</p> </p>
</div> </div>
<div class="col-3"> <div class="col-3">
<h4 class="box_header"><span>Kijk & luister</span></h4> <h4 class="box_header"><span>Kijk & luister</span></h4>
<p class="buttons"> <p class="buttons">
<a href="/">Luister live</a> <a class="player" href="{{url('luister/live')}}">Luister live</a>
<a href="/">Kijk live</a> <a href="{{url('kijk/live')}}">Kijk live</a>
<a href="/">Uitgelichte videos</a> <a href="/">Uitgelichte videos</a>
<a href="/">Gemist</a> <a href="{{url('gemist/fragment')}}">Gemist</a>
<a href="/">Nieuws</a> <a href="{{url('nieuws')}}">Nieuws</a>
</p> </p>
</div> </div>
<div class="col-3"> <div class="col-3">
<h4 class="box_header"><span>Radio</span></h4> <h4 class="box_header"><span>Radio</span></h4>
<p class="buttons"> <p class="buttons">
<a href="/">Programmagids</a> <a href="{{url('gids')}}">Programmagids</a>
<a href="/">Programmas</a> <a href="{{url('gemist/programma')}}">Programmas</a>
<a href="/">Podcasts</a> <a href="{{url('podcast')}}">Podcasts</a>
</p> </p>
</div> </div>
</div> </div>
@@ -108,16 +108,16 @@
<div class="col-12"> <div class="col-12">
<ul class="footer_menu2"> <ul class="footer_menu2">
<li>Logo</li> <li>Logo</li>
<li><a href="/">Disclaimer</a></li> <li><a href="{{url('disclaimer')}}">Disclaimer</a></li>
<li><a href="/">Privacy verklaring</a></li> <li><a href="{{url('privacy-verklaring')}}">Privacy verklaring</a></li>
<li><a href="/">Cookie statement</a></li> <li><a href="{{url('cookie-statement')}}">Cookie statement</a></li>
</ul> </ul>
<ul class="footer_social_media"> <ul class="footer_social_media">
<li><a class="facebook" title="Facebook" href="/"><i class="fa-brands fa-facebook-f"></i></a> <li><a class="facebook" title="Facebook" target="_blank" href="https://www.facebook.com/WijZijnNHGooi"><i class="fa-brands fa-facebook-f"></i></a>
</li> </li>
<li><a class="twitter-x" title="Twitter/X" href="/"><i class="fa-brands fa-twitter"></i></a> <li><a class="twitter-x" title="Twitter/X" target="_blank" href="https://twitter.com/nhgooi"><i class="fa-brands fa-twitter"></i></a>
</li> </li>
<li><a class="youtube" title="Youtube" href="/"><i class="fa-brands fa-youtube"></i></a></li> <li><a class="youtube" title="Youtube" target="_blank" href="https://www.youtube.com/channel/UC0qLwqmXiLoL5PrLlgB6B4Q"><i class="fa-brands fa-youtube"></i></a></li>
</ul> </ul>
</div> </div>
</div> </div>
@@ -0,0 +1,19 @@
@extends('layouts/full')
@section('title')
Privacy verklaring
@endsection
@section('breadcrumb')
<ul class="bread_crumb">
<li><a title="Home" href="/">Home</a></li>
<li class="separator"><i class="fa-solid fa-chevron-right"></i></li>
<li>Privacy verklaring</li>
</ul>
@endsection
@section('content')
<div class="page_body">
</div>
@endsection
+1 -1
View File
@@ -4,5 +4,5 @@
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vestibulum tincidunt ante id <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vestibulum tincidunt ante id
tincidunt. Cras tempus imperdiet enim ut eleifend. Donec mi nunc, molestie efficitur volutpat tincidunt. Cras tempus imperdiet enim ut eleifend. Donec mi nunc, molestie efficitur volutpat
eu, pretium in enim. Vivamus suscipit massa at urna mollis.</p> eu, pretium in enim. Vivamus suscipit massa at urna mollis.</p>
<a class="read_more" href="#">Lees meer <i class="fa-solid fa-angle-right"></i></a> <a class="read_more" href="{{url('contact')}}">Lees meer <i class="fa-solid fa-angle-right"></i></a>
</div> </div>
+1 -1
View File
@@ -21,7 +21,7 @@
// "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"), // "Vroeger of Later Luisterlijst (2 januari)" => "/vol-luisterlijst"),
"App" => "/app", "App" => "/app",
"Podcast" => array( "Podcast" => array(
"" => "/podcast/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3", "" => "/podcast",
"Waterschapsverkiezing 2023" => "/podcast/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3", "Waterschapsverkiezing 2023" => "/podcast/fragment/1356528/podcast-waterschapsverkiezingen-2023.mp3",
"NH Gooi Spreekuur" => "/podcast/1091/nh-gooi-spreekuur", "NH Gooi Spreekuur" => "/podcast/1091/nh-gooi-spreekuur",
"Duurzaam Gooi" => "/podcast/1076/podcast-duurzaam-gooi" "Duurzaam Gooi" => "/podcast/1076/podcast-duurzaam-gooi"
+4
View File
@@ -91,6 +91,10 @@ Route::get('/adverteren', 'Controller@view_adverteren')->name('adverteren');
Route::get('/klachten', 'Controller@view_klachten')->name('klachten'); Route::get('/klachten', 'Controller@view_klachten')->name('klachten');
Route::get('/app', 'Controller@view_app')->name('app'); Route::get('/app', 'Controller@view_app')->name('app');
Route::get('/disclaimer', 'Controller@view_disclaimer')->name('disclaimer');
Route::get('/privacy-verklaring', 'Controller@view_privacy_verklaring')->name('privacy_verklaring');
Route::get('/cookie-statement', 'Controller@view_cookie_statement')->name('cookie_statement');
Route::get('/vacatures/ontmoet-ons', 'JobsController@bijeenkomst'); Route::get('/vacatures/ontmoet-ons', 'JobsController@bijeenkomst');
Route::post('/vacatures/ontmoet-ons', 'JobsController@aanmelden'); Route::post('/vacatures/ontmoet-ons', 'JobsController@aanmelden');
Route::get('/vacatures', 'JobsController@overview')->name('vacatures'); Route::get('/vacatures', 'JobsController@overview')->name('vacatures');