Skip to content

Commit 7331bab

Browse files
committed
Bug fixing
1 parent 35ee488 commit 7331bab

File tree

325 files changed

+101
-48906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+101
-48906
lines changed

.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "inc/libraries/epsilon-framework"]
2+
path = inc/libraries/epsilon-framework
3+
url = https://github.com/MachoThemes/epsilon-framework
4+
[submodule "inc/libraries/epsilon-theme-dashboard"]
5+
path = inc/libraries/epsilon-theme-dashboard
6+
url = https://github.com/MachoThemes/epsilon-theme-dashboard

css/style.css

+8-3
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,16 @@ h1, h2, h3, h4, h5, h6, figure {
101101
font-size: 24px;
102102
margin: 0;
103103
padding: 0;
104-
line-height: 40px;
104+
line-height: 24px;
105105
font-weight: 700;
106106
text-transform: uppercase;
107107
}
108-
108+
.header_tagline{
109+
line-height: 12px;
110+
font-size: 14px;
111+
display: block;
112+
margin-top: 5px;
113+
}
109114
.colorlib-nav #colorlib-logo a {
110115
position: relative;
111116
color: #000;
@@ -135,7 +140,7 @@ h1, h2, h3, h4, h5, h6, figure {
135140
.colorlib-nav ul li a {
136141
position: relative;
137142
font-size: 12px;
138-
padding: 10px 15px;
143+
padding: 18px 15px;
139144
color: rgba(0, 0, 0, 0.7);
140145
-webkit-transition: 0.5s;
141146
-o-transition: 0.5s;

footer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</div>
88
<div class="row">
99
<div class="instagram-entry"
10-
data-username="<?php echo wp_kses_post(get_theme_mod('stuff_instagram_gallery_user', 'remonfoysal')); ?>"
10+
data-username="<?php echo wp_kses_post(get_theme_mod('stuff_instagram_gallery_user', 'ajanta91')); ?>"
1111
data-items="<?php echo '8'; ?>"></div>
1212
</div>
1313
</div>

functions.php

+36-23
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,17 @@
6969
if ( ! function_exists( 'stuff_setup' ) ) :
7070
function stuff_setup(){
7171

72-
add_theme_support( 'custom-header' );
72+
// Custom Header
73+
add_theme_support( 'custom-header', array(
74+
'default-text-color' => '#000',
75+
'width' => 1920,
76+
'height' => 180,
77+
'flex-width' => true,
78+
'flex-height' => true,
79+
)
80+
);
81+
82+
// Custom Background
7383
add_theme_support( "custom-background" );
7484

7585
// Add default posts and comments RSS feed links to head.
@@ -152,41 +162,43 @@ function stuff_setup(){
152162
function stuff_enqueue_styles_scripts(){
153163

154164
//add style
155-
wp_enqueue_style( 'animate', STUFF_CSS . 'animate.css', array() );
156-
wp_enqueue_style( 'icomoon', STUFF_CSS . 'icomoon.css', array() );
157-
wp_enqueue_style( 'bootstrap', STUFF_CSS . 'bootstrap.css', array() );
158-
wp_enqueue_style( 'magnific-popup', STUFF_CSS . 'magnific-popup.css', array() );
159-
wp_enqueue_style( 'flexslider', STUFF_CSS . 'flexslider.css', array() );
160-
wp_enqueue_style( 'owl-carousel', STUFF_CSS . 'owl.carousel.min.css', array() );
161-
wp_enqueue_style( 'owl-theme', STUFF_CSS . 'owl.theme.default.min.css', array() );
162-
wp_enqueue_style( 'theme-css', STUFF_CSS . 'style.css', array() );
163165
$googleFontOption = array(
164166
'family' => 'Roboto:300,400,700',
165167
);
166-
wp_enqueue_style( 'google_fonts', add_query_arg( $googleFontOption, "//fonts.googleapis.com/css" ), array(), null );
168+
wp_enqueue_style( 'google_fonts', add_query_arg( $googleFontOption, "//fonts.googleapis.com/css" ) );
169+
170+
wp_enqueue_style( 'animate', STUFF_CSS . 'animate.css' );
171+
wp_enqueue_style( 'icomoon', STUFF_CSS . 'icomoon.css' );
172+
wp_enqueue_style( 'bootstrap', STUFF_CSS . 'bootstrap.css' );
173+
wp_enqueue_style( 'magnific-popup', STUFF_CSS . 'magnific-popup.css' );
174+
wp_enqueue_style( 'flexslider', STUFF_CSS . 'flexslider.css' );
175+
wp_enqueue_style( 'owl-carousel', STUFF_CSS . 'owl.carousel.min.css' );
176+
wp_enqueue_style( 'owl-theme', STUFF_CSS . 'owl.theme.default.min.css' );
177+
wp_enqueue_style( 'theme-css', STUFF_CSS . 'style.css' );
178+
167179
wp_enqueue_style('stuff',get_stylesheet_uri());
168180

169181
//add script
170-
wp_enqueue_script('modernizr',STUFF_JS.'modernizr-2.6.2.min.js',array('jquery'),false,false);
171-
wp_enqueue_script('respond',STUFF_JS.'respond.min.js',array('jquery'),false,false);
172-
wp_enqueue_script('jquery-easing',STUFF_JS.'jquery.easing.1.3.js',array('jquery'),false,true);
173-
wp_enqueue_script('bootstrap-js',STUFF_JS.'bootstrap.min.js',array('jquery'),false,true);
174-
wp_enqueue_script('jquery-waypoints',STUFF_JS.'jquery.waypoints.min.js',array('jquery'),false,true);
175-
wp_enqueue_script('jquery-flexslider',STUFF_JS.'jquery.flexslider-min.js',array('jquery'),false,true);
176-
wp_enqueue_script('owl-carousel-js',STUFF_JS.'owl.carousel.min.js',array('jquery'),false,true);
177-
wp_enqueue_script('jquery-magnific-js',STUFF_JS.'jquery.magnific-popup.min.js',array('jquery'),false,true);
178-
wp_enqueue_script('magnific-popup-options',STUFF_JS.'magnific-popup-options.js',array('jquery'),false,true);
179-
wp_enqueue_script('instagram-feed',STUFF_JS.'jquery.instagramFeed.min.js',array('jquery'),false,true);
180-
wp_enqueue_script('stuff-main',STUFF_JS.'main.js',array('jquery'),false,true);
182+
wp_enqueue_script('modernizr',STUFF_JS.'modernizr-2.6.2.min.js',array('jquery'), '2.6.2', false);
183+
wp_enqueue_script('respond',STUFF_JS.'respond.min.js',array('jquery'), '1.4.2', false);
184+
wp_enqueue_script('jquery-easing',STUFF_JS.'jquery.easing.1.3.js',array('jquery'), '1.3', true);
185+
wp_enqueue_script('bootstrap-js',STUFF_JS.'bootstrap.min.js',array('jquery'), '3.3.5',true);
186+
wp_enqueue_script('jquery-waypoints',STUFF_JS.'jquery.waypoints.min.js',array('jquery'), '4.0.0', true);
187+
wp_enqueue_script('jquery-flexslider',STUFF_JS.'jquery.flexslider-min.js',array('jquery'), '2.6.0', true);
188+
wp_enqueue_script('owl-carousel-js',STUFF_JS.'owl.carousel.min.js',array('jquery'), '2.0.6', true);
189+
wp_enqueue_script('jquery-magnific-js',STUFF_JS.'jquery.magnific-popup.min.js',array('jquery'), '0.9.9', true);
190+
wp_enqueue_script('magnific-popup-options',STUFF_JS.'magnific-popup-options.js',array('jquery'), '0.9.9',true);
191+
wp_enqueue_script('instagram-feed',STUFF_JS.'jquery.instagramFeed.min.js',array('jquery'), '1.0.0', true);
192+
wp_enqueue_script('stuff-main',STUFF_JS.'main.js',array('jquery'), '1.0.0', true);
181193

182194
$string = '';
183195
$api = get_theme_mod( 'stuff_google_api_key', 'AIzaSyCefOgb1ZWqYtj7raVSmN4PL2WkTrc-KyA' );
184196
if ( ! empty( $api ) ) {
185197
$string = '?key=' . $api;
186198
}
187199

188-
wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js' . $string, array(), false, true );
189-
wp_enqueue_script('map-function',STUFF_JS.'google_map.js',array('jquery'),false,true);
200+
wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js' . $string, array(), '1.0.0', true );
201+
wp_enqueue_script( 'map-function', STUFF_JS.'google_map.js', array('jquery'), '1.0.0', true);
190202

191203
//reply comments
192204
if ( is_singular() && comments_open() && get_option('thread_comments') ) {
@@ -216,6 +228,7 @@ function stuff_logo(){
216228
else{
217229
?>
218230
<div id="colorlib-logo"><a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php bloginfo('name')?></a></div>
231+
<span class="header_tagline"><?php echo esc_html( get_bloginfo('description') ) ?></span>
219232
<?php
220233
}
221234
}

inc/customizer/demo/demo.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"class": "Epsilon_Post_Generator",
1313
"method": "add_posts"
1414
},
15-
"post_count": 20,
15+
"post_count": 6,
1616
"image_size": [
1717
800,
1818
530

inc/libraries/class-stuff-dashboard-setup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function add_admin_notice() {
8181
}
8282

8383
if ( empty( $this->notice ) ) {
84-
$this->notice .= '<img src="' . esc_url( get_template_directory_uri() ) . '/inc/libraries/epsilon-theme-dashboard/assets/images/macho-themes-logo-black.png" class="epsilon-author-logo" />';
84+
$this->notice .= '<img src="' . esc_url( get_template_directory_uri() ) . '/inc/libraries/epsilon-theme-dashboard/assets/images/colorlib-logo-dark.png" class="epsilon-author-logo" />';
8585

8686

8787
/* Translators: Notice Title */

inc/libraries/class-stuff-notify-system.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ public static function plugin_verifier( $slug = '', $get = '', $plugin_name = ''
4343
'installed' => Epsilon_Notify_System::check_plugin_is_installed( $slug ),
4444
'active' => Epsilon_Notify_System::check_plugin_is_active( $slug ),
4545
);
46-
46+
4747
if ( empty( $get ) ) {
4848
$arr = array_filter( $arr );
4949

5050
return 2 === count( $arr );
5151
}
52+
5253
}
5354

5455
// Translators: %s is the plugin name.

inc/libraries/epsilon-framework

Submodule epsilon-framework added at dc1e5bc

0 commit comments

Comments
 (0)