[2/2] apex-site git commit: Merge branch 'apexcore-514.apexwebsite' of https://github.com/mx4web/apex-site

2016-10-12 Thread thw 
Merge branch 'apexcore-514.apexwebsite' of https://github.com/mx4web/apex-site


Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/6d8ebf07
Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/6d8ebf07
Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/6d8ebf07

Branch: refs/heads/master
Commit: 6d8ebf0710ca64f645a594b655bae6b522caafc7
Parents: 041fcfb d7d8672
Author: Thomas Weise 
Authored: Wed Oct 12 16:25:43 2016 -0700
Committer: Thomas Weise 
Committed: Wed Oct 12 16:25:43 2016 -0700

--
 navigation.json| 18 --
 src/less/docs.less | 11 ---
 src/less/header.less   |  7 +++
 src/md/docs.md |  2 +-
 src/pages/docs.html|  4 ++--
 src/pages/index.html   | 16 +++-
 src/partials/header.handlebars |  6 +-
 7 files changed, 34 insertions(+), 30 deletions(-)
--

[2/2] apex-site git commit: Merge branch 'apexcore-514.apexwebsite' of https://github.com/mx4web/apex-site

2016-10-10 Thread thw 
Merge branch 'apexcore-514.apexwebsite' of https://github.com/mx4web/apex-site


Project: http://git-wip-us.apache.org/repos/asf/apex-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/apex-site/commit/c39829b7
Tree: http://git-wip-us.apache.org/repos/asf/apex-site/tree/c39829b7
Diff: http://git-wip-us.apache.org/repos/asf/apex-site/diff/c39829b7

Branch: refs/heads/master
Commit: c39829b7b5457c5ef962c553fe00cbb07d8d463f
Parents: 7872cbc dc95ab6
Author: Thomas Weise 
Authored: Mon Oct 10 08:20:30 2016 -0700
Committer: Thomas Weise 
Committed: Mon Oct 10 08:20:30 2016 -0700

--
 gulpfile.js|  5 +++--
 navigation.json|  7 +-
 src/js/docs.js | 42 +++
 src/less/docs.less | 44 +
 src/less/header.less   | 14 
 src/less/main.less |  1 +
 src/md/docs.md |  2 +-
 src/pages/docs.html| 16 +-
 src/pages/index.html   |  1 +
 src/partials/footer.handlebars |  2 ++
 src/partials/header.handlebars | 31 ++
 11 files changed, 151 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/apex-site/blob/c39829b7/src/md/docs.md
--

http://git-wip-us.apache.org/repos/asf/apex-site/blob/c39829b7/src/pages/index.html
--