diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a37da3..032e038 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,22 +21,33 @@ Other projects require a similar agreement: jQuery, Firefox, Apache, Node, and m Here's an easy guide that should get you up and running: -1. Fork the project on github and pull down your copy. - > replace the {{ username }} with your username and {{ repository }} with the repository name +1. Fork the project on github +2. Pull down the polymer-all project. - git clone git@github.com:{{ username }}/{{ repository }}.git --recursive + git clone git@github.com:Polymer/polymer-all --recursive - Note the `--recursive`. This is necessary for submodules to initialize properly. If you don't do a recursive clone, you'll have to init them manually: - - git submodule init - git submodule update - -2. Development happens on the `master` branch. Get yourself on it! +3. Go to the polymer-elements directory and switch it to point to your origin. + git remote remove origin + git remote add origin git@github.com:{{ username }}/{{ repository }} + git fetch origin git checkout master +4. Pull down node dependencies. In your polymer-elements directory run 'npm install' this will pull down the tools used for executing the test. + That's it for the one time setup. Now you're ready to make a change. +## Running the tests + +To run the tests make sure you have a webserver running with its docroot pointing to the polymer-all directory. Then navigate to /polymer-elements/test/runner.html + +For Example: + + cd polymer-all + ruby -rwebrick -e'WEBrick::HTTPServer.new(:Port => 4000, :DocumentRoot => Dir.pwd).start' + +Then in your browser open: http://localhost:4000/polymer-elements/test/runner.html + ## Submitting a pull request We iterate fast! To avoid potential merge conflicts, it's a good idea to pull from the main project before making a change and submitting a pull request. The easiest way to do this is setup a remote called `upstream` and do a pull before working on a change: diff --git a/gruntfile.js b/gruntfile.js index 9d0f9db..d778429 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -19,7 +19,7 @@ module.exports = function(grunt) { outdir: 'docs', linkNatives: 'true', tabtospace: 2, - themedir: 'tools/doc/themes/footstrap' + themedir: 'tools/doc/themes/polymerase' } } } diff --git a/polymer-flex-layout/index.html b/polymer-flex-layout/index.html index 655d1b5..aa4f0f1 100644 --- a/polymer-flex-layout/index.html +++ b/polymer-flex-layout/index.html @@ -54,7 +54,7 @@

Title

- +