Skip to content
This repository was archived by the owner on Feb 1, 2026. It is now read-only.

Commit 23436f8

Browse files
mostafasoufimostafasoufi
committed
Merge branch 'development'
2 parents d8993bf + 1e413a9 commit 23436f8

33 files changed

Lines changed: 214 additions & 346 deletions

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## 1.0.1
2+
3+
* Fix: Overriding WordPress globals in blog page
4+
* Fix: Remove unused 'else' in comments.php
5+
* Update: Theme tags in 'style.css'
6+
* Fix: menu disappear when home page is blog
7+
* Fix: Remove the kirki textdomain
8+
19
## 1.0.0
210

311
* Initial version

‎comments.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@
109109
</h3>
110110
<?php
111111
endif;
112-
113-
else :
114-
115112
endif; // if have_comments();
116113
?>
117114
</div><!-- #comments -->

‎header.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414

1515
<div class="wrapper-normal">
1616
<div class="page">
17-
<?php if ( ! is_front_page() ) : ?><?php indigo_show_menu(); ?><?php endif; ?>
17+
<?php if ( ! is_page_template( 'page-templates/home.php' ) ) : ?><?php indigo_show_menu(); ?><?php endif; ?>

‎inc/kirki/controls/php/class-kirki-control-background.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,78 +45,78 @@ protected function content_template() {
4545

4646
<!-- background-color -->
4747
<div class="background-color">
48-
<h4><?php esc_html_e( 'Background Color', 'kirki' ); ?></h4>
48+
<h4><?php esc_html_e( 'Background Color', 'wp-indigo' ); ?></h4>
4949
<input type="text" data-default-color="{{ data.default['background-color'] }}" data-alpha="true" value="{{ data.value['background-color'] }}" class="kirki-color-control"/>
5050
</div>
5151

5252
<!-- background-image -->
5353
<div class="background-image">
54-
<h4><?php esc_html_e( 'Background Image', 'kirki' ); ?></h4>
54+
<h4><?php esc_html_e( 'Background Image', 'wp-indigo' ); ?></h4>
5555
<div class="attachment-media-view background-image-upload">
5656
<# if ( data.value['background-image'] ) { #>
5757
<div class="thumbnail thumbnail-image"><img src="{{ data.value['background-image'] }}"/></div>
5858
<# } else { #>
59-
<div class="placeholder"><?php esc_html_e( 'No File Selected', 'kirki' ); ?></div>
59+
<div class="placeholder"><?php esc_html_e( 'No File Selected', 'wp-indigo' ); ?></div>
6060
<# } #>
6161
<div class="actions">
62-
<button class="button background-image-upload-remove-button<# if ( ! data.value['background-image'] ) { #> hidden <# } #>"><?php esc_html_e( 'Remove', 'kirki' ); ?></button>
63-
<button type="button" class="button background-image-upload-button"><?php esc_html_e( 'Select File', 'kirki' ); ?></button>
62+
<button class="button background-image-upload-remove-button<# if ( ! data.value['background-image'] ) { #> hidden <# } #>"><?php esc_html_e( 'Remove', 'wp-indigo' ); ?></button>
63+
<button type="button" class="button background-image-upload-button"><?php esc_html_e( 'Select File', 'wp-indigo' ); ?></button>
6464
</div>
6565
</div>
6666
</div>
6767

6868
<!-- background-repeat -->
6969
<div class="background-repeat">
70-
<h4><?php esc_html_e( 'Background Repeat', 'kirki' ); ?></h4>
70+
<h4><?php esc_html_e( 'Background Repeat', 'wp-indigo' ); ?></h4>
7171
<select {{{ data.inputAttrs }}}>
72-
<option value="no-repeat"<# if ( 'no-repeat' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'No Repeat', 'kirki' ); ?></option>
73-
<option value="repeat"<# if ( 'repeat' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'Repeat All', 'kirki' ); ?></option>
74-
<option value="repeat-x"<# if ( 'repeat-x' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'Repeat Horizontally', 'kirki' ); ?></option>
75-
<option value="repeat-y"<# if ( 'repeat-y' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'Repeat Vertically', 'kirki' ); ?></option>
72+
<option value="no-repeat"<# if ( 'no-repeat' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'No Repeat', 'wp-indigo' ); ?></option>
73+
<option value="repeat"<# if ( 'repeat' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'Repeat All', 'wp-indigo' ); ?></option>
74+
<option value="repeat-x"<# if ( 'repeat-x' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'Repeat Horizontally', 'wp-indigo' ); ?></option>
75+
<option value="repeat-y"<# if ( 'repeat-y' === data.value['background-repeat'] ) { #> selected <# } #>><?php esc_html_e( 'Repeat Vertically', 'wp-indigo' ); ?></option>
7676
</select>
7777
</div>
7878

7979
<!-- background-position -->
8080
<div class="background-position">
81-
<h4><?php esc_html_e( 'Background Position', 'kirki' ); ?></h4>
81+
<h4><?php esc_html_e( 'Background Position', 'wp-indigo' ); ?></h4>
8282
<select {{{ data.inputAttrs }}}>
83-
<option value="left top"<# if ( 'left top' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Left Top', 'kirki' ); ?></option>
84-
<option value="left center"<# if ( 'left center' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Left Center', 'kirki' ); ?></option>
85-
<option value="left bottom"<# if ( 'left bottom' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Left Bottom', 'kirki' ); ?></option>
86-
<option value="right top"<# if ( 'right top' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Right Top', 'kirki' ); ?></option>
87-
<option value="right center"<# if ( 'right center' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Right Center', 'kirki' ); ?></option>
88-
<option value="right bottom"<# if ( 'right bottom' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Right Bottom', 'kirki' ); ?></option>
89-
<option value="center top"<# if ( 'center top' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Center Top', 'kirki' ); ?></option>
90-
<option value="center center"<# if ( 'center center' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Center Center', 'kirki' ); ?></option>
91-
<option value="center bottom"<# if ( 'center bottom' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Center Bottom', 'kirki' ); ?></option>
83+
<option value="left top"<# if ( 'left top' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Left Top', 'wp-indigo' ); ?></option>
84+
<option value="left center"<# if ( 'left center' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Left Center', 'wp-indigo' ); ?></option>
85+
<option value="left bottom"<# if ( 'left bottom' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Left Bottom', 'wp-indigo' ); ?></option>
86+
<option value="right top"<# if ( 'right top' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Right Top', 'wp-indigo' ); ?></option>
87+
<option value="right center"<# if ( 'right center' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Right Center', 'wp-indigo' ); ?></option>
88+
<option value="right bottom"<# if ( 'right bottom' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Right Bottom', 'wp-indigo' ); ?></option>
89+
<option value="center top"<# if ( 'center top' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Center Top', 'wp-indigo' ); ?></option>
90+
<option value="center center"<# if ( 'center center' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Center Center', 'wp-indigo' ); ?></option>
91+
<option value="center bottom"<# if ( 'center bottom' === data.value['background-position'] ) { #> selected <# } #>><?php esc_html_e( 'Center Bottom', 'wp-indigo' ); ?></option>
9292
</select>
9393
</div>
9494

9595
<!-- background-size -->
9696
<div class="background-size">
97-
<h4><?php esc_html_e( 'Background Size', 'kirki' ); ?></h4>
97+
<h4><?php esc_html_e( 'Background Size', 'wp-indigo' ); ?></h4>
9898
<div class="buttonset">
9999
<input {{{ data.inputAttrs }}} class="switch-input screen-reader-text" type="radio" value="cover" name="_customize-bg-{{{ data.id }}}-size" id="{{ data.id }}cover" <# if ( 'cover' === data.value['background-size'] ) { #> checked="checked" <# } #>>
100-
<label class="switch-label switch-label-<# if ( 'cover' === data.value['background-size'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}cover"><?php esc_html_e( 'Cover', 'kirki' ); ?></label>
100+
<label class="switch-label switch-label-<# if ( 'cover' === data.value['background-size'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}cover"><?php esc_html_e( 'Cover', 'wp-indigo' ); ?></label>
101101
</input>
102102
<input {{{ data.inputAttrs }}} class="switch-input screen-reader-text" type="radio" value="contain" name="_customize-bg-{{{ data.id }}}-size" id="{{ data.id }}contain" <# if ( 'contain' === data.value['background-size'] ) { #> checked="checked" <# } #>>
103-
<label class="switch-label switch-label-<# if ( 'contain' === data.value['background-size'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}contain"><?php esc_html_e( 'Contain', 'kirki' ); ?></label>
103+
<label class="switch-label switch-label-<# if ( 'contain' === data.value['background-size'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}contain"><?php esc_html_e( 'Contain', 'wp-indigo' ); ?></label>
104104
</input>
105105
<input {{{ data.inputAttrs }}} class="switch-input screen-reader-text" type="radio" value="auto" name="_customize-bg-{{{ data.id }}}-size" id="{{ data.id }}auto" <# if ( 'auto' === data.value['background-size'] ) { #> checked="checked" <# } #>>
106-
<label class="switch-label switch-label-<# if ( 'auto' === data.value['background-size'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}auto"><?php esc_html_e( 'Auto', 'kirki' ); ?></label>
106+
<label class="switch-label switch-label-<# if ( 'auto' === data.value['background-size'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}auto"><?php esc_html_e( 'Auto', 'wp-indigo' ); ?></label>
107107
</input>
108108
</div>
109109
</div>
110110

111111
<!-- background-attachment -->
112112
<div class="background-attachment">
113-
<h4><?php esc_html_e( 'Background Attachment', 'kirki' ); ?></h4>
113+
<h4><?php esc_html_e( 'Background Attachment', 'wp-indigo' ); ?></h4>
114114
<div class="buttonset">
115115
<input {{{ data.inputAttrs }}} class="switch-input screen-reader-text" type="radio" value="scroll" name="_customize-bg-{{{ data.id }}}-attachment" id="{{ data.id }}scroll" <# if ( 'scroll' === data.value['background-attachment'] ) { #> checked="checked" <# } #>>
116-
<label class="switch-label switch-label-<# if ( 'scroll' === data.value['background-attachment'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}scroll"><?php esc_html_e( 'Scroll', 'kirki' ); ?></label>
116+
<label class="switch-label switch-label-<# if ( 'scroll' === data.value['background-attachment'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}scroll"><?php esc_html_e( 'Scroll', 'wp-indigo' ); ?></label>
117117
</input>
118118
<input {{{ data.inputAttrs }}} class="switch-input screen-reader-text" type="radio" value="fixed" name="_customize-bg-{{{ data.id }}}-attachment" id="{{ data.id }}fixed" <# if ( 'fixed' === data.value['background-attachment'] ) { #> checked="checked" <# } #>>
119-
<label class="switch-label switch-label-<# if ( 'fixed' === data.value['background-attachment'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}fixed"><?php esc_html_e( 'Fixed', 'kirki' ); ?></label>
119+
<label class="switch-label switch-label-<# if ( 'fixed' === data.value['background-attachment'] ) { #>on <# } else { #>off<# } #>" for="{{ data.id }}fixed"><?php esc_html_e( 'Fixed', 'wp-indigo' ); ?></label>
120120
</input>
121121
</div>
122122
</div>

‎inc/kirki/controls/php/class-kirki-control-base.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ public function enqueue() {
129129
'kirkiL10n',
130130
array(
131131
'isScriptDebug' => ( defined( 'SCRIPT_DEBUG' ) && true === SCRIPT_DEBUG ),
132-
'noFileSelected' => esc_html__( 'No File Selected', 'kirki' ),
133-
'remove' => esc_html__( 'Remove', 'kirki' ),
134-
'default' => esc_html__( 'Default', 'kirki' ),
135-
'selectFile' => esc_html__( 'Select File', 'kirki' ),
136-
'standardFonts' => esc_html__( 'Standard Fonts', 'kirki' ),
137-
'googleFonts' => esc_html__( 'Google Fonts', 'kirki' ),
138-
'defaultCSSValues' => esc_html__( 'CSS Defaults', 'kirki' ),
139-
'defaultBrowserFamily' => esc_html__( 'Default Browser Font-Family', 'kirki' ),
132+
'noFileSelected' => esc_html__( 'No File Selected', 'wp-indigo' ),
133+
'remove' => esc_html__( 'Remove', 'wp-indigo' ),
134+
'default' => esc_html__( 'Default', 'wp-indigo' ),
135+
'selectFile' => esc_html__( 'Select File', 'wp-indigo' ),
136+
'standardFonts' => esc_html__( 'Standard Fonts', 'wp-indigo' ),
137+
'googleFonts' => esc_html__( 'Google Fonts', 'wp-indigo' ),
138+
'defaultCSSValues' => esc_html__( 'CSS Defaults', 'wp-indigo' ),
139+
'defaultBrowserFamily' => esc_html__( 'Default Browser Font-Family', 'wp-indigo' ),
140140
)
141141
);
142142

‎inc/kirki/controls/php/class-kirki-control-dimension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function enqueue() {
3838
'kirki-script',
3939
'dimensionkirkiL10n',
4040
array(
41-
'invalid-value' => esc_html__( 'Invalid Value', 'kirki' ),
41+
'invalid-value' => esc_html__( 'Invalid Value', 'wp-indigo' ),
4242
)
4343
);
4444
}

