Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Commit

Permalink
Merge pull request #55 from Codeinwp/development
Browse files Browse the repository at this point in the history
Fixed issue with sidebar not appearing on 404 not found page
New Github icon
New option to change the color for the icon menu
Styled captions on gallery
Reorganize Customize panels
Added grunt + fix all the errors generated
  • Loading branch information
rodica-andronache authored Nov 21, 2016
2 parents 9ffc5e0 + 9a7fd36 commit d92dd7d
Show file tree
Hide file tree
Showing 48 changed files with 6,765 additions and 4,154 deletions.
12 changes: 12 additions & 0 deletions .distignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
.git
.distignore
.gitignore
.travis.yml
.jshintrc
Gruntfile.js
grunt
phpcs.xml
node_modules
logs
package.json
npm-debug.log
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# IntelliJ project files
.idea
*.iml
out
gen
node_modules
logs
npm-debug.log
23 changes: 23 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"expr": true,
"immed": true,
"noarg": true,
"nonbsp": true,
"onevar": true,
"quotmark": "single",
"trailing": true,
"undef": true,
"unused": true,
"browser": true,
"globals": {
"_": false,
"Backbone": false,
"jQuery": false,
"JSON": false,
"wp": false
}
}
45 changes: 45 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
language: php

## PHP versions to test against
php:
- "7.0"
- "5.6"
- "5.5"
- "5.4"
- "5.3"
- "5.2"
sudo: false
env:
- WP_VERSION=master WP_MULTISITE=0
install:
- . $HOME/.nvm/nvm.sh
- nvm install stable
- nvm use stable
- npm install
- npm install grunt-cli -g
before_script:
## Install the wordpress latest version
- export WP_DEVELOP_DIR=/tmp/wordpress/
- mkdir -p $WP_DEVELOP_DIR
- git clone --depth=1 --branch="$WP_VERSION" git://develop.git.wordpress.org/ $WP_DEVELOP_DIR
- theme_slug=$(basename $(pwd))
- theme_dir=$WP_DEVELOP_DIR/src/wp-content/themes/$theme_slug
- cd ..
- mv $theme_slug $theme_dir
- cd $WP_DEVELOP_DIR
- cp wp-tests-config-sample.php wp-tests-config.php
- sed -i "s/youremptytestdbnamehere/wordpress_test/" wp-tests-config.php
- sed -i "s/yourusernamehere/root/" wp-tests-config.php
- sed -i "s/yourpasswordhere//" wp-tests-config.php
- mysql -e 'CREATE DATABASE wordpress_test;' -uroot

## install PHPCS and Wordpress standards
- pear install pear/PHP_CodeSniffer
- mkdir wordpress-coding-standards && curl -L https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/archive/master.tar.gz | tar xz --strip-components=1 -C wordpress-coding-standards
- phpenv rehash
- phpcs --config-set installed_paths $WP_DEVELOP_DIR/wordpress-coding-standards
- phpenv rehash
- cd $theme_dir

script:
grunt travis
1 change: 1 addition & 0 deletions 404.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@
</main><!-- #main -->
</div><!-- #primary -->

<?php get_sidebar(); ?>
<?php get_footer(); ?>
12 changes: 12 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// jshint node:true

module.exports = function( grunt ) {
'use strict';

var loader = require( 'load-project-config' ),
config = require( 'grunt-theme-fleet' );
config = config();
config.files.php.push( '!inc/admin/**/*.php' );
config.files.js.push( '!inc/admin/**/*.js' );
loader( grunt, config ).init();
};
5 changes: 4 additions & 1 deletion archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,14 @@
<?php while ( have_posts() ) : the_post(); ?>

<?php
/* Include the Post-Format-specific template for the content.

/*
Include the Post-Format-specific template for the content.
* If you want to override this in a child theme, then include a file
* called content-___.php (where ___ is the Post Format name) and that will be used instead.
*/
get_template_part( 'content', get_post_format() );

?>

<?php endwhile; ?>
Expand Down
Loading

0 comments on commit d92dd7d

Please sign in to comment.