Skip to content

Commit

Permalink
First merge of wd_s to custom kn_wd_s
Browse files Browse the repository at this point in the history
* wd_s_track_original: (1040 commits)
  Run through Sass Linter. Fixes WebDevStudios#216
  PHPCS Cleanup of Theme (minus template-tags.php) (WebDevStudios#219)
  Lint Template Tags (WebDevStudios#218)
  New commit message
  Enhancement/screen reader text white space (WebDevStudios#217)
  don’t lint minified files
  package.json bump to latest
  bower.json bump to latest
  New commit message
  improve svg template tag. fixes WebDevStudios#207. props @samikeijonen (WebDevStudios#212)
  Hotfix/add babel WebDevStudios#205 (WebDevStudios#211)
  Hotfix/update readme WebDevStudios#208 (WebDevStudios#210)
  remove grunt. fixes WebDevStudios#206. (WebDevStudios#209)
  update Sass Lint configuration to be less in-your-face (WebDevStudios#202)
  add .editorconfig with WDS/WP standards in mind (WebDevStudios#204)
  add gulp js:lint task to readme
  gulp scripts
  run eslint —fix
  add eslint wordpress package
  swap deprecated .eslintrc with .eslintrc.js
  ...

# Conflicts:
#	404.php
#	Gulpfile.js
#	archive.php
#	assets/images/svg-icons/_IcoMoon.json
#	assets/images/svg-icons/bars.svg
#	assets/images/svg-icons/close.svg
#	assets/images/svg-icons/facebook-square.svg
#	assets/images/svg-icons/googleplus-square.svg
#	assets/images/svg-icons/instagram-square.svg
#	assets/sass/style.scss
#	buddypress.php
#	comments.php
#	footer.php
#	functions.php
#	header.php
#	inc/custom-header.php
#	inc/customizer.php
#	inc/extras.php
#	inc/jetpack.php
#	inc/scripts.php
#	inc/template-tags.php
#	index.php
#	page.php
#	rtl.css
#	search.php
#	searchform.php
#	sidebar.php
#	single.php
#	style.css
#	template-parts/content-buddypress.php
#	template-parts/content-none.php
#	template-parts/content-page.php
#	template-parts/content-search.php
#	template-parts/content.php
  • Loading branch information
KostasNi committed Nov 10, 2016
2 parents 568353d + 5c2f088 commit dae863c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
assets/bower_components/bourbon/
assets/bower_components/neat/
node_modules/
.idea/
.sass-cache
*.sublime-project
.htaccess
compass_app_log.txt
*.log
.DS_Store
.AppleDouble
.LSOverride
3 changes: 3 additions & 0 deletions assets/bower_components/normalize-css/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: node_js
node_js:
- stable
15 changes: 15 additions & 0 deletions codesniffer.ruleset.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<ruleset name="WordPress Theme Coding Standards">
<!-- See https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
<!-- See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/blob/develop/WordPress-Core/ruleset.xml -->

<!-- Set a description for this ruleset. -->
<description>A custom set of code standard rules to check for WordPress themes.</description>

<!-- Include the WordPress ruleset, with exclusions. -->
<rule ref="WordPress">
<exclude name="Generic.WhiteSpace.ScopeIndent.IncorrectExact" />
<exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
<exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
</rule>
</ruleset>

0 comments on commit dae863c

Please sign in to comment.