‎inc/kirki/controls/php/class-kirki-control-dimensions.php‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -111,31 +111,31 @@ protected function content_template() {
111111
*/
112112
protected function l10n() {
113113
return array(
114-
'left-top' => esc_html__( 'Left Top', 'kirki' ),
115-
'left-center' => esc_html__( 'Left Center', 'kirki' ),
116-
'left-bottom' => esc_html__( 'Left Bottom', 'kirki' ),
117-
'right-top' => esc_html__( 'Right Top', 'kirki' ),
118-
'right-center' => esc_html__( 'Right Center', 'kirki' ),
119-
'right-bottom' => esc_html__( 'Right Bottom', 'kirki' ),
120-
'center-top' => esc_html__( 'Center Top', 'kirki' ),
121-
'center-center' => esc_html__( 'Center Center', 'kirki' ),
122-
'center-bottom' => esc_html__( 'Center Bottom', 'kirki' ),
123-
'font-size' => esc_html__( 'Font Size', 'kirki' ),
124-
'font-weight' => esc_html__( 'Font Weight', 'kirki' ),
125-
'line-height' => esc_html__( 'Line Height', 'kirki' ),
126-
'font-style' => esc_html__( 'Font Style', 'kirki' ),
127-
'letter-spacing' => esc_html__( 'Letter Spacing', 'kirki' ),
128-
'word-spacing' => esc_html__( 'Word Spacing', 'kirki' ),
129-
'top' => esc_html__( 'Top', 'kirki' ),
130-
'bottom' => esc_html__( 'Bottom', 'kirki' ),
131-
'left' => esc_html__( 'Left', 'kirki' ),
132-
'right' => esc_html__( 'Right', 'kirki' ),
133-
'center' => esc_html__( 'Center', 'kirki' ),
134-
'size' => esc_html__( 'Size', 'kirki' ),
135-
'spacing' => esc_html__( 'Spacing', 'kirki' ),
136-
'width' => esc_html__( 'Width', 'kirki' ),
137-
'height' => esc_html__( 'Height', 'kirki' ),
138-
'invalid-value' => esc_html__( 'Invalid Value', 'kirki' ),
114+
'left-top' => esc_html__( 'Left Top', 'wp-indigo' ),
115+
'left-center' => esc_html__( 'Left Center', 'wp-indigo' ),
116+
'left-bottom' => esc_html__( 'Left Bottom', 'wp-indigo' ),
117+
'right-top' => esc_html__( 'Right Top', 'wp-indigo' ),
118+
'right-center' => esc_html__( 'Right Center', 'wp-indigo' ),
119+
'right-bottom' => esc_html__( 'Right Bottom', 'wp-indigo' ),
120+
'center-top' => esc_html__( 'Center Top', 'wp-indigo' ),
121+
'center-center' => esc_html__( 'Center Center', 'wp-indigo' ),
122+
'center-bottom' => esc_html__( 'Center Bottom', 'wp-indigo' ),
123+
'font-size' => esc_html__( 'Font Size', 'wp-indigo' ),
124+
'font-weight' => esc_html__( 'Font Weight', 'wp-indigo' ),
125+
'line-height' => esc_html__( 'Line Height', 'wp-indigo' ),
126+
'font-style' => esc_html__( 'Font Style', 'wp-indigo' ),
127+
'letter-spacing' => esc_html__( 'Letter Spacing', 'wp-indigo' ),
128+
'word-spacing' => esc_html__( 'Word Spacing', 'wp-indigo' ),
129+
'top' => esc_html__( 'Top', 'wp-indigo' ),
130+
'bottom' => esc_html__( 'Bottom', 'wp-indigo' ),
131+
'left' => esc_html__( 'Left', 'wp-indigo' ),
132+
'right' => esc_html__( 'Right', 'wp-indigo' ),
133+
'center' => esc_html__( 'Center', 'wp-indigo' ),
134+
'size' => esc_html__( 'Size', 'wp-indigo' ),
135+
'spacing' => esc_html__( 'Spacing', 'wp-indigo' ),
136+
'width' => esc_html__( 'Width', 'wp-indigo' ),
137+
'height' => esc_html__( 'Height', 'wp-indigo' ),
138+
'invalid-value' => esc_html__( 'Invalid Value', 'wp-indigo' ),
139139
);
140140
}
141141
}

0 commit comments

Comments
 (0)