|
@@ -32,14 +32,14 @@ discard block |
|
|
block discarded – undo |
|
32
|
32
|
// Take care of font-families. |
|
33
|
33
|
if ( isset( $value['font-family'] ) && ! empty( $value['font-family'] ) ) { |
|
34
|
34
|
$output['media_query'] = ( isset( $output['media_query'] ) ) ? $output['media_query'] : 'global'; |
|
35
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix']; |
|
|
35
|
+ $this->styles[$output['media_query']][$output['element']]['font-family'] = $output['prefix'] . $this->process_property_value( 'font-family', $value['font-family'] ) . $output['suffix']; |
|
36
|
36
|
|
|
37
|
37
|
// Add support for the older font-weight parameter. |
|
38
|
38
|
// This has been deprecated so the code below is just to add some backwards-compatibility. |
|
39
|
39
|
// Once a user visits their customizer and make changes to their typography, |
|
40
|
40
|
// new values are saved and this one is no longer used. |
|
41
|
41
|
if ( isset( $value['font-weight'] ) && ! empty( $value['font-weight'] ) ) { |
|
42
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix']; |
|
|
42
|
+ $this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $value['font-weight'] . $output['suffix']; |
|
43
|
43
|
} |
|
44
|
44
|
|
|
45
|
45
|
// Take care of variants. |
|
@@ -51,45 +51,45 @@ discard block |
|
|
block discarded – undo |
|
51
|
51
|
|
|
52
|
52
|
// Is this italic? |
|
53
|
53
|
$is_italic = ( false !== strpos( $value['variant'], 'italic' ) ); |
|
54
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix']; |
|
55
|
|
- $font_style = $is_italic ? 'italic' : 'normal' ; |
|
56
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['font-style'] = $output['prefix'] . $font_style . $output['suffix']; |
|
|
54
|
+ $this->styles[$output['media_query']][$output['element']]['font-weight'] = $output['prefix'] . $font_weight . $output['suffix']; |
|
|
55
|
+ $font_style = $is_italic ? 'italic' : 'normal'; |
|
|
56
|
+ $this->styles[$output['media_query']][$output['element']]['font-style'] = $output['prefix'] . $font_style . $output['suffix']; |
|
57
|
57
|
} |
|
58
|
58
|
} |
|
59
|
59
|
|
|
60
|
60
|
// Take care of font-size. |
|
61
|
61
|
if ( isset( $value['font-size'] ) && ! empty( $value['font-size'] ) ) { |
|
62
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix']; |
|
|
62
|
+ $this->styles[$output['media_query']][$output['element']]['font-size'] = $output['prefix'] . $value['font-size'] . $output['suffix']; |
|
63
|
63
|
} |
|
64
|
64
|
|
|
65
|
65
|
// Take care of line-height. |
|
66
|
66
|
if ( isset( $value['line-height'] ) && ! empty( $value['line-height'] ) ) { |
|
67
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix']; |
|
|
67
|
+ $this->styles[$output['media_query']][$output['element']]['line-height'] = $output['prefix'] . $value['line-height'] . $output['suffix']; |
|
68
|
68
|
} |
|
69
|
69
|
|
|
70
|
70
|
// Take care of letter-spacing. |
|
71
|
71
|
if ( isset( $value['letter-spacing'] ) && ( ! empty( $value['letter-spacing'] ) || '0' == $value['letter-spacing'] ) ) { |
|
72
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix']; |
|
|
72
|
+ $this->styles[$output['media_query']][$output['element']]['letter-spacing'] = $output['prefix'] . $value['letter-spacing'] . $output['suffix']; |
|
73
|
73
|
} |
|
74
|
74
|
|
|
75
|
75
|
// Take care of word-spacing. |
|
76
|
76
|
if ( isset( $value['word-spacing'] ) && ( ! empty( $value['word-spacing'] ) || '0' == $value['word-spacing'] ) ) { |
|
77
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix']; |
|
|
77
|
+ $this->styles[$output['media_query']][$output['element']]['word-spacing'] = $output['prefix'] . $value['word-spacing'] . $output['suffix']; |
|
78
|
78
|
} |
|
79
|
79
|
|
|
80
|
80
|
// Take care of text-align. |
|
81
|
81
|
if ( isset( $value['text-align'] ) && ! empty( $value['text-align'] ) ) { |
|
82
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix']; |
|
|
82
|
+ $this->styles[$output['media_query']][$output['element']]['text-align'] = $output['prefix'] . $value['text-align'] . $output['suffix']; |
|
83
|
83
|
} |
|
84
|
84
|
|
|
85
|
85
|
// Take care of text-transform. |
|
86
|
86
|
if ( isset( $value['text-transform'] ) && ! empty( $value['text-transform'] ) ) { |
|
87
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix']; |
|
|
87
|
+ $this->styles[$output['media_query']][$output['element']]['text-transform'] = $output['prefix'] . $value['text-transform'] . $output['suffix']; |
|
88
|
88
|
} |
|
89
|
89
|
|
|
90
|
90
|
// Take care of color. |
|
91
|
91
|
if ( isset( $value['color'] ) && ! empty( $value['color'] ) ) { |
|
92
|
|
- $this->styles[ $output['media_query'] ][ $output['element'] ]['color'] = $output['prefix'] . $value['color'] . $output['suffix']; |
|
|
92
|
+ $this->styles[$output['media_query']][$output['element']]['color'] = $output['prefix'] . $value['color'] . $output['suffix']; |
|
93
|
93
|
} |
|
94
|
94
|
} |
|
95
|
95
|
} |