Skip to content

Commit b3df3ad

Browse files
cristianraibercristianraiber
authored
Merge pull request #222 from MachoThemes/master
2.4.2
2 parents 78d2809 + 3318174 commit b3df3ad

File tree

4 files changed

+199
-5
lines changed

4 files changed

+199
-5
lines changed

‎Gruntfile.js

+171
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,171 @@
1+
'use strict';
2+
3+
module.exports = function( grunt ) {
4+
// load all tasks
5+
require( 'load-grunt-tasks' )( grunt, { scope: 'devDependencies' } );
6+
7+
grunt.config.init( {
8+
pkg: grunt.file.readJSON( 'package.json' ),
9+
10+
dirs: {
11+
css: 'assets/css',
12+
js: 'assets/js'
13+
},
14+
15+
makepot: {
16+
target: {
17+
options: {
18+
domainPath: '/languages/',
19+
potFilename: '<%= pkg.name %>.pot',
20+
potHeaders: {
21+
poedit: true,
22+
'x-poedit-keywordslist': true
23+
},
24+
processPot: function( pot, options ) {
25+
pot.headers[ 'report-msgid-bugs-to' ] = 'https://www.colorlib.com/';
26+
pot.headers[ 'language-team' ] = 'Colorlib <office@colorlib.com>';
27+
pot.headers[ 'last-translator' ] = 'Colorlib <office@colorlib.com>';
28+
pot.headers[ 'language-team' ] = 'Colorlib <office@colorlib.com>';
29+
return pot;
30+
},
31+
updateTimestamp: true,
32+
type: 'wp-theme'
33+
34+
}
35+
}
36+
},
37+
38+
addtextdomain: {
39+
target: {
40+
options: {
41+
updateDomains: true,
42+
textdomain: '<%= pkg.name %>'
43+
},
44+
files: {
45+
src: [
46+
'*.php',
47+
'!node_modules/**'
48+
]
49+
}
50+
}
51+
},
52+
53+
checktextdomain: {
54+
standard: {
55+
options: {
56+
text_domain: [ 'shapely', 'epsilon-framework' ], //Specify allowed domain(s)
57+
create_report_file: 'true',
58+
keywords: [ //List keyword specifications
59+
'__:1,2d',
60+
'_e:1,2d',
61+
'_x:1,2c,3d',
62+
'esc_html__:1,2d',
63+
'esc_html_e:1,2d',
64+
'esc_html_x:1,2c,3d',
65+
'esc_attr__:1,2d',
66+
'esc_attr_e:1,2d',
67+
'esc_attr_x:1,2c,3d',
68+
'_ex:1,2c,3d',
69+
'_n:1,2,4d',
70+
'_nx:1,2,4c,5d',
71+
'_n_noop:1,2,3d',
72+
'_nx_noop:1,2,3c,4d'
73+
]
74+
},
75+
files: [
76+
{
77+
src: [
78+
'**/*.php',
79+
'!**/node_modules/**',
80+
], //all php
81+
expand: true
82+
} ]
83+
}
84+
},
85+
86+
clean: {
87+
init: {
88+
src: [ 'build/' ]
89+
},
90+
build: {
91+
src: [
92+
'build/*',
93+
'!build/<%= pkg.name %>.zip'
94+
]
95+
},
96+
},
97+
98+
copy: {
99+
build: {
100+
expand: true,
101+
src: [
102+
'**',
103+
'!node_modules/**',
104+
'!build/**',
105+
'!readme.md',
106+
'!README.md',
107+
'!phpcs.ruleset.xml',
108+
'!Gruntfile.js',
109+
'!package.json',
110+
'!set_tags.sh',
111+
'!shapely.zip',
112+
'!nbproject/**' ],
113+
dest: 'build/'
114+
}
115+
},
116+
117+
compress: {
118+
build: {
119+
options: {
120+
pretty: true,
121+
archive: '<%= pkg.name %>.zip'
122+
},
123+
expand: true,
124+
cwd: 'build/',
125+
src: [ '**/*' ],
126+
dest: '<%= pkg.name %>/'
127+
}
128+
},
129+
130+
imagemin: {
131+
jpg: {
132+
options: {
133+
progressive: true
134+
}
135+
},
136+
png: {
137+
options: {
138+
optimizationLevel: 7
139+
}
140+
},
141+
dynamic: {
142+
files: [
143+
{
144+
expand: true,
145+
cwd: 'assets/img/',
146+
src: [ '**/*.{png,jpg,gif}' ],
147+
dest: 'assets/img/'
148+
} ]
149+
}
150+
},
151+
152+
} );
153+
154+
// Check Missing Text Domain Strings
155+
grunt.registerTask( 'textdomain', [
156+
'checktextdomain'
157+
] );
158+
159+
// Minify Images
160+
grunt.registerTask( 'minimg', [
161+
'imagemin:dynamic'
162+
] );
163+
164+
// Build task
165+
grunt.registerTask( 'build-archive', [
166+
'clean:init',
167+
'copy',
168+
'compress:build',
169+
'clean:init'
170+
] );
171+
};

