Skip to content

Commit f9d2a03

Browse files
hiteshmakvanahiteshmakvana
authored
Merge pull request #18 from wpeventmanager/1_12_2
1 12 2
2 parents 4e58f67 + eb6de20 commit f9d2a03

13 files changed

+662
-624
lines changed

‎404.php

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,13 @@
99

1010
get_header();
1111
?>
12-
<div class="container">
13-
<div class="row justify-center">
14-
<div class="column column-12 column-t-8">
15-
<div id="primary" class="content-area">
16-
<main id="main" class="site-main">
17-
18-
<section class="error-404 not-found text-center">
19-
<header class="page-header">
20-
<h1 class="page-title"><?php esc_html_e( '404', 'event-listing' ); ?></h1>
21-
<h2><?php esc_html_e( 'Page Not Found', 'event-listing' ); ?></h2>
22-
</header><!-- .page-header -->
23-
24-
<div class="page-content">
25-
<p><?php esc_html_e( 'Opps! This does not seem to be the web page you are searching for.', 'event-listing' ); ?></p>
26-
27-
<a href="<?php echo esc_url(home_url()); ?>" title="Goto Home" class="btn">
28-
<?php _e('Homepage', 'event-listing'); ?>
29-
</a>
30-
31-
</div><!-- .page-content -->
32-
</section><!-- .error-404 -->
33-
34-
</main><!-- #main -->
35-
</div><!-- #primary -->
36-
</div> <!-- .column -->
37-
</div> <!-- .row -->
12+
<div class="container error-404" id="primary">
13+
<h1 class="page-title"><?php esc_html_e( '404', 'event-listing' ); ?></h1>
14+
<h2><?php esc_html_e( 'Page Not Found', 'event-listing' ); ?></h2>
15+
<p><?php esc_html_e( 'Opps! This does not seem to be the web page you are searching for.', 'event-listing' ); ?></p>
16+
<a href="<?php echo esc_url(home_url()); ?>" title="Goto Home" class="btn">
17+
<?php _e('Homepage', 'event-listing'); ?>
18+
</a>
3819
</div> <!-- .container -->
3920
<?php
4021
get_footer();

‎assets/images/arrow-down.svg

Lines changed: 3 additions & 0 deletions
Loading

‎footer.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@
7777
?>
7878

