Skip to content

Commit 0d10310

Browse files
MisplonMisplon
committed
Merge branch 'release/1.3.1'
2 parents fd48a4c + 7cc62d5 commit 0d10310

File tree

11 files changed

+42
-54
lines changed

11 files changed

+42
-54
lines changed

‎admin/about/page-github.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<h3><?php _e( 'Developed on Github', 'influence' ) ?></h3>
2-
<img src="<?php echo get_template_directory_uri() ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
2+
<img src="<?php echo esc_url( get_template_directory_uri() ) ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
33
<p>
44
<?php printf( __( "Influence is actively %sdeveloped on Github%s.", 'influence' ), '<a href="https://github.com/siteorigin/influence">', '</a>' ) ?>
55
<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'influence' ) ?>

‎build‎

‎build-config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ module.exports = {
1919
},
2020
version: {
2121
src: [
22-
'functions.php'
22+
'functions.php',
23+
'readme.txt'
2324
]
2425
},
2526
sass: {

‎demo/slider.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<div class="sow-slider-base" style="display: none">
22

33
<ul class="sow-slider-images" data-settings="{&quot;pagination&quot;:true,&quot;speed&quot;:850,&quot;timeout&quot;:5000}">
4-
<li class="sow-slider-image sow-slider-image-cover" style="background-image: url(<?php echo get_template_directory_uri() ?>/demo/assets/slide-2.jpg);">
4+
<li class="sow-slider-image sow-slider-image-cover" style="background-image: url(<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/slide-2.jpg);">
55

66
<div class="sow-slider-image-container">
77
<div class="sow-slider-image-wrapper" style="max-width: 720px;">
8-
<img width="720" height="500" src="<?php echo get_template_directory_uri() ?>/demo/assets/slider-badge.png" class="attachment-full" alt="slider-badge">
8+
<img width="720" height="500" src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/slider-badge.png" class="attachment-full" alt="slider-badge">
99
</div>
1010
</div>
1111

@@ -15,13 +15,13 @@
1515

1616
<div class="sow-slider-image-container">
1717
<div class="sow-slider-image-wrapper" style="max-width: 700px;">
18-
<img width="700" height="500" src="<?php echo get_template_directory_uri() ?>/demo/assets/slider-badge-2.png" class="attachment-full" alt="slider-badge-2">
18+
<img width="700" height="500" src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/slider-badge-2.png" class="attachment-full" alt="slider-badge-2">
1919
</div>
2020
</div>
2121

2222
<video class="sow-background-element" autoplay="" loop="" muted="">
23-
<source src="<?php echo get_template_directory_uri() ?>/demo/assets/writing-video.mp4" type="video/mp4">
24-
<source src="<?php echo get_template_directory_uri() ?>/demo/assets/writing-video.ogv" type="video/ogg">
23+
<source src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/writing-video.mp4" type="video/mp4">
24+
<source src="<?php echo esc_url( get_template_directory_uri() ) ?>/demo/assets/writing-video.ogv" type="video/ogg">
2525
</video>
2626

2727
</li>

‎functions.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,10 @@ function influence_body_class( $classes ) {
216216
function influence_wp_head() {
217217
?>
218218
<!--[if lt IE 9]>
219-
<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
219+
<script src="<?php echo esc_url( get_template_directory_uri() ) ?>/js/html5.js" type="text/javascript"></script>
220220
<![endif]-->
221221
<!--[if (gte IE 6)&(lte IE 8)]>
222-
<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/js/selectivizr.js"></script>
222+
<script type="text/javascript" src="<?php echo esc_url( get_template_directory_uri() ) ?>/js/selectivizr.js"></script>
223223
<![endif]-->
224224
<?php
225225
}

‎inc/customizer/customizer.php‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function css() {
9494
}
9595
$import = array_unique( $import );
9696
if ( !empty( $import ) ) {
97-
$return .= '@import url(//fonts.googleapis.com/css?family=' . implode( '|', $import ) . '); ';
97+
$return .= '@import url(//fonts.googleapis.com/css?family=' . implode( '|', $import ) . '&display=block); ';
9898
}
9999
}
100100

@@ -177,13 +177,16 @@ function add_web_font( $selector, $mod ) {
177177
}
178178

179179
$this->add_css( $selector, 'font-family', $family );
180-
if ( $variant != 400 ) $this->add_css( $selector, 'font-weight', $variant );
181-
182-
$this->fonts[ ] = $font;
183-
184-
if ( !empty( $variant ) ) {
185-
if ( $variant == 'regular' ) $variant = '400';
186-
$this->css[ $selector ][ ] = 'font-weight: ' . $variant;
180+
if ( ! empty( $variant ) ) {
181+
if ( $variant != 400 && $variant != 'regular' ) {
182+
if ( ! is_numeric( $variant ) ) {
183+
$variant = filter_var( $variant, FILTER_SANITIZE_NUMBER_INT );
184+
$this->add_css( $selector, 'font-style', 'italic' );
185+
}
186+
$this->add_css( $selector, 'font-weight', $variant );
187+
} else {
188+
$this->add_css( $selector, 'font-weight', 400 );
189+
}
187190
}
188191
}
189192

@@ -327,7 +330,7 @@ class SiteOrigin_Customizer_Helper {
327330
private $sections;
328331
private $defaults;
329332

330-
function __construct($settings = array(), $sections = array(), $theme, $root_url = false, $make_single = true){
333+
function __construct($settings = array(), $sections = array(), $theme = 'generic', $root_url = false, $make_single = true){
331334
// Give child themes a chance to filter this.
332335
$this->theme = $theme;
333336
$this->defaults = array();

‎inc/extras.php‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -52,33 +52,6 @@ function influence_enhanced_image_navigation( $url, $id ) {
5252
}
5353
add_filter( 'attachment_link', 'influence_enhanced_image_navigation', 10, 2 );
5454

55-
/**
56-
* Filters wp_title to print a neat <title> tag based on what is being viewed.
57-
*
58-
* @since influence 1.0
59-
*/
60-
function influence_wp_title( $title, $sep ) {
61-
global $page, $paged;
62-
63-
if ( is_feed() )
64-
return $title;
65-
66-
// Add the blog name
67-
$title .= get_bloginfo( 'name' );
68-
69-
// Add the blog description for the home/front page.
70-
$site_description = get_bloginfo( 'description', 'display' );
71-
if ( $site_description && ( is_home() || is_front_page() ) )
72-
$title .= " $sep $site_description";
73-
74-
// Add a page number if necessary:
75-
if ( $paged >= 2 || $page >= 2 )
76-
$title .= " $sep " . sprintf( __( 'Page %s', 'influence' ), max( $paged, $page ) );
77-
78-
return $title;
79-
}
80-
add_filter( 'wp_title', 'influence_wp_title', 10, 2 );
81-
8255
/**
8356
* Add the styles to set the size of the footer widgets
8457
*

‎inc/settings‎

‎readme.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
Contributors: siteorigin
44
Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
5+
Tested up to: 5.8
56
Requires at least: 4.7
6-
Tested up to: 5.2
7+
Requires PHP: 5.6.20
78
License: GPLv2 or later
89
License URI: http://www.gnu.org/licenses/gpl-2.0.html
910

@@ -89,6 +90,10 @@ This theme makes use of the SiteOrigin Settings Framework contained in the /inc
8990

9091
== Changelog ==
9192

93+
== 1.3.1 - 20 June 2021 ==
94+
* Set Google font display to block.
95+
* Updated SiteOrigin Settings framework.
96+
9297
== 1.3 - 13 October 2019 ==
9398
* Added Custom Logo support.
9499
* Minor code style fixes.

‎style.css‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@ Author URI: https://siteorigin.com/
55
Theme URI: https://siteorigin.com/theme/influence/
66
Description: Influence is a free WordPress theme that gives you a canvas to share your videos, photography and content. It features a modern, responsive design and tight integration with our own Page Builder plugin to make sure your content is responsive too. The best feature of Influence is its huge home page slider - perfect if you're using Influence to build a business or portfolio website. This slider has support for video background images and, like the rest of Influence, is fully responsive. We offer free support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
77
Version: dev
8-
License: GNU General Public License
9-
License URI: http://www.gnu.org/copyleft/gpl.html
8+
Tested up to: 5.8
9+
Requires at least: 4.7
10+
Requires PHP: 5.6.20
11+
License: GNU General Public License v2 or later
12+
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1013
Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
1114
Text Domain: influence
1215
*/
@@ -298,7 +301,7 @@ sup {
298301
bottom: 1ex;
299302
}
300303
sub {
301-
top: .5ex;
304+
top: 0.5ex;
302305
}
303306
small {
304307
font-size: 75%;
@@ -858,7 +861,7 @@ article.sticky {
858861
bottom: 1ex;
859862
}
860863
.entry-content sub {
861-
top: .5ex;
864+
top: 0.5ex;
862865
}
863866
.entry-content .gallery {
864867
margin: 25px 0 !important;

0 commit comments

Comments
 (0)