forked from roots/sage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request roots#1251 from roots/8.0.0
Sage 8.0.0
- Loading branch information
Showing
71 changed files
with
1,409 additions
and
2,119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
{ | ||
"directory": "assets/vendor" | ||
"directory": "bower_components" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
# Include your project-specific ignores in this file | ||
# Read about how to use .gitignore: https://help.github.com/articles/ignoring-files | ||
dist | ||
bower_components | ||
node_modules | ||
assets/vendor/* | ||
assets/css/main.css.map | ||
assets/css/*main*.css | ||
assets/js/*scripts*.js | ||
assets/js/vendor/modernizr.min.js | ||
assets/manifest.json | ||
npm-debug.log |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
{ | ||
"requireCurlyBraces": [ | ||
"if", | ||
"else", | ||
"for", | ||
"while", | ||
"do", | ||
"try", | ||
"catch" | ||
], | ||
"requireOperatorBeforeLineBreak": true, | ||
"requireCamelCaseOrUpperCaseIdentifiers": true, | ||
"maximumLineLength": { | ||
"value": 80, | ||
"allowComments": true, | ||
"allowRegex": true | ||
}, | ||
"validateIndentation": 2, | ||
"validateQuoteMarks": "'", | ||
"disallowMultipleLineStrings": true, | ||
"disallowMixedSpacesAndTabs": true, | ||
"disallowTrailingWhitespace": true, | ||
"disallowSpaceAfterPrefixUnaryOperators": true, | ||
"disallowMultipleVarDecl": true, | ||
"disallowKeywordsOnNewLine": [ | ||
"else" | ||
], | ||
"requireSpaceAfterKeywords": [ | ||
"if", | ||
"else", | ||
"for", | ||
"while", | ||
"do", | ||
"switch", | ||
"return", | ||
"try", | ||
"catch" | ||
], | ||
"requireSpaceBeforeBinaryOperators": [ | ||
"=", | ||
"+=", | ||
"-=", | ||
"*=", | ||
"/=", | ||
"%=", | ||
"<<=", | ||
">>=", | ||
">>>=", | ||
"&=", | ||
"|=", | ||
"^=", | ||
"+=", | ||
"+", | ||
"-", | ||
"*", | ||
"/", | ||
"%", | ||
"<<", | ||
">>", | ||
">>>", | ||
"&", | ||
"|", | ||
"^", | ||
"&&", | ||
"||", | ||
"===", | ||
"==", | ||
">=", | ||
"<=", | ||
"<", | ||
">", | ||
"!=", | ||
"!==" | ||
], | ||
"requireSpaceAfterBinaryOperators": true, | ||
"requireSpacesInConditionalExpression": true, | ||
"requireSpaceBeforeBlockStatements": true, | ||
"requireSpacesInForStatement": true, | ||
"requireLineFeedAtFileEnd": true, | ||
"requireSpacesInFunctionExpression": { | ||
"beforeOpeningCurlyBrace": true | ||
}, | ||
"disallowSpacesInAnonymousFunctionExpression": { | ||
"beforeOpeningRoundBrace": true | ||
}, | ||
"disallowSpacesInsideObjectBrackets": "all", | ||
"disallowSpacesInsideArrayBrackets": "all", | ||
"disallowSpacesInsideParentheses": true, | ||
"validateJSDoc": { | ||
"checkParamNames": true, | ||
"requireParamTypes": true | ||
}, | ||
"disallowMultipleLineBreaks": true, | ||
"disallowNewlineBeforeBlockStatements": true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,6 +11,5 @@ | |
"newcap": true, | ||
"noarg": true, | ||
"node": true, | ||
"strict": false, | ||
"trailing": true | ||
"strict": false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
sudo: false | ||
language: php | ||
php: | ||
- '5.6' | ||
- '5.5' | ||
- '5.4' | ||
|
||
before_install: | ||
- npm install -g npm@latest | ||
- npm install -g bower gulp jscs | ||
- npm install | ||
- pyrus install pear/PHP_CodeSniffer | ||
- phpenv rehash | ||
|
||
script: | ||
- npm run build | ||
- npm run jshint | ||
- npm run jscs | ||
- phpcs --standard=ruleset.xml --extensions=php -n -s . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,7 @@ | ||
<?php get_template_part('templates/page', 'header'); ?> | ||
|
||
<div class="alert alert-warning"> | ||
<?php _e('Sorry, but the page you were trying to view does not exist.', 'roots'); ?> | ||
<?php _e('Sorry, but the page you were trying to view does not exist.', 'sage'); ?> | ||
</div> | ||
|
||
<p><?php _e('It looks like this was the result of either:', 'roots'); ?></p> | ||
<ul> | ||
<li><?php _e('a mistyped address', 'roots'); ?></li> | ||
<li><?php _e('an out-of-date link', 'roots'); ?></li> | ||
</ul> | ||
|
||
<?php get_search_form(); ?> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,121 +1 @@ | ||
# Contributing to Roots Theme | ||
|
||
Please take a moment to review this document in order to make the contribution | ||
process easy and effective for everyone involved. | ||
|
||
Following these guidelines helps to communicate that you respect the time of | ||
the developers managing and developing this open source project. In return, | ||
they should reciprocate that respect in addressing your issue or assessing | ||
patches and features. | ||
|
||
|
||
## Using the issue tracker | ||
|
||
The issue tracker is the preferred channel for [bug reports](#bugs), | ||
[features requests](#features) and [submitting pull | ||
requests](#pull-requests), but please respect the following restrictions: | ||
|
||
* Please **do not** use the issue tracker for personal support requests (use the | ||
[Roots Discourse](https://discourse.roots.io/)). | ||
|
||
* Please **do not** derail or troll issues. Keep the discussion on topic and | ||
respect the opinions of others. | ||
|
||
|
||
<a name="bugs"></a> | ||
## Bug reports | ||
|
||
A bug is a _demonstrable problem_ that is caused by the code in the repository. | ||
Good bug reports are extremely helpful - thank you! | ||
|
||
Guidelines for bug reports: | ||
|
||
1. **Use the GitHub issue search** — check if the issue has already been | ||
reported. | ||
|
||
2. **Check if the issue has been fixed** — try to reproduce it using the | ||
latest `master` or development branch in the repository. | ||
|
||
3. **Isolate the problem to Roots** — make sure that the code in the Roots | ||
repository is _definitely_ responsible for the issue. Switch to a core WordPress | ||
theme (such as Twenty Thirteen) to confirm problems before reporting an issue. | ||
Make sure you have reproduced the bug with all plugins disabled. Any issues | ||
related to HTML5 Boilerplate or Bootstrap should be reported to their respected | ||
repositories and follow their contributing guidelines. | ||
|
||
A good bug report shouldn't leave others needing to chase you up for more | ||
information. Please try to be as detailed as possible in your report. | ||
|
||
|
||
<a name="features"></a> | ||
## Feature requests | ||
|
||
Feature requests are welcome. But take a moment to find out whether your idea | ||
fits with the scope and aims of Roots. It's up to *you* to make a strong | ||
case to convince the Roots developers of the merits of this feature. Please | ||
provide as much detail and context as possible. | ||
|
||
|
||
<a name="pull-requests"></a> | ||
## Pull requests | ||
|
||
Good pull requests - patches, improvements, new features - are a fantastic | ||
help. They should remain focused in scope and avoid containing unrelated | ||
commits. | ||
|
||
**Please ask first** before embarking on any significant pull request (e.g. | ||
implementing features, refactoring code), otherwise you risk spending a lot of | ||
time working on something that the developers might not want to merge into Roots. | ||
|
||
Please adhere to the coding conventions used throughout the project (indentation, | ||
comments, etc.). | ||
|
||
Adhering to the following this process is the best way to get your work | ||
included in Roots: | ||
|
||
1. [Fork](https://help.github.com/fork-a-repo/) Roots, clone your fork, | ||
and configure the remotes: | ||
|
||
```bash | ||
# Clone your fork of the repo into the current directory | ||
git clone https://github.com/<your-username>/<repo-name> | ||
# Navigate to the newly cloned directory | ||
cd <repo-name> | ||
# Assign the original repo to a remote called "upstream" | ||
git remote add upstream https://github.com/<upsteam-owner>/<repo-name> | ||
``` | ||
|
||
2. If you cloned a while ago, get the latest changes from upstream: | ||
|
||
```bash | ||
git checkout <dev-branch> | ||
git pull upstream <dev-branch> | ||
``` | ||
|
||
3. Create a new topic branch (off the main project development branch) to | ||
contain your feature, change, or fix: | ||
|
||
```bash | ||
git checkout -b <topic-branch-name> | ||
``` | ||
|
||
4. Commit your changes in logical chunks. Please adhere to these [git commit | ||
message guidelines](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) | ||
or your code is unlikely be merged into the main project. Use Git's | ||
[interactive rebase](https://help.github.com/articles/interactive-rebase) | ||
feature to tidy up your commits before making them public. | ||
5. Locally merge (or rebase) the upstream development branch into your topic branch: | ||
```bash | ||
git pull [--rebase] upstream <dev-branch> | ||
``` | ||
6. Push your topic branch up to your fork: | ||
```bash | ||
git push origin <topic-branch-name> | ||
``` | ||
10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) | ||
with a clear title and description. | ||
Please read [Contributing to Roots Projects](https://github.com/roots/guidelines/blob/master/CONTRIBUTING.md) |
Oops, something went wrong.