@@ -68,12 +68,12 @@ discard block |
||
68 | 68 | // Get the classname we'll be using to create our setting(s). |
69 | 69 | $classname = false; |
70 | 70 | if ( isset( $args['option_type'] ) && array_key_exists( $args['option_type'], $this->setting_types ) ) { |
71 | - $classname = $this->setting_types[ $args['option_type'] ]; |
|
71 | + $classname = $this->setting_types[$args['option_type']]; |
|
72 | 72 | } |
73 | 73 | if ( ! isset( $args['type'] ) || ! array_key_exists( $args['type'], $this->setting_types ) ) { |
74 | 74 | $args['type'] = 'default'; |
75 | 75 | } |
76 | - $classname = ! $classname ? $this->setting_types[ $args['type'] ] : $classname; |
|
76 | + $classname = ! $classname ? $this->setting_types[$args['type']] : $classname; |
|
77 | 77 | |
78 | 78 | // If settings are defined as an array, then we need to go through them |
79 | 79 | // and call add_setting for each one of them separately. |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $args['default'] = array(); |
85 | 85 | } |
86 | 86 | foreach ( $args['settings'] as $key => $value ) { |
87 | - $default = ( isset( $defaults[ $key ] ) ) ? $defaults[ $key ] : ''; |
|
87 | + $default = ( isset( $defaults[$key] ) ) ? $defaults[$key] : ''; |
|
88 | 88 | $this->add_setting( $classname, $value, $default, $args['option_type'], $args['capability'], $args['transport'], $args['sanitize_callback'] ); |
89 | 89 | } |
90 | 90 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | foreach ( $this->setting_types as $key => $classname ) { |
137 | 137 | |
138 | 138 | if ( ! class_exists( $classname ) ) { |
139 | - unset( $this->setting_types[ $key ] ); |
|
139 | + unset( $this->setting_types[$key] ); |
|
140 | 140 | } |
141 | 141 | } |
142 | 142 | } |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | if ( false === $config_id ) { |
392 | 392 | return $translation_strings; |
393 | 393 | } |
394 | - return $translation_strings[ $config_id ]; |
|
394 | + return $translation_strings[$config_id]; |
|
395 | 395 | } |
396 | 396 | |
397 | 397 | /** |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | if ( is_string( $variant ) ) { |
411 | 411 | $final_variants[] = array( |
412 | 412 | 'id' => $variant, |
413 | - 'label' => isset( $all_variants[ $variant ] ) ? $all_variants[ $variant ] : $variant, |
|
413 | + 'label' => isset( $all_variants[$variant] ) ? $all_variants[$variant] : $variant, |
|
414 | 414 | ); |
415 | 415 | } elseif ( is_array( $variant ) && isset( $variant['id'] ) && isset( $variant['label'] ) ) { |
416 | 416 | $final_variants[] = $variant; |
@@ -484,7 +484,7 @@ discard block |
||
484 | 484 | if ( array_key_exists( $variant, $all_variants ) ) { |
485 | 485 | $available_variants[] = array( |
486 | 486 | 'id' => $variant, |
487 | - 'label' => $all_variants[ $variant ], |
|
487 | + 'label' => $all_variants[$variant], |
|
488 | 488 | ); |
489 | 489 | } |
490 | 490 | } |
@@ -494,7 +494,7 @@ discard block |
||
494 | 494 | if ( array_key_exists( $subset, $all_subsets ) ) { |
495 | 495 | $available_subsets[] = array( |
496 | 496 | 'id' => $subset, |
497 | - 'label' => $all_subsets[ $subset ], |
|
497 | + 'label' => $all_subsets[$subset], |
|
498 | 498 | ); |
499 | 499 | } |
500 | 500 | } |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | 'kirki-multicolor' => 'Kirki_Output_Field_Multicolor', |
172 | 172 | ) ); |
173 | 173 | if ( array_key_exists( self::$field_type, $field_output_classes ) ) { |
174 | - $classname = $field_output_classes[ self::$field_type ]; |
|
174 | + $classname = $field_output_classes[self::$field_type]; |
|
175 | 175 | } |
176 | 176 | $obj = new $classname( $field['kirki_config'], self::$output, self::$value ); |
177 | 177 | return $obj->get_styles(); |
@@ -235,10 +235,10 @@ discard block |
||
235 | 235 | 'transition', |
236 | 236 | 'transition-property', |
237 | 237 | ), true ) ) { |
238 | - unset( $css[ $media_query ][ $element ][ $property ] ); |
|
239 | - $css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value; |
|
240 | - $css[ $media_query ][ $element ][ '-moz-' . $property ] = $value; |
|
241 | - $css[ $media_query ][ $element ][ $property ] = $value; |
|
238 | + unset( $css[$media_query][$element][$property] ); |
|
239 | + $css[$media_query][$element]['-webkit-' . $property] = $value; |
|
240 | + $css[$media_query][$element]['-moz-' . $property] = $value; |
|
241 | + $css[$media_query][$element][$property] = $value; |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | // Add -ms-* and -o-*. |
@@ -248,10 +248,10 @@ discard block |
||
248 | 248 | 'transition', |
249 | 249 | 'transition-property', |
250 | 250 | ), true ) ) { |
251 | - unset( $css[ $media_query ][ $element ][ $property ] ); |
|
252 | - $css[ $media_query ][ $element ][ '-ms-' . $property ] = $value; |
|
253 | - $css[ $media_query ][ $element ][ '-o-' . $property ] = $value; |
|
254 | - $css[ $media_query ][ $element ][ $property ] = $value; |
|
251 | + unset( $css[$media_query][$element][$property] ); |
|
252 | + $css[$media_query][$element]['-ms-' . $property] = $value; |
|
253 | + $css[$media_query][$element]['-o-' . $property] = $value; |
|
254 | + $css[$media_query][$element][$property] = $value; |
|
255 | 255 | } |
256 | 256 | } |
257 | 257 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | // Take care of font-families. |
31 | 31 | if ( isset( $value['font-family'] ) && ! empty( $value['font-family'] ) ) { |
32 | 32 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
33 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix']; |
|
33 | + $this->styles[$output['media_query']][$output['element']]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix']; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | // Add support for the older font-weight parameter. |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | // Once a user visits their customizer and make changes to their typography, |
39 | 39 | // new values are saved and this one is no longer used. |
40 | 40 | if ( isset( $value['font-weight'] ) && ! empty( $value['font-weight'] ) ) { |
41 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix']; |
|
41 | + $this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix']; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | // Take care of variants. |
@@ -50,44 +50,44 @@ discard block |
||
50 | 50 | |
51 | 51 | // Is this italic? |
52 | 52 | $is_italic = ( false !== strpos( $value['variant'], 'italic' ) ); |
53 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix']; |
|
54 | - $font_style = $is_italic ? 'italic' : 'normal' ; |
|
55 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = $output['prefix'] . $font_style . $output['suffix']; |
|
53 | + $this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix']; |
|
54 | + $font_style = $is_italic ? 'italic' : 'normal'; |
|
55 | + $this->styles[$output['media_query']][$output['element']]['font-style'] = $output['prefix'] . $font_style . $output['suffix']; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | // Take care of font-size. |
59 | 59 | if ( isset( $value['font-size'] ) && ! empty( $value['font-size'] ) ) { |
60 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix']; |
|
60 | + $this->styles[$output['media_query']][$output['element']]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix']; |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | // Take care of line-height. |
64 | 64 | if ( isset( $value['line-height'] ) && ! empty( $value['line-height'] ) ) { |
65 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix']; |
|
65 | + $this->styles[$output['media_query']][$output['element']]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix']; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | // Take care of letter-spacing. |
69 | 69 | if ( isset( $value['letter-spacing'] ) && ( ! empty( $value['letter-spacing'] ) || ( '0' === $value['letter-spacing'] || 0 === $value['letter-spacing'] ) ) ) { |
70 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix']; |
|
70 | + $this->styles[$output['media_query']][$output['element']]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix']; |
|
71 | 71 | } |
72 | 72 | |
73 | 73 | // Take care of word-spacing. |
74 | 74 | if ( isset( $value['word-spacing'] ) && ( ! empty( $value['word-spacing'] ) || ( '0' === $value['word-spacing'] || 0 === $value['word-spacing'] ) ) ) { |
75 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix']; |
|
75 | + $this->styles[$output['media_query']][$output['element']]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix']; |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | // Take care of text-align. |
79 | 79 | if ( isset( $value['text-align'] ) && ! empty( $value['text-align'] ) ) { |
80 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix']; |
|
80 | + $this->styles[$output['media_query']][$output['element']]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix']; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | // Take care of text-transform. |
84 | 84 | if ( isset( $value['text-transform'] ) && ! empty( $value['text-transform'] ) ) { |
85 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix']; |
|
85 | + $this->styles[$output['media_query']][$output['element']]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix']; |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | // Take care of color. |
89 | 89 | if ( isset( $value['color'] ) && ! empty( $value['color'] ) ) { |
90 | - $this->styles[ $output['media_query'] ][ $output['element'] ]['color'] = $output['prefix'] . $value['color'] . $output['suffix']; |
|
90 | + $this->styles[$output['media_query']][$output['element']]['color'] = $output['prefix'] . $value['color'] . $output['suffix']; |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 | } |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $js_var['index_key'] = $key; |
89 | 89 | $callback = $this->get_callback( $args ); |
90 | 90 | if ( is_callable( $callback ) ) { |
91 | - $field['scripts'][ $key ] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
91 | + $field['scripts'][$key] = call_user_func_array( $callback, array( $js_var, $args ) ); |
|
92 | 92 | continue; |
93 | 93 | } |
94 | - $field['scripts'][ $key ] = $this->script_var( $js_var ); |
|
94 | + $field['scripts'][$key] = $this->script_var( $js_var ); |
|
95 | 95 | } |
96 | 96 | $combo_extra_script = ''; |
97 | 97 | $combo_css_script = ''; |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | 'font-weight' => 'fontWeight', |
267 | 267 | 'font-style' => 'fontStyle', |
268 | 268 | ); |
269 | - $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[ $args['choice'] ] ) ); |
|
269 | + $choice_condition = ( isset( $args['choice'] ) && '' !== $args['choice'] && isset( $css_build_array[$args['choice']] ) ); |
|
270 | 270 | $script .= ( ! $choice_condition ) ? $webfont_loader : ''; |
271 | 271 | foreach ( $css_build_array as $property => $var ) { |
272 | 272 | if ( $choice_condition && $property !== $args['choice'] ) { |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | 'units' => '', |
338 | 338 | 'js_callback' => array( '', '' ), |
339 | 339 | 'value_pattern' => '', |
340 | - )); |
|
340 | + ) ); |
|
341 | 341 | |
342 | 342 | // Element should be a string. |
343 | 343 | if ( is_array( $args['element'] ) ) { |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | if ( isset( $output['pattern_replace'] ) && is_array( $output['pattern_replace'] ) ) { |
103 | 103 | $option_type = 'theme_mod'; |
104 | 104 | $option_name = false; |
105 | - if ( isset( Kirki::$config[ $this->config_id ] ) ) { |
|
106 | - $config = Kirki::$config[ $this->config_id ]; |
|
105 | + if ( isset( Kirki::$config[$this->config_id] ) ) { |
|
106 | + $config = Kirki::$config[$this->config_id]; |
|
107 | 107 | $option_type = ( isset( $config['option_type'] ) ) ? $config['option_type'] : 'theme_mod'; |
108 | 108 | if ( 'option' === $option_type || 'site_option' === $option_type ) { |
109 | 109 | $option_name = ( isset( $config['option_name'] ) ) ? $config['option_name'] : false; |
@@ -116,10 +116,10 @@ discard block |
||
116 | 116 | $replacement = ''; |
117 | 117 | switch ( $option_type ) { |
118 | 118 | case 'option': |
119 | - $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_option( $replace ); |
|
119 | + $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_option( $replace ); |
|
120 | 120 | break; |
121 | 121 | case 'site_option': |
122 | - $replacement = ( is_array( $options ) && isset( $options[ $replace ] ) ) ? $options[ $replace ] : get_site_option( $replace ); |
|
122 | + $replacement = ( is_array( $options ) && isset( $options[$replace] ) ) ? $options[$replace] : get_site_option( $replace ); |
|
123 | 123 | break; |
124 | 124 | case 'user_meta': |
125 | 125 | $user_id = get_current_user_id(); |
@@ -212,11 +212,11 @@ discard block |
||
212 | 212 | return; |
213 | 213 | } |
214 | 214 | $output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
215 | - $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
216 | - $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
217 | - $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
215 | + $output['prefix'] = ( isset( $output['prefix'] ) ) ? $output['prefix'] : ''; |
|
216 | + $output['units'] = ( isset( $output['units'] ) ) ? $output['units'] : ''; |
|
217 | + $output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : ''; |
|
218 | 218 | |
219 | - $this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
219 | + $this->styles[$output['media_query']][$output['element']][$output['property']] = $output['prefix'] . $value . $output['units'] . $output['suffix']; |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | /** |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | 'background-position' => 'Kirki_Output_Property_Background_Position', |
237 | 237 | ) ); |
238 | 238 | if ( array_key_exists( $property, $properties ) ) { |
239 | - $classname = $properties[ $property ]; |
|
239 | + $classname = $properties[$property]; |
|
240 | 240 | $obj = new $classname( $property, $value ); |
241 | 241 | return $obj->get_value(); |
242 | 242 | } |
@@ -49,50 +49,37 @@ |
||
49 | 49 | $back_obj = ( $back ) ? ariColor::newColor( $back ) : false; |
50 | 50 | if ( $back ) { |
51 | 51 | $text_on_back = ( 60 > $back_obj->lightness ) ? |
52 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : |
|
53 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode ); |
|
52 | + $back_obj->getNew( 'lightness', $back_obj->lightness + 60 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 60 )->toCSS( $back_obj->mode ); |
|
54 | 53 | $border_on_back = ( 80 < $back_obj->lightness ) ? |
55 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : |
|
56 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode ); |
|
54 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 13 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 13 )->toCSS( $back_obj->mode ); |
|
57 | 55 | $back_on_back = ( 90 < $back_obj->lightness ) ? |
58 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : |
|
59 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode ); |
|
56 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 6 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 11 )->toCSS( $back_obj->mode ); |
|
60 | 57 | $hover_on_back = ( 90 < $back_obj->lightness ) ? |
61 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : |
|
62 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
|
58 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 3 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 3 )->toCSS( $back_obj->mode ); |
|
63 | 59 | $arrows_on_back = ( 50 > $back_obj->lightness ) ? |
64 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : |
|
65 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
|
60 | + $back_obj->getNew( 'lightness', $back_obj->lightness + 30 )->toCSS( $back_obj->mode ) : $back_obj->getNew( 'lightness', $back_obj->lightness - 30 )->toCSS( $back_obj->mode ); |
|
66 | 61 | $back_disabled_obj = ( 35 < $back_obj->lightness ) ? |
67 | - $back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : |
|
68 | - $back_obj->getNew( 'lightness', $back_obj->lightness + 30 ); |
|
62 | + $back_obj->getNew( 'lightness', $back_obj->lightness - 30 ) : $back_obj->getNew( 'lightness', $back_obj->lightness + 30 ); |
|
69 | 63 | $back_disabled = $back_disabled_obj->toCSS( $back_disabled_obj->mode ); |
70 | 64 | $text_on_back_disabled = ( 60 > $back_disabled_obj->lightness ) ? |
71 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : |
|
72 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode ); |
|
65 | + $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 60 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 60 )->toCSS( $back_disabled_obj->mode ); |
|
73 | 66 | $border_on_back_disabled = ( 50 < $back_disabled_obj->lightness ) ? |
74 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : |
|
75 | - $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode ); |
|
67 | + $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness - 4 )->toCSS( $back_disabled_obj->mode ) : $back_disabled_obj->getNew( 'lightness', $back_disabled_obj->lightness + 4 )->toCSS( $back_disabled_obj->mode ); |
|
76 | 68 | } |
77 | 69 | $accent = ( isset( $config['color_accent'] ) ) ? $config['color_accent'] : false; |
78 | 70 | $accent_obj = ( $accent ) ? ariColor::newColor( $accent ) : false; |
79 | 71 | if ( $accent ) { |
80 | 72 | $text_on_accent = ( 60 > $accent_obj->lightness ) ? |
81 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : |
|
82 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
|
73 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness + 60 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness - 60 )->toCSS( $accent_obj->mode ); |
|
83 | 74 | $border_on_accent = ( 50 < $accent_obj->lightness ) ? |
84 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : |
|
85 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode ); |
|
75 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness - 4 )->toCSS( $accent_obj->mode ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 4 )->toCSS( $accent_obj->mode ); |
|
86 | 76 | $accent_disabled_obj = ( 35 < $accent_obj->lightness ) ? |
87 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : |
|
88 | - $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 ); |
|
77 | + $accent_obj->getNew( 'lightness', $accent_obj->lightness - 30 ) : $accent_obj->getNew( 'lightness', $accent_obj->lightness + 30 ); |
|
89 | 78 | $accent_disabled = $accent_disabled_obj->toCSS( $accent_disabled_obj->mode ); |
90 | 79 | $text_on_accent_disabled = ( 60 > $accent_disabled_obj->lightness ) ? |
91 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : |
|
92 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode ); |
|
80 | + $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 60 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 60 )->toCSS( $accent_disabled_obj->mode ); |
|
93 | 81 | $border_on_accent_disabled = ( 50 < $accent_disabled_obj->lightness ) ? |
94 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : |
|
95 | - $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode ); |
|
82 | + $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness - 4 )->toCSS( $accent_disabled_obj->mode ) : $accent_disabled_obj->getNew( 'lightness', $accent_disabled_obj->lightness + 4 )->toCSS( $accent_disabled_obj->mode ); |
|
96 | 83 | } |
97 | 84 | |
98 | 85 | if ( $back ) { |
@@ -80,9 +80,9 @@ |
||
80 | 80 | $fonts_to_load = array(); |
81 | 81 | foreach ( $this->googlefonts->fonts as $font => $weights ) { |
82 | 82 | foreach ( $weights as $key => $value ) { |
83 | - $weights[ $key ] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value ); |
|
83 | + $weights[$key] = str_replace( array( 'regular', 'bold', 'italic' ), array( '400', '', 'i' ), $value ); |
|
84 | 84 | if ( 'i' === $value ) { |
85 | - $weights[ $key ] = '400i'; |
|
85 | + $weights[$key] = '400i'; |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | $fonts_to_load[] = $font . ':' . join( ',', $weights ); |