From b7d22c9d2e5aa6b548b6d7d4edc0d4cf254775c4 Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Sun, 30 May 2021 12:15:30 +0200
Subject: [PATCH] Removed all Goole Fonts related patches to themes
We have now a must-use plugin which prevents Google Fonts from being loaded,
so these should not be necessary anymore (see #25).
---
composer.lock | 29 +-
composer.patches.json | 27 +-
...entythirteen-footer-and-google-fonts.patch | 86 ----
.../0165-twentytwelve-google-fonts.patch | 43 --
patches/themes/0187-twentyseventeen.patch | 26 --
...ed-googleapis-fonts-from-bliss-theme.patch | 383 ------------------
.../themes/twentythirteen-google-fonts.patch | 45 --
7 files changed, 20 insertions(+), 619 deletions(-)
delete mode 100644 patches/themes/0165-twentythirteen-footer-and-google-fonts.patch
delete mode 100644 patches/themes/0165-twentytwelve-google-fonts.patch
delete mode 100644 patches/themes/0187-twentyseventeen.patch
delete mode 100644 patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch
delete mode 100644 patches/themes/twentythirteen-google-fonts.patch
diff --git a/composer.lock b/composer.lock
index 555b1ca8..43328756 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3272aec501b17fa53ec92516b2624047",
+ "content-hash": "b88e1e842c3098ed0641831b88cb0cf6",
"packages": [
{
"name": "bjornjohansen/wplang",
@@ -1438,8 +1438,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Remove Google Fonts API": "patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch",
- "Change footer": "patches/themes/0223-bliss-footer.patch"
+ "Footer credits": "patches/themes/0223-bliss-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/bliss/"
@@ -1884,7 +1883,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Change footer": "patches/themes/0223-thematic-footer.patch"
+ "Footer credits": "patches/themes/0223-thematic-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/thematic/"
@@ -1930,7 +1929,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Rheme footer": "patches/themes/0165-twentyeleven-footer.patch"
+ "Footer credits": "patches/themes/0165-twentyeleven-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyeleven/"
@@ -1953,7 +1952,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyfifteen.patch"
+ "Footer credits": "patches/themes/0187-twentyfifteen.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyfifteen/"
@@ -1976,7 +1975,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyfourteen.patch"
+ "Footer credits": "patches/themes/0187-twentyfourteen.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyfourteen/"
@@ -2015,11 +2014,6 @@
"composer/installers": "~1.0"
},
"type": "wordpress-theme",
- "extra": {
- "patches_applied": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyseventeen.patch"
- }
- },
"homepage": "https://wordpress.org/themes/twentyseventeen/"
},
{
@@ -2040,8 +2034,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentysixteen.patch",
- "Footer": "patches/themes/0223-twentysixteen-footer.patch"
+ "Footer credits": "patches/themes/0223-twentysixteen-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentysixteen/"
@@ -2064,7 +2057,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyten.patch"
+ "Footer credits": "patches/themes/0187-twentyten.patch"
}
},
"homepage": "https://wordpress.org/themes/twentyten/"
@@ -2087,8 +2080,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Theme footer": "patches/themes/0165-twentythirteen-footer.patch",
- "Remove Google Fonts API": "patches/themes/twentythirteen-google-fonts.patch"
+ "Footer credits": "patches/themes/0165-twentythirteen-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentythirteen/"
@@ -2111,8 +2103,7 @@
"type": "wordpress-theme",
"extra": {
"patches_applied": {
- "Theme footer": "patches/themes/0165-twentytwelve-footer.patch",
- "Remove Google Fonts API": "patches/themes/0165-twentytwelve-google-fonts.patch"
+ "Footer credits": "patches/themes/0165-twentytwelve-footer.patch"
}
},
"homepage": "https://wordpress.org/themes/twentytwelve/"
diff --git a/composer.patches.json b/composer.patches.json
index 1931c455..e33d28b8 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -107,38 +107,31 @@
"Theme footer": "patches/themes/0090-Patch-theme-wp-andreas01.patch"
},
"wpackagist-theme/twentyten": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyten.patch"
+ "Footer credits": "patches/themes/0187-twentyten.patch"
},
"wpackagist-theme/twentyeleven": {
- "Rheme footer": "patches/themes/0165-twentyeleven-footer.patch"
+ "Footer credits": "patches/themes/0165-twentyeleven-footer.patch"
},
"wpackagist-theme/twentytwelve": {
- "Theme footer": "patches/themes/0165-twentytwelve-footer.patch",
- "Remove Google Fonts API": "patches/themes/0165-twentytwelve-google-fonts.patch"
+ "Footer credits": "patches/themes/0165-twentytwelve-footer.patch"
},
"wpackagist-theme/twentythirteen": {
- "Theme footer": "patches/themes/0165-twentythirteen-footer.patch",
- "Remove Google Fonts API": "patches/themes/twentythirteen-google-fonts.patch"
+ "Footer credits": "patches/themes/0165-twentythirteen-footer.patch"
},
"wpackagist-theme/twentyfourteen": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyfourteen.patch"
+ "Footer credits": "patches/themes/0187-twentyfourteen.patch"
},
"wpackagist-theme/twentyfifteen": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyfifteen.patch"
+ "Footer credits": "patches/themes/0187-twentyfifteen.patch"
},
- "wpackagist-theme/twentysixteen": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentysixteen.patch",
- "Footer": "patches/themes/0223-twentysixteen-footer.patch"
- },
- "wpackagist-theme/twentyseventeen": {
- "Remove Google Fonts API and resource hints": "patches/themes/0187-twentyseventeen.patch"
+ "wpackagist-theme/twentysixteen": {
+ "Footer credits": "patches/themes/0223-twentysixteen-footer.patch"
},
"wpackagist-theme/bliss": {
- "Remove Google Fonts API": "patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch",
- "Change footer": "patches/themes/0223-bliss-footer.patch"
+ "Footer credits": "patches/themes/0223-bliss-footer.patch"
},
"wpackagist-theme/thematic": {
- "Change footer": "patches/themes/0223-thematic-footer.patch"
+ "Footer credits": "patches/themes/0223-thematic-footer.patch"
}
}
diff --git a/patches/themes/0165-twentythirteen-footer-and-google-fonts.patch b/patches/themes/0165-twentythirteen-footer-and-google-fonts.patch
deleted file mode 100644
index 724e8376..00000000
--- a/patches/themes/0165-twentythirteen-footer-and-google-fonts.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php
-index 858f110b..5bf69ea3 100644
---- a/wp-content/themes/twentythirteen/footer.php
-+++ b/wp-content/themes/twentythirteen/footer.php
-@@ -16,14 +16,14 @@
-
- <div class="site-info">
- <?php do_action( 'twentythirteen_credits' ); ?>
-+
- <?php
- if ( function_exists( 'the_privacy_policy_link' ) ) {
- the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
- }
- ?>
-- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>" class="imprint">
-- <?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?>
-- </a>
-+ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
-+
- </div><!-- .site-info -->
- </footer><!-- #colophon -->
- </div><!-- #page -->
-diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
-index 596b5dc02..60c93029d 100644
---- a/wp-content/themes/twentythirteen/functions.php
-+++ b/wp-content/themes/twentythirteen/functions.php
-@@ -221,15 +221,15 @@ add_action( 'after_setup_theme', 'twentythirteen_setup' );
- function twentythirteen_fonts_url() {
- $fonts_url = '';
-
-- /*
-- * translators: If there are characters in your language that are not supported
-- * by Source Sans Pro, translate this to 'off'. Do not translate into your own language.
-+ /* Translators: If there are characters in your language that are not
-+ * supported by Source Sans Pro, translate this to 'off'. Do not translate
-+ * into your own language.
- */
- $source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
-
-- /*
-- * translators: If there are characters in your language that are not supported
-- * by Bitter, translate this to 'off'. Do not translate into your own language.
-+ /* Translators: If there are characters in your language that are not
-+ * supported by Bitter, translate this to 'off'. Do not translate into your
-+ * own language.
- */
- $bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
-
-@@ -247,11 +247,12 @@ function twentythirteen_fonts_url() {
- $query_args = array(
- 'family' => urlencode( implode( '|', $font_families ) ),
- 'subset' => urlencode( 'latin,latin-ext' ),
-- 'display' => urlencode( 'fallback' ),
- );
-- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-+ $fonts_url = add_query_arg( $query_args, '' );
- }
-
-+/*AI fix - tolto google font */
-+
- return $fonts_url;
- }
-
-@@ -304,21 +305,8 @@ add_action( 'wp_enqueue_scripts', 'twentythirteen_scripts_styles' );
- * @param string $relation_type The relation type the URLs are printed.
- * @return array URLs to print for resource hints.
- */
--function twentythirteen_resource_hints( $urls, $relation_type ) {
-- if ( wp_style_is( 'twentythirteen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
-- if ( version_compare( $GLOBALS['wp_version'], '4.7-alpha', '>=' ) ) {
-- $urls[] = array(
-- 'href' => 'https://fonts.gstatic.com',
-- 'crossorigin',
-- );
-- } else {
-- $urls[] = 'https://fonts.gstatic.com';
-- }
-- }
-
-- return $urls;
--}
--add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
-+ /* AI fix google fonts */
-
- /**
- * Enqueue styles for the block-based editor.
diff --git a/patches/themes/0165-twentytwelve-google-fonts.patch b/patches/themes/0165-twentytwelve-google-fonts.patch
deleted file mode 100644
index b6c0bcc3..00000000
--- a/patches/themes/0165-twentytwelve-google-fonts.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- functions.php 2021-05-17 17:18:17.962138832 +0200
-+++ functions.php 2021-05-17 17:17:45.839103954 +0200
-@@ -144,37 +144,10 @@
- */
- function twentytwelve_get_font_url() {
- $font_url = '';
-+ /* REMOVED GoogleApis*/
-+
-+ return $font_url;
-
-- /*
-- * translators: If there are characters in your language that are not supported
-- * by Open Sans, translate this to 'off'. Do not translate into your own language.
-- */
-- if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
-- $subsets = 'latin,latin-ext';
--
-- /*
-- * translators: To add an additional Open Sans character subset specific to your language,
-- * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
-- */
-- $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
--
-- if ( 'cyrillic' === $subset ) {
-- $subsets .= ',cyrillic,cyrillic-ext';
-- } elseif ( 'greek' === $subset ) {
-- $subsets .= ',greek,greek-ext';
-- } elseif ( 'vietnamese' === $subset ) {
-- $subsets .= ',vietnamese';
-- }
--
-- $query_args = array(
-- 'family' => urlencode( 'Open Sans:400italic,700italic,400,700' ),
-- 'subset' => urlencode( $subsets ),
-- 'display' => urlencode( 'fallback' ),
-- );
-- $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-- }
--
-- return $font_url;
- }
-
- /**
diff --git a/patches/themes/0187-twentyseventeen.patch b/patches/themes/0187-twentyseventeen.patch
deleted file mode 100644
index caeba80a..00000000
--- a/patches/themes/0187-twentyseventeen.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- functions.php 2021-04-27 02:44:06.000000000 +0200
-+++ functions.php 2021-05-08 15:16:31.037502297 +0200
-@@ -306,7 +306,7 @@
- 'display' => urlencode( 'fallback' ),
- );
-
-- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-+ // $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
- }
-
- return esc_url_raw( $fonts_url );
-@@ -322,12 +322,12 @@
- * @return array URLs to print for resource hints.
- */
- function twentyseventeen_resource_hints( $urls, $relation_type ) {
-- if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
-+ /* if ( wp_style_is( 'twentyseventeen-fonts', 'queue' ) && 'preconnect' === $relation_type ) {
- $urls[] = array(
- 'href' => 'https://fonts.gstatic.com',
- 'crossorigin',
- );
-- }
-+ } */
-
- return $urls;
- }
diff --git a/patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch b/patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch
deleted file mode 100644
index 674ab0a0..00000000
--- a/patches/themes/0189-removed-googleapis-fonts-from-bliss-theme.patch
+++ /dev/null
@@ -1,383 +0,0 @@
-From 481d406830fba4e409e29d5638fb1cec1154ccc6 Mon Sep 17 00:00:00 2001
-From: lucha <lucha@paranoici.org>
-Date: Sun, 23 Aug 2015 16:25:17 +0200
-Subject: [PATCH 189/229] removed googleapis fonts from bliss theme
-
----
- wp-content/themes/bliss/footer.php | 31 ++++----
- wp-content/themes/bliss/functions.php | 101 +++++++++++++-------------
- 2 files changed, 64 insertions(+), 68 deletions(-)
-
-diff --git a/wp-content/themes/bliss/footer.php b/wp-content/themes/bliss/footer.php
-index 40149f9d..4d6c2e96 100644
---- a/wp-content/themes/bliss/footer.php
-+++ b/wp-content/themes/bliss/footer.php
-@@ -4,7 +4,7 @@
-
- <footer class="site-footer">
- <div class="content">
--
-+
- <?php
- wp_nav_menu(array(
- 'theme_location' => 'footer-nav',
-@@ -12,14 +12,14 @@
- 'container_id' => 'footerNav',
- 'container_class' => 'clearfix small'
- ));
-- ?>
--
-- <?php
-+ ?>
-+
-+ <?php
- // version 0.1.5 introduces widget areas for the footer.
- if(is_active_sidebar('footer-widget') || is_active_sidebar('footer-widget-2') || is_active_sidebar('footer-widget-3')){
- ?>
- <section class="thirds clear clearfix spacer small">
-- <?php
-+ <?php
- // footer widgets here.
- if(is_active_sidebar('footer-widget')){
- dynamic_sidebar('footer-widget');
-@@ -29,13 +29,13 @@
- }
- if(is_active_sidebar('footer-widget-3')){
- dynamic_sidebar('footer-widget-3');
-- }
-+ }
- ?>
- </section>
-- <?php
-+ <?php
- }
- ?>
--
-+
- <?php
- if(has_nav_menu('social-menu')){
-
-@@ -47,8 +47,8 @@
-
- ));
- }
-- ?>
--
-+ ?>
-+
- <p class="credit spacer small">
- <?php
- printf(
-@@ -56,17 +56,12 @@
- date('Y'), esc_attr(get_bloginfo('name')), 'http://www.mardesco.com/themes/bliss/', 'http://www.wordpress.org' );
- ?>
- </p>
-- </div>
-+ </div>
-
- <?php wp_footer(); ?>
--
-+
- </footer>
- </div> <!--! end of #container -->
--
--<!--[if lt IE 7 ]>
-- <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.2/CFInstall.min.js"></script>
-- <script>window.attachEvent("onload",function(){CFInstall.check({mode:"overlay"})})</script>
--<![endif]-->
--
-+
- </body>
- </html>
-\ No newline at end of file
-diff --git a/wp-content/themes/bliss/functions.php b/wp-content/themes/bliss/functions.php
-index a5211bf6..43f0c04f 100644
---- a/wp-content/themes/bliss/functions.php
-+++ b/wp-content/themes/bliss/functions.php
-@@ -12,18 +12,18 @@ if(__FILE__ == $_SERVER['SCRIPT_FILENAME']){
-
- # Begin Options #
-
--/*
--theme options panel via the Options Framework
-+/*
-+theme options panel via the Options Framework
- courtesy of Devin Price : http://wptheming.com/options-framework-theme/
- */
- define( 'OPTIONS_FRAMEWORK_DIRECTORY', get_template_directory_uri() . '/options/' );
- require_once dirname( __FILE__ ) . '/options/options-framework.php';
-
- /*
-- *
-+ *
- * Show / hide the slideshow option when a checkbox is clicked.
- *
-- *
-+ *
- */
-
- function bliss_toggle_slideshow_options() { ?>
-@@ -39,7 +39,7 @@ function bliss_toggle_slideshow_options() { ?>
- if (jQuery('#bliss_slideshow1_showhidden:checked').val() !== undefined) {
- jQuery('.bliss-slideshow-1').show();
- }
--
-+
- // slideshow 2
- jQuery('#bliss_slideshow2_showhidden').click(function() {
- jQuery('.bliss-slideshow-2').fadeToggle(400);
-@@ -56,7 +56,7 @@ function bliss_toggle_slideshow_options() { ?>
-
- if (jQuery('#bliss_slideshow3_showhidden:checked').val() !== undefined) {
- jQuery('.bliss-slideshow-3').show();
-- }
-+ }
-
- });
- </script>
-@@ -73,20 +73,20 @@ add_action( 'optionsframework_custom_scripts', 'bliss_toggle_slideshow_options'
- function bliss_style_links(){
- $modernizr_url = get_template_directory_uri() . "/js/modernizr-2.6.1.min.js";
- wp_enqueue_script('modernizr', $modernizr_url, array(), '2.6.1', false);
--
-+
- // disallowed by theme review: get_template_directory_uri() . "/style.css";
-- // required: use get_stylesheet_uri()
-+ // required: use get_stylesheet_uri()
- $main_stylesheet = get_stylesheet_uri();
- wp_enqueue_style( 'bliss_style', $main_stylesheet, false );
--
-+
- // as of version 0.1.1 the font url is now a relative protocol.
-- $font_url = '//fonts.googleapis.com/css?family=Merriweather:700italic';
-- wp_enqueue_style( 'Merriweather', $font_url, false);
--
-+ $font_url = '';
-+ //wp_enqueue_style( 'Merriweather', $font_url, false);
-+
- // version 0.1.4 adds icons by Font Awesome
- $icon_url = get_template_directory_uri() . '/css/font-awesome.min.css';
- wp_enqueue_style( 'font-awesome', $icon_url, false);
--
-+
- }
- add_action( 'wp_enqueue_scripts', 'bliss_style_links', 2 );
-
-@@ -94,43 +94,43 @@ add_action( 'wp_enqueue_scripts', 'bliss_style_links', 2 );
- /* default value for $content_width, required by ThemeCheck. */
- // it turns out, intended use of $content_width global is NOT the same
- // as intended use of: (int) of_get_option('bliss_max_width')
--
-+
- // if not overriden by a plugin, must be set equal to the rendered content area of the theme.
--
-+
- // required: define content_width global via after_setup_theme callback
- function bliss_global_width(){
--
-+
- // Note: this variable will not accurately reflect the size of the display area on a mobile device screen.
--
-+
- global $content_width;
- if ( ! isset( $content_width ) ){
- // Default for $content_width is the width of the content area on a page with a single sidebar at the theme's default container width.
- $content_width = 735;
--
-+
- // but that's not necessarily accurate for the current page, is it.
- // The size of the content area will depend on the user settings.
- // retrieving those settings requires an extra database call.
- // TODO: set global vars for all user settings, to reduce the number of database lookups required.
--
-- $width = (int) esc_attr(of_get_option('bliss_max_width', '1024'));
-+
-+ $width = (int) esc_attr(of_get_option('bliss_max_width', '1024'));
- if($width === 0){
-- // 100% width display.
-+ // 100% width display.
- // size of content area can only be determined by JavaScript.
- // use the default setting from above, and do nothing here.
- }else{
--
-+
- // determine if this page has sidebars in the first place
- if(is_front_page() || is_page_template('page-full-width.php')){
-
- /*
- style.css line 1155 says:
- #main{padding:2.9%;}
--
-+
- 2.9 * 2 = 5.8%
- 100-5.8 = 94.2
- */
-- $content_width = $width * 0.942;
--
-+ $content_width = $width * 0.942;
-+
- }else{
- // check sidebar status.
- $sidebars = bliss_get_sidebar_selection();
-@@ -138,26 +138,26 @@ add_action( 'wp_enqueue_scripts', 'bliss_style_links', 2 );
- // "left" and "right" both get the same treatment.
- case 'left':
- case 'right':
--
-- /*
-+
-+ /*
- see stylesheet (eg .hasRightNav #main on line 1210)
- the use of a single sidebar reduces the width of the content area by 22.45%
--
-+
- 5.8 + 22.45 = 28.25
- 100 - 28.25 = 71.75
- */
- $content_width = $width * 0.7175;
--
--
-+
-+
- break;
- case 'both':
--
-+
- // 22.45 * 2 = 44.9
- // 44.9 + 5.8 = 50.7
- // 100 - 50.7 = 49.3
- $content_width = $width * 0.493;
--
--
-+
-+
- break;
- case 'none':
- // same as the full width layouts above
-@@ -170,14 +170,14 @@ add_action( 'wp_enqueue_scripts', 'bliss_style_links', 2 );
- }
- }
-
-- }
-+ }
- }
- }
- add_action('after_setup_theme', 'bliss_global_width');
-
-
- function bliss_user_customizations(){
--
-+
- // user-specified width setting goes AFTER the theme's primary stylesheet.
- $width = (int) esc_attr(of_get_option('bliss_max_width', '1024'));
- if($width && is_int($width) && $width != 0){
-@@ -191,7 +191,7 @@ function bliss_user_customizations(){
- width:90%%;
- margin:35px 5%%;
- }
-- }
-+ }
- </style>', $width, $breakpoint);
- }else{
- if(isset($width) && $width === 0){
-@@ -211,7 +211,7 @@ function bliss_user_customizations(){
- }
- }
- $header_background = get_header_image();
--
-+
- // feature support for custom-header image.
- if($header_background && $header_background != ''){
- printf('
-@@ -220,11 +220,11 @@ function bliss_user_customizations(){
- background:transparent url("%s") center center no-repeat;
- background-size:cover;
- }
--
-+
- </style>
- ', esc_url($header_background));
- }
--
-+
- $header_text_color = get_header_textcolor();
- if($header_text_color && $header_text_color != ''){
- printf('
-@@ -244,9 +244,9 @@ function bliss_user_customizations(){
- .site-header .contrast a{
- color: #%s !important;
- }
--
-+
- </style>
-- ', esc_attr($header_text_color));
-+ ', esc_attr($header_text_color));
- }
-
- }
-@@ -270,7 +270,8 @@ function bliss_font_in_footer(){
- /*
- We put the Google Fonts font in the footer and call it late in the stack, to give it time to load before applying the typeface to the content.
- */
-- echo '
-+ return;
-+ echo '
- <style type="text/css">
- h1,h2,h3{font-family: "Merriweather", serif;font-style:italic;font-weight:700}
- </style>
-@@ -285,7 +286,7 @@ add_action('wp_footer', 'bliss_font_in_footer', 100);
-
- // per http://codex.wordpress.org/Theme_Development#Untrusted_Data
- // define a custom function for cleaning titles, when they are output within an html attribute.
--// BUT functions defined in the global scope must be prefixed with the unique theme name!
-+// BUT functions defined in the global scope must be prefixed with the unique theme name!
- // Thanks to nitkr for pointing this out.
- function bliss_clean_title_link(){
- //http://codex.wordpress.org/Function_Reference/the_title_attribute
-@@ -294,13 +295,13 @@ function bliss_clean_title_link(){
-
- // as per http://codex.wordpress.org/Function_Reference/wp_title#Covering_Homepage
- function bliss_homepage_title($title){
--
-+
-
- if( empty( $title ) && ( is_home() || is_front_page() ) ) {
- return esc_attr( get_bloginfo( 'name' ) . ' | ' . get_bloginfo( 'description' ) );
- }
- return $title;
--
-+
- }
- add_filter( 'wp_title', 'bliss_homepage_title', 9);// call early, so it can be overridden by plugins
-
-@@ -311,7 +312,7 @@ function bliss_add_editor_styles() {
- /* Editor styles, recommended by ThemeCheck. */
- // http://codex.wordpress.org/Function_Reference/add_editor_style
- add_editor_style( 'css/admin.css' );
--
-+
- /* theme support, as recommended by ThemeCheck: */
- add_theme_support('post-thumbnails');
- add_theme_support('custom-header');
-@@ -319,14 +320,14 @@ function bliss_add_editor_styles() {
- add_theme_support('title-tag');// since WordPress 4.1
-
- /* theme support, as REQUIRED by ThemeCheck */
-- add_theme_support('automatic-feed-links');
--
-+ add_theme_support('automatic-feed-links');
-+
- // theme support for html5, introduced in bliss v.1.0.1
- add_theme_support( 'html5', array( 'comment-list', 'comment-form', 'search-form', 'gallery', 'caption', 'widgets' ) );
--
-+
- // theme support for WooCommerce, as of Bliss version 1.0.6
- add_theme_support('woocommerce');
--
-+
- }
- add_action( 'after_setup_theme', 'bliss_add_editor_styles' );
-
---
-2.17.1
-
diff --git a/patches/themes/twentythirteen-google-fonts.patch b/patches/themes/twentythirteen-google-fonts.patch
deleted file mode 100644
index fcaabb30..00000000
--- a/patches/themes/twentythirteen-google-fonts.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
-index 596b5dc02..60c93029d 100644
---- a/wp-content/themes/twentythirteen/functions.php
-+++ b/wp-content/themes/twentythirteen/functions.php
-@@ -221,15 +221,15 @@ add_action( 'after_setup_theme', 'twentythirteen_setup' );
- function twentythirteen_fonts_url() {
- $fonts_url = '';
-
-- /*
-- * translators: If there are characters in your language that are not supported
-- * by Source Sans Pro, translate this to 'off'. Do not translate into your own language.
-+ /* Translators: If there are characters in your language that are not
-+ * supported by Source Sans Pro, translate this to 'off'. Do not translate
-+ * into your own language.
- */
- $source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
-
-- /*
-- * translators: If there are characters in your language that are not supported
-- * by Bitter, translate this to 'off'. Do not translate into your own language.
-+ /* Translators: If there are characters in your language that are not
-+ * supported by Bitter, translate this to 'off'. Do not translate into your
-+ * own language.
- */
- $bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
-
-@@ -247,9 +247,8 @@
- $query_args = array(
- 'family' => urlencode( implode( '|', $font_families ) ),
- 'subset' => urlencode( 'latin,latin-ext' ),
-- 'display' => urlencode( 'fallback' ),
- );
-- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-+ $fonts_url = add_query_arg( $query_args, '' );
- }
-
- return $fonts_url;
-@@ -318,7 +318,6 @@
-
- return $urls;
- }
--add_filter( 'wp_resource_hints', 'twentythirteen_resource_hints', 10, 2 );
-
- /**
- * Enqueue styles for the block-based editor.
--
GitLab