Skip to content

Commit

Permalink
Merge pull request #222 from MachoThemes/master
Browse files Browse the repository at this point in the history
2.4.2
  • Loading branch information
cristianraiber authored May 9, 2018
2 parents 78d2809 + 3318174 commit b3df3ad
Show file tree
Hide file tree
Showing 4 changed files with 199 additions and 5 deletions.
171 changes: 171 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
'use strict';

module.exports = function( grunt ) {
// load all tasks
require( 'load-grunt-tasks' )( grunt, { scope: 'devDependencies' } );

grunt.config.init( {
pkg: grunt.file.readJSON( 'package.json' ),

dirs: {
css: 'assets/css',
js: 'assets/js'
},

makepot: {
target: {
options: {
domainPath: '/languages/',
potFilename: '<%= pkg.name %>.pot',
potHeaders: {
poedit: true,
'x-poedit-keywordslist': true
},
processPot: function( pot, options ) {
pot.headers[ 'report-msgid-bugs-to' ] = 'https://www.colorlib.com/';
pot.headers[ 'language-team' ] = 'Colorlib <office@colorlib.com>';
pot.headers[ 'last-translator' ] = 'Colorlib <office@colorlib.com>';
pot.headers[ 'language-team' ] = 'Colorlib <office@colorlib.com>';
return pot;
},
updateTimestamp: true,
type: 'wp-theme'

}
}
},

addtextdomain: {
target: {
options: {
updateDomains: true,
textdomain: '<%= pkg.name %>'
},
files: {
src: [
'*.php',
'!node_modules/**'
]
}
}
},

checktextdomain: {
standard: {
options: {
text_domain: [ 'shapely', 'epsilon-framework' ], //Specify allowed domain(s)
create_report_file: 'true',
keywords: [ //List keyword specifications
'__:1,2d',
'_e:1,2d',
'_x:1,2c,3d',
'esc_html__:1,2d',
'esc_html_e:1,2d',
'esc_html_x:1,2c,3d',
'esc_attr__:1,2d',
'esc_attr_e:1,2d',
'esc_attr_x:1,2c,3d',
'_ex:1,2c,3d',
'_n:1,2,4d',
'_nx:1,2,4c,5d',
'_n_noop:1,2,3d',
'_nx_noop:1,2,3c,4d'
]
},
files: [
{
src: [
'**/*.php',
'!**/node_modules/**',
], //all php
expand: true
} ]
}
},

clean: {
init: {
src: [ 'build/' ]
},
build: {
src: [
'build/*',
'!build/<%= pkg.name %>.zip'
]
},
},

copy: {
build: {
expand: true,
src: [
'**',
'!node_modules/**',
'!build/**',
'!readme.md',
'!README.md',
'!phpcs.ruleset.xml',
'!Gruntfile.js',
'!package.json',
'!set_tags.sh',
'!shapely.zip',
'!nbproject/**' ],
dest: 'build/'
}
},

compress: {
build: {
options: {
pretty: true,
archive: '<%= pkg.name %>.zip'
},
expand: true,
cwd: 'build/',
src: [ '**/*' ],
dest: '<%= pkg.name %>/'
}
},

imagemin: {
jpg: {
options: {
progressive: true
}
},
png: {
options: {
optimizationLevel: 7
}
},
dynamic: {
files: [
{
expand: true,
cwd: 'assets/img/',
src: [ '**/*.{png,jpg,gif}' ],
dest: 'assets/img/'
} ]
}
},

} );

// Check Missing Text Domain Strings
grunt.registerTask( 'textdomain', [
'checktextdomain'
] );

// Minify Images
grunt.registerTask( 'minimg', [
'imagemin:dynamic'
] );

// Build task
grunt.registerTask( 'build-archive', [
'clean:init',
'copy',
'compress:build',
'clean:init'
] );
};
2 changes: 1 addition & 1 deletion functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function sparkling_scripts() {
}

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

// Add Bootstrap default JS
wp_enqueue_script( 'sparkling-bootstrapjs', get_template_directory_uri() . '/assets/js/vendor/bootstrap.min.js', array( 'jquery' ) );
Expand Down
20 changes: 20 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"name": "sparkling",
"main": "Gruntfile.js",
"version": "2.4.2",
"homepage": "https://www.colorlib.com",
"author": "Colorlib",
"license": "GPL v3",
"repository": "https://github.com/puikinsh/sparkling",
"devDependencies": {
"grunt": "^1.0.2",
"grunt-checktextdomain": "^1.0.1",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-compress": "^1.4.3",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-imagemin": "^2.0.1",
"grunt-wp-i18n": "^1.0.2",
"load-grunt-tasks": "^3.5.2"
}
}
11 changes: 7 additions & 4 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI: http://colorlib.com/wp/themes/sparkling
Author: Colorlib
Author URI: http://colorlib.com/
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.
Version: 2.4.1
Version: 2.4.2
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: sparkling
Expand Down Expand Up @@ -646,14 +646,17 @@ object {

#secondary .widget_archive ul li:before {
content: '\f073';
font-weight: 900;
}

#secondary .widget_categories ul li:before {
content: '\f115';
content: '\f07c';
font-weight: 900;
}

#secondary .widget_recent_comments ul li:before {
content: '\f0e5';
content: '\f075';
font-weight: 900;
}

.well {
Expand Down Expand Up @@ -2444,4 +2447,4 @@ button[type=submit],
left: 50%;
transform: translateX(-50%);
width: auto;
}
}

0 comments on commit b3df3ad

Please sign in to comment.