This commit is contained in:
Alexander Agnarson 2020-02-25 18:04:54 +01:00
parent 62def2a89b
commit 7ad333b360
167 changed files with 2955 additions and 2493 deletions

View file

@ -5,7 +5,7 @@
* @package Kirki
* @subpackage Controls
* @copyright Copyright (c) 2019, Ari Stathopoulos (@aristath)
* @license https://opensource.org/licenses/MIT
* @license https://opensource.org/licenses/MIT
* @since 2.2.0
*/
@ -21,13 +21,10 @@ class Kirki_Output_Property_Font_Family extends Kirki_Output_Property {
*/
protected function process_value() {
$google_fonts_array = Kirki_Fonts::get_google_fonts();
$backup_fonts = Kirki_Fonts::get_backup_fonts();
$family = $this->value;
$backup = '';
if ( is_array( $this->value ) && isset( $this->value[0] ) && isset( $this->value[1] ) ) {
$family = $this->value[0];
$backup = $this->value[1];
}
// Make sure the value is a string.
@ -39,22 +36,6 @@ class Kirki_Output_Property_Font_Family extends Kirki_Output_Property {
// Hack for standard fonts.
$family = str_replace( '"', '"', $family );
// Add backup font.
if ( Kirki_Fonts::is_google_font( $family ) ) {
if ( '' === $backup && isset( $google_fonts_array[ $family ] ) && isset( $backup_fonts[ $google_fonts_array[ $family ]['category'] ] ) ) {
$backup = $backup_fonts[ $google_fonts_array[ $family ]['category'] ];
}
// Add double quotes if needed.
if ( false !== strpos( $family, ' ' ) && false === strpos( $family, '"' ) ) {
$this->value = '"' . $family . '", ' . $backup;
return;
}
$this->value = $family . ', ' . $backup;
return;
}
// Add double quotes if needed.
if ( false !== strpos( $family, ' ' ) && false === strpos( $family, '"' ) ) {
$this->value = '"' . $family . '"';