7979
<div class="footer-bottom">
80-
<div class="container text-mb-center">
81-
<div class="row">
80+
<div class="container">
81+
8282
<?php
8383
if (has_nav_menu('social-menu') && $social == 1):
8484
?>
85-
<div class="column column-12 column-t-4 order-t-2 text-t-right">
85+
<div class="footer-social-menu">
8686
<?php
8787
wp_nav_menu(array(
8888
'theme_location' => 'social-menu',
@@ -95,25 +95,25 @@
9595
<?php
9696
endif;
9797
?>
98-
<div class="column column-12 column-t-8 order-t-1">
98+
9999
<div class="copyright">
100100
<?php echo $copyright; ?>
101101
</div>
102-
<div class="site-info">
103-
<a href="<?php echo esc_url(__('https://wordpress.org/', 'event-listing')); ?>">
102+
<div class="site-info">Powered by
103+
<a href="<?php echo esc_url(__('https://wordpress.org/themes/event-listing/', 'event-listing')); ?>">
104104
<?php
105105
/* translators: %s: CMS name, i.e. WordPress. */
106-
printf(esc_html__('Proudly powered by %s', 'event-listing'), 'WordPress');
106+
printf(esc_html__('Event Listing WordPress Theme %s', 'event-listing'), '');
107107
?>
108108
</a>
109109
<span class="sep"> | </span>
110110
<?php
111111
/* translators: 1: Theme name, 2: Theme author. */
112-
printf(esc_html__('Theme: %1$s by %2$s.', 'event-listing'), 'Event Listing', '<a href="https://wp-eventmanager.com/">WP Event Manager</a>');
112+
printf(esc_html__('%1$s %2$s.', 'event-listing'), '', '<a href="https://wp-eventmanager.com/">WP Event Manager</a>');
113113
?>
114114
</div><!-- .site-info -->
115-
</div><!-- .column -->
116-
</div><!-- .row -->
115+
116+
117117
</div><!-- .container -->
118118
</div> <!-- .footer-bottom -->
119119

‎functions.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,12 @@ function event_listing_scripts() {
223223

224224
/*font */
225225
global $event_listing_theme_options;
226+
227+
if(empty($event_listing_theme_options))
228+
return;
229+
226230
$event_listing_name_font_url = esc_attr( $event_listing_theme_options['event-listing-font-family-url'] );
231+
227232
$h1_font = esc_attr( $event_listing_theme_options['event-listing-h1-font-family-url'] );
228233
$h2_font = esc_attr( $event_listing_theme_options['event-listing-h2-font-family-url'] );
229234
$h3_font = esc_attr( $event_listing_theme_options['event-listing-h3-font-family-url'] );
@@ -256,7 +261,7 @@ function event_listing_scripts() {
256261
wp_enqueue_script( 'comment-reply' );
257262
}
258263
}
259-
add_action( 'wp_enqueue_scripts', 'event_listing_scripts' );
264+
add_action( 'wp_enqueue_scripts', 'event_listing_scripts',99 );
260265

261266
/**
262267
* Implement the Custom Header feature.

‎inc/customizer.php

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,61 +12,63 @@ function event_listing_default_theme_options_values() {
1212
$default_theme_options = array(
1313

1414
/*Paragraph Options*/
15-
'event-listing-font-family-url' => 'Muli:400,600',
15+
'event-listing-font-family-url' => 'Roboto:400,500,300,700,400italic',
1616
'event-listing-font-paragraph-font-size' => 16,
1717
'event-listing-font-paragraph-line-height' => 28,
1818
'event-listing-font-paragraph-letter-spacing' => 0,
1919
'event-listing-font-paragraph-font-weight' => 400,
2020

2121
/* H1 Options */
22-
'event-listing-h1-font-family-url' => 'Prata',
23-
'event-listing-font-h1-font-size' => 29,
22+
'event-listing-h1-font-family-url' => 'Roboto:400,500,300,700,400italic',
23+
'event-listing-font-h1-font-size' => 30,
2424
'event-listing-font-h1-line-height' => 34,
2525
'event-listing-font-h1-letter-spacing' => 0,
26-
'event-listing-font-h1-font-weight' => 400,
26+
'event-listing-font-h1-font-weight' => 700,
2727

2828
/* H2 Options */
29-
'event-listing-h2-font-family-url' =>'Prata',
29+
'event-listing-h2-font-family-url' =>'Roboto:400,500,300,700,400italic',
3030
'event-listing-font-h2-font-size' => 24,
31-
'event-listing-font-h2-line-height' => 39,
31+
'event-listing-font-h2-line-height' => 36,
3232
'event-listing-font-h2-letter-spacing' => 0,
33-
'event-listing-font-h2-font-weight' => 400,
33+
'event-listing-font-h2-font-weight' => 600,
3434

3535
/* H3 Options */
36-
'event-listing-h3-font-family-url' => 'Prata',
37-
'event-listing-font-h3-font-size' => 23,
38-
'event-listing-font-h3-line-height' => 27,
36+
'event-listing-h3-font-family-url' => 'Roboto:400,500,300,700,400italic',
37+
'event-listing-font-h3-font-size' => 20,
38+
'event-listing-font-h3-line-height' => 26,
3939
'event-listing-font-h3-letter-spacing' => 0,
40-
'event-listing-font-h3-font-weight' => 400,
40+
'event-listing-font-h3-font-weight' => 500,
4141

4242
/* H4 Options */
43-
'event-listing-h4-font-family-url' => 'Prata',
44-
'event-listing-font-h4-font-size' => 20,
43+
'event-listing-h4-font-family-url' => 'Roboto:400,500,300,700,400italic',
44+
'event-listing-font-h4-font-size' => 18,
4545
'event-listing-font-h4-line-height' => 24,
4646
'event-listing-font-h4-letter-spacing' => 0,
4747
'event-listing-font-h4-font-weight' => 400,
4848

4949
/* H5 Options */
50-
'event-listing-h5-font-family-url' => 'Prata',
51-
'event-listing-font-h5-font-size' => 17,
50+
'event-listing-h5-font-family-url' => 'Roboto:400,500,300,700,400italic',
51+
'event-listing-font-h5-font-size' => 16,
5252
'event-listing-font-h5-line-height' => 20,
5353
'event-listing-font-h5-letter-spacing' => 0,
5454
'event-listing-font-h5-font-weight' => 400,
5555

5656
/* H6 Options */
57-
'event-listing-h6-font-family-url' => 'Prata',
58-
'event-listing-font-h6-font-size' => 15,
57+
'event-listing-h6-font-family-url' => 'Roboto:400,500,300,700,400italic',
58+
'event-listing-font-h6-font-size' => 14,
5959
'event-listing-font-h6-line-height' => 18,
6060
'event-listing-font-h6-letter-spacing' => 0,
6161
'event-listing-font-h6-font-weight' => 400,
6262

6363

6464
/* Colors */
65-
'event_listing_primary_color' => '#00a5fa',
66-
'event_listing_secondary_color' => '#404040',
67-
'event_listing_button_color' => '#00a5fa',
68-
'event_listing_button_text_color'=>'#fff',
69-
'event_listing_link_color' => '#00a5fa',
65+
'event_listing_primary_color' => '#0096ff',
66+
'event_listing_secondary_color' => '#111111',
67+
'event_listing_button_color' => '#0096ff',
68+
'event_listing_button_text_color'=>'#ffffff',
69+
'event_listing_link_color' => '#0096ff',
70+
'event_listing_link_hover_color' => '#111111',
71+
'event_listing_page_content_color' => '#ffffff',
7072

7173
/* footer */
7274
'event-listing-footer-copyright'=> esc_html__('Your Copyright Text', 'event-listing'),

‎inc/functions/custom-functions.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ function event_listing_sanitize_number_range($number, $setting)
329329
function event_listing_custom_class($classes)
330330
{
331331
global $event_listing_theme_options;
332+
if(empty($event_listing_theme_options))
333+
return;
334+
332335
$layout = $event_listing_theme_options['event-listing-full-boxed'];
333336
$classes[] = esc_attr($event_listing_theme_options['event-listing-site-sidebar']);
334337
$classes[] = esc_attr($event_listing_theme_options['event-listing-mobile-sidebar']);
@@ -419,4 +422,4 @@ function event_listing_excerpt_more($more)
419422
}
420423
}
421424
endif;
422-
add_filter('excerpt_more', 'event_listing_excerpt_more');
425+
add_filter('excerpt_more', 'event_listing_excerpt_more');

‎inc/functions/customizer-color.php

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,24 @@
11
<?php
2+
3+
$wp_customize->add_setting( 'event_listing_options[event_listing_page_content_color]',
4+
array(
5+
'default' => $default['event_listing_page_content_color'],
6+
'sanitize_callback' => 'sanitize_hex_color',
7+
)
8+
);
9+
$wp_customize->add_control(
10+
new WP_Customize_Color_Control(
11+
$wp_customize,
12+
'event_listing_options[event_listing_page_content_color]',
13+
array(
14+
'label' => esc_html__( 'Content Color', 'event-listing' ),
15+
'description' => esc_html__( 'Content Color of the site.', 'event-listing' ),
16+
'section' => 'colors',
17+
)
18+
)
19+
);
20+
21+
222
$wp_customize->add_setting( 'event_listing_options[event_listing_primary_color]',
323
array(
424
'default' => $default['event_listing_primary_color'],
@@ -94,3 +114,44 @@
94114
)
95115
);
96116

117+
118+
$wp_customize->add_setting( 'event_listing_options[event_listing_link_hover_color]',
119+
array(
120+
'default' => $default['event_listing_link_hover_color'],
121+
'sanitize_callback' => 'sanitize_hex_color',
122+
)
123+
);
124+
$wp_customize->add_control(
125+
new WP_Customize_Color_Control(
126+
$wp_customize,
127+
'event_listing_options[event_listing_link_hover_color]',
128+
array(
129+
'label' => esc_html__( 'Link hover Color', 'event-listing' ),
130+
'description' => esc_html__( 'Link hover Color of the site.', 'event-listing' ),
131+
'section' => 'colors',
132+
)
133+
)
134+
);
135+
136+
137+
//#WPEM Colors
138+
$wp_customize->add_setting( 'event_listing_options[event_listing_wpem_primary_color]',
139+
array(
140+
'default' => '',
141+
'sanitize_callback' => 'sanitize_hex_color',
142+
)
143+
);
144+
$wp_customize->add_control(
145+
new WP_Customize_Color_Control(
146+
$wp_customize,
147+
'event_listing_options[event_listing_wpem_primary_color]',
148+
array(
149+
'label' => esc_html__( 'WPEM Primary Color', 'event-listing' ),
150+
'description' => esc_html__( 'WPEM Primary Color of the site.', 'event-listing' ),
151+
'section' => 'colors',
152+
)
153+
)
154+
);
155+
156+
157+

0 commit comments

Comments
 (0)