‎functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function sparkling_scripts() {
249249
}
250250

251251
// Add main theme stylesheet
252-
wp_enqueue_style( 'sparkling-style', get_stylesheet_uri(), null, '2.4.0', 'all' );
252+
wp_enqueue_style( 'sparkling-style', get_stylesheet_uri(), null, '2.4.2', 'all' );
253253

254254
// Add Bootstrap default JS
255255
wp_enqueue_script( 'sparkling-bootstrapjs', get_template_directory_uri() . '/assets/js/vendor/bootstrap.min.js', array( 'jquery' ) );

‎package.json

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "sparkling",
3+
"main": "Gruntfile.js",
4+
"version": "2.4.2",
5+
"homepage": "https://www.colorlib.com",
6+
"author": "Colorlib",
7+
"license": "GPL v3",
8+
"repository": "https://github.com/puikinsh/sparkling",
9+
"devDependencies": {
10+
"grunt": "^1.0.2",
11+
"grunt-checktextdomain": "^1.0.1",
12+
"grunt-cli": "^1.2.0",
13+
"grunt-contrib-clean": "^1.1.0",
14+
"grunt-contrib-compress": "^1.4.3",
15+
"grunt-contrib-copy": "^1.0.0",
16+
"grunt-contrib-imagemin": "^2.0.1",
17+
"grunt-wp-i18n": "^1.0.2",
18+
"load-grunt-tasks": "^3.5.2"
19+
}
20+
}

‎style.css

+7-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Theme URI: http://colorlib.com/wp/themes/sparkling
44
Author: Colorlib
55
Author URI: http://colorlib.com/
66
Description: Sparkling is a clean minimal and responsive WordPress theme well suited for travel, health, business, finance, portfolio, design, art, photography, personal, ecommerce and any other creative websites and blogs. Developed using Bootstrap 3 that makes it mobile and tablets friendly. Theme comes with full-screen slider, social icon integration, author bio, popular posts widget and improved category widget. Sparkling incorporates latest web standards such as HTML5 and CSS3 and is SEO friendly thanks to its clean structure and codebase. It has dozens of Theme Options based on WordPress Customizer to change theme layout, colors, fonts, slider settings and much more. Theme is also translation and multilingual ready, compatible with WPML and is available in Spanish, French, Dutch, Polish, Russian, German, Brazilian Portuguese, Portuguese (Portugal), Persian (Iranian language), Romanian, Turkish, Bulgarian, Japanese, Lithuanian, Czech, Ukrainian, Traditional Chinese, Simplified Chinese, Indonesian, Estonian, Spanish (Argentina), Hungarian and Italian. Sparkling is a free WordPress theme with premium functionality and design. Theme is ecommerce ready thanks to its WooCommerce integration. Now theme is optimized to work with bbPress, Contact Form 7, Jetpack, WooCommerce and other popular free and premium plugins. Lately we introduced a sticky/fixed navigation that you can enable or disable via WordPress Customizer.
7-
Version: 2.4.1
7+
Version: 2.4.2
88
License: GNU General Public License v2 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010
Text Domain: sparkling
@@ -646,14 +646,17 @@ object {
646646

647647
#secondary .widget_archive ul li:before {
648648
content: '\f073';
649+
font-weight: 900;
649650
}
650651

651652
#secondary .widget_categories ul li:before {
652-
content: '\f115';
653+
content: '\f07c';
654+
font-weight: 900;
653655
}
654656

655657
#secondary .widget_recent_comments ul li:before {
656-
content: '\f0e5';
658+
content: '\f075';
659+
font-weight: 900;
657660
}
658661

659662
.well {
@@ -2444,4 +2447,4 @@ button[type=submit],
24442447
left: 50%;
24452448
transform: translateX(-50%);
24462449
width: auto;
2447-
}
2450+
}

0 commit comments

Comments
 (0)