From 075cb68854b656825ea40cc8608b07e9148d0783 Mon Sep 17 00:00:00 2001 From: Catapulteer Date: Tue, 1 Oct 2019 11:58:51 +0200 Subject: [PATCH] 1.0.8 - FontAwesome KIT toegevoegd - Linkedin icon toegevoegd - Header social icons op mobiel verwijderen en toevoegen in footer - logo mobiel max 140px - footer aangepaste breekpunten toegepast - kleine stijlcorrecties --- README.md | 8 ++ assets/sass/opmaak.scss | 6 +- footer.php | 159 ++++++----------------- functions.php | 32 ++--- header.php | 275 +++++++++------------------------------- style.css | 2 +- 6 files changed, 129 insertions(+), 353 deletions(-) diff --git a/README.md b/README.md index 8a2329e..804e3c8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,11 @@ +1.0.8 Bugfix +- FontAwesome KIT toegevoegd +- Linkedin icon toegevoegd +- Header social icons op mobiel verwijderen en toevoegen in footer +- logo mobiel max 140px +- footer aangepaste breekpunten toegepast +- kleine stijlcorrecties + 1.0.7 Bugfix - Functions.php aangepast en uitgebreid met alle noodzakelijke plug-ins - Extra plugin toegevoegd tbv volgorde CPT diff --git a/assets/sass/opmaak.scss b/assets/sass/opmaak.scss index 52cfd6c..e46e7b5 100644 --- a/assets/sass/opmaak.scss +++ b/assets/sass/opmaak.scss @@ -437,7 +437,7 @@ img.headerlogo { margin-left: 15px; } .navbar-brand { - width: 160px; + width: 140px; } @@ -510,7 +510,7 @@ img.headerlogo { background-position: top; } .topinfo { - /*width: 50%;*/ + width: 50%; text-align: right; height: 0; padding-top: 20px; @@ -1258,7 +1258,7 @@ input.search-field { max-height: 600px; } .topinfo { - width: 75%; + width: 70%; padding-top: 22px; } .menu:before { diff --git a/footer.php b/footer.php index 6cf5516..b474378 100644 --- a/footer.php +++ b/footer.php @@ -1,146 +1,67 @@ - - - - - - - - - - + + + - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/functions.php b/functions.php index fd87b10..61e65e1 100644 --- a/functions.php +++ b/functions.php @@ -8,21 +8,21 @@ function theme_styles() { wp_enqueue_script( 'jquery' ); /* STIJL */ - wp_enqueue_style( 'boots-4-min-style', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css'); - wp_enqueue_style( 'animate-css-style', 'https://cdn.jsdelivr.net/npm/animate.css@3.7.0/animate.min.css'); - wp_enqueue_style( 'owlslider-style', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css'); - wp_enqueue_style( 'owlslider-style-default', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.theme.default.min.css'); - wp_enqueue_style( 'fontawesome-5-style', 'https://pro.fontawesome.com/releases/v5.4.1/css/all.css'); - wp_enqueue_style( 'fancybox-css', 'https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.6/jquery.fancybox.min.css'); - wp_enqueue_style( 'opmaak-style', get_template_directory_uri() . '/assets/css/opmaak.css?v=1.2.0'); - - /* SCRIPTS */ - wp_enqueue_script( 'boots-4-script', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', '', '3.0.0' , true ); - wp_enqueue_script( 'wow', 'https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.js', array('jquery'), '1.1.2' ); - wp_enqueue_script( 'jquery-ui', 'https://code.jquery.com/ui/1.12.1/jquery-ui.js', '', '1.12.1' , true); - wp_enqueue_script( 'owlslider-script', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js', '', '2.3.4' , true ); - wp_enqueue_script( 'fancybox-script', 'https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.6/jquery.fancybox.min.js', '', '3.5.6' , true ); - wp_enqueue_script( 'eigen-script', get_template_directory_uri() . '/assets/js/scripts.js', '', '3.0.0' , true ); + wp_enqueue_style( 'boots-4-min-style', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css'); + wp_enqueue_style( 'animate-css-style', 'https://cdn.jsdelivr.net/npm/animate.css@3.7.0/animate.min.css'); + wp_enqueue_style( 'owlslider-style', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css'); + wp_enqueue_style( 'owlslider-style-default', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.theme.default.min.css'); + wp_enqueue_style( 'fancybox-css', 'https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.6/jquery.fancybox.min.css'); + wp_enqueue_style( 'opmaak-style', get_template_directory_uri() . '/assets/css/opmaak.css?v=1.2.0'); + + /* SCRIPTS */ + wp_enqueue_script( 'boots-4-script', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', '', '3.0.0' , true ); + wp_enqueue_script( 'wow', 'https://cdnjs.cloudflare.com/ajax/libs/wow/1.1.2/wow.js', array('jquery'), '1.1.2' ); + wp_enqueue_script( 'fontawesome-kit', 'https://kit.fontawesome.com/aead5e8119.js', array('jquery'), '5.11.2' ); + wp_enqueue_script( 'jquery-ui', 'https://code.jquery.com/ui/1.12.1/jquery-ui.js', '', '1.12.1' , true); + wp_enqueue_script( 'owlslider-script', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js', '', '2.3.4' , true ); + wp_enqueue_script( 'fancybox-script', 'https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.6/jquery.fancybox.min.js', '', '3.5.6' , true ); + wp_enqueue_script( 'eigen-script', get_template_directory_uri() . '/assets/js/scripts.js', '', '3.0.0' , true ); } add_action( 'wp_enqueue_scripts', 'theme_styles' ); @@ -268,7 +268,7 @@ function catapult_register_required_plugins() { 'menu_title' => __( 'Installeer plugins', 'tgmpa' ), 'installing' => __( 'Plugin installeren: %s', 'tgmpa' ), // %s = plugin name. 'oops' => __( 'Er ging iets mis met de plugin API.', 'tgmpa' ), - 'notice_can_install_required' => _n_noop( 'Dit thema is de volgende plugins nodig: %1$s.', 'Dit thema is de volgende plugins nodig: %1$s.', 'tgmpa' ), // %1$s = plugin name(s). + 'notice_can_install_required' => _n_noop( 'Dit thema heeft de volgende plugins nodig: %1$s.', 'Dit thema is de volgende plugins nodig: %1$s.', 'tgmpa' ), // %1$s = plugin name(s). 'notice_can_install_recommended' => _n_noop( 'De volgende plugins zijn optineel: %1$s.', 'De volgende plugins zijn optineel: %1$s.', 'tgmpa' ), // %1$s = plugin name(s). 'notice_cannot_install' => _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.', 'tgmpa' ), // %1$s = plugin name(s). 'notice_can_activate_required' => _n_noop( 'De volgende belangijke plugin staat uit: %1$s.', 'De volgende belangijke plugin staat uit: %1$s.', 'tgmpa' ), // %1$s = plugin name(s). diff --git a/header.php b/header.php index a6ca492..d612967 100644 --- a/header.php +++ b/header.php @@ -1,28 +1,15 @@ - > - - - - - - - - - -<?php bloginfo('name'); ?> - - - + +<?php bloginfo('name'); ?> + - - - + - - + - + - - - - - - + - +})(window,document,'script','dataLayer',''); - - - - > - - - - - - - + - - - - -
- - - - - \ No newline at end of file + diff --git a/style.css b/style.css index 79298ec..42282ff 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ Theme Name: Catent Basisschool Theme URI: https://www.catapult.nl Description: Driven by Catapult - Stichting Catent Author: Jurre Hengstman & Hans Nep -Version: 1.0.7 +Version: 1.0.8 GitHub Theme URI: https://github.com/catapultcc/catent-basisschool */