Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…tion-6-starter into gh-pages
  • Loading branch information
daigofuji committed Dec 18, 2017
2 parents 0ebe80f + ceed1d6 commit c72b1f0
Show file tree
Hide file tree
Showing 502 changed files with 117,277 additions and 39,341 deletions.
5 changes: 0 additions & 5 deletions CHANGELOG.md

This file was deleted.

30 changes: 25 additions & 5 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
<li><a href="{{ site.url }}">Home</a></li>
<li><a href="https://github.com/daigofuji/jekyll-foundation-6-starter">Source</a></li>
<li><a href="page-html-unit-test.html">Unit Test</a></li>
<li><a href="page-foundation-example.html">Foundation</a></li>
<li><a href="page-template-example.html">Template</a></li>
<li>
<a href="{{ site.url }}">
<i class="fas fa-home"></i> Home
</a>
</li>
<li>
<a href="https://github.com/daigofuji/jekyll-foundation-6-starter">
<i class="fab fa-github"></i> Source
</a>
</li>
<li>
<a href="page-html-unit-test.html">
<i class="fas fa-flask"></i> Unit Test
</a>
</li>
<li>
<a href="page-foundation-example.html">
<i class="fas fa-magic"></i> Foundation
</a>
</li>
<li>
<a href="page-template-example.html">
<i class="fas fa-object-group"></i> Template
</a>
</li>
86 changes: 45 additions & 41 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
================================================== -->
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,800|Raleway:400,200,700" rel="stylesheet" type="text/css">
<!-- Fount Awesome -->
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.0/css/font-awesome.min.css" rel="stylesheet">
<link href="https://use.fontawesome.com/releases/v5.0.1/css/all.css" rel="stylesheet">

<link rel="stylesheet" href="css/app.css">

Expand All @@ -36,62 +36,66 @@
</head>
<body>

<div class="off-canvas-wrapper">
<div class="off-canvas-wrapper-inner" data-off-canvas-wrapper>
<div class="off-canvas position-right" data-off-canvas id="offCanvas">
<div class="vertical menu mtl">
{% include nav.html %}
</div>
<button class="close-button" aria-label="Close menu" type="button" data-close>
<i class="fas fa-times fa-xs"></i>
</button>
</div><!-- end .off-canvas -->

<div class="off-canvas position-right" id="offCanvasRight" data-off-canvas data-position="right">
<ul class="vertical menu">
<div class="off-canvas-content" data-off-canvas-content>

<div class="title-bar">
<div class="title-bar-left">
<h4 class="title-bar-title font-heavy mas"><a href="{{ site.url }}">{{ site.brand }}</a></h4>
</div>
<div class="title-bar-right mts">
<div class="show-for-medium menu align-right simple quiet">
{% include nav.html %}
</div>
<ul class="hide-for-medium menu align-right simple">
<li><button class="secondary button" data-toggle="offCanvas" type="button"><i aria-hidden="true" class="fas fa-bars"></i> MENU</button></li>
</ul>
</div>
</div>

<div class="off-canvas-content" data-off-canvas-content>
<div class="grid-container">

<div class="title-bar">
<div class="title-bar-left">
<span class="title-bar-title mas"><a href="{{ site.url }}">{{ site.brand }}</a></span>
</div>
<div class="title-bar-right mts">
<ul class="menu quiet show-for-medium">
{% include nav.html %}
</ul>
<button class="menu-icon quiet hide-for-medium" type="button" data-toggle="offCanvasRight"><i class="fa fa-bars" aria-hidden="true"></i> MENU</button>
</div>
</div>
<div class="content">
<div class="row column">
{{ content }}

{{ content }}

<footer class="site-footer grid-x grid-padding-x mtl" role="contentinfo">
<div class="large-12 cell">
<hr>
<ul class="menu quiet copyright align-right">
<li>
<a href="https://twitter.com/{{ site.twitter }}"><i class="fab fa-twitter"></i> @{{ site.twitter }}</a>
</li>
<li>
<a href="https://github.com/{{ site.github }}/"><i class="fab fa-github"></i> @{{ site.github }}</a>
</li>
</ul>
<div class="menu quiet">
{% include nav.html %}
</div>
<footer class="site-footer row column mtl" role="contentinfo">
<hr/>
<ul class="menu quiet copyright align-right">
<li><a href="https://twitter.com/{{ site.twitter }}"><i class="fa fa-twitter"></i>@{{ site.twitter }}</a></li>
<li><a href="https://github.com/{{ site.github }}/"><i class="fa fa-github"></i>@{{ site.github }}</a></li>
</ul>
<ul class="menu quiet">
{% include nav.html %}
</ul>
</footer>
</div><!-- end .content -->

</div><!-- end .off-canvas-content -->
</div><!-- end .off-canvas-wrapper-inner -->
</div><!-- end .off-canvas-wrapper -->
</div>
</footer>

</div><!-- end .grid-container -->

</div><!-- end .off-canvas-content -->

<!-- Loading JavaScripts
================================================== -->

<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="bower_components/jquery/dist/jquery.js"><\/script>')</script>
<script src="bower_components/what-input/what-input.js"></script>
<script src="bower_components/foundation-sites/dist/foundation.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
<script>window.jQuery || document.write('<script src="bower_components/jquery/dist/jquery.min.js"><\/script>')</script>
<script src="bower_components/what-input/dist/what-input.min.js"></script>
<script src="bower_components/foundation-sites/dist/js/foundation.min.js"></script>
<script src="js/app.js"></script>

<!-- Google Analytics CHANGE THIS TO YOUR UA CODE-->
<!-- Google Analytics, change UA code below -->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
Expand Down
9 changes: 3 additions & 6 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"license": "MIT",
"homepage": "http://foundation.zurb.com",
"dependencies": {
"foundation-sites": "~6.2.0",
"motion-ui": "~1.1.0"
"foundation-sites": "~6.4.0",
"motion-ui": "~1.2.3"
},
"ignore": [
"**/.*",
Expand All @@ -19,8 +19,5 @@
"test",
"tests"
],
"private": true,
"resolutions": {
"what-input": "~2.0.0"
}
"private": true
}
19 changes: 10 additions & 9 deletions bower_components/foundation-sites/.bower.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "foundation-sites",
"version": "6.2.4",
"version": "6.4.3",
"license": "MIT",
"main": [
"scss/foundation.scss",
"dist/foundation.js"
"dist/js/foundation.js"
],
"ignore": [
"config",
Expand All @@ -24,20 +24,21 @@
".gitignore",
".npmignore",
".versions",
".babelrc"
".babelrc",
"yarn.lock"
],
"dependencies": {
"jquery": "~2.2.0",
"what-input": "~2.0.0"
"jquery": ">= 3.0.0",
"what-input": "~4.1.3"
},
"homepage": "https://github.com/zurb/foundation-sites",
"_release": "6.2.4",
"_release": "6.4.3",
"_resolution": {
"type": "version",
"tag": "v6.2.4",
"commit": "ab172838d6de406204956015c9fd393c5a526e0e"
"tag": "v6.4.3",
"commit": "4e21634356da296edd2f1c3e65d91140f991008b"
},
"_source": "https://github.com/zurb/foundation-sites.git",
"_target": "~6.2.0",
"_target": "~6.4.0",
"_originalSource": "foundation-sites"
}
3 changes: 2 additions & 1 deletion bower_components/foundation-sites/.bowerrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"directory": "bower_components"
"directory": "bower_components",
"modules": false
}
4 changes: 2 additions & 2 deletions bower_components/foundation-sites/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"globals": {
"Foundation": true
},
"parser": "babel-eslint",
"parserOptions": {
"ecmaFeatures": {
"impliedStrict": true,
Expand Down Expand Up @@ -57,9 +56,10 @@
"no-unused-vars": 1,
"no-with": 2,
"quotes": 0,
"radix" : 2,
"semi": [0, "never"],
"strict": [1, "global"],
"valid-typeof": 2,
"wrap-iife": [2, "inside"]
}
}
}
26 changes: 18 additions & 8 deletions bower_components/foundation-sites/.github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
<!-- Please only file bugs with Foundation on GitHub. If you've got a more general question about how to use Foundation, we can help you on the Foundation Forum: http://foundation.zurb.com/forum -->
<!-- For replicatable bugs or feature requests GitHub is the right place. The [Foundation Forum](http://foundation.zurb.com/forum) would be a great place to seek some help with general questions or help with your code. There you can reach out to the community to share your insights or ask questions. -->

**How can we reproduce this bug?**
#### How to reproduce this bug:

1. Step one
2. Step two
3. Step three

**What did you expect to happen?**
#### What should happen:

**What happened instead?**
#### What happened instead:

**Test case:**
#### Browser(s) and Device(s) tested on:

Give us a link to a CodePen or JSFiddle that recreates the issue.
#### Foundation Version(s) you are using:

- [CodePen with Foundation 6 and MotionUI](http://codepen.io/rafibomb/pen/xVVGOB)
- [CodePen with Foundation 6, Flexbox grid and MotionUI](http://codepen.io/rafibomb/pen/jqqPra)
#### Test case link:

<!-- Give us a link to a CodePen or JSFiddle that recreates the issue. -->

- [CodePen with Foundation 6.3.1, Float Grid and MotionUI](http://codepen.io/IamManchanda/pen/LWGZxR)
- [CodePen with Foundation 6.3.1, Float Grid with RTL Direction and MotionUI](http://codepen.io/IamManchanda/pen/bRYOMv)
- [CodePen with Foundation 6.3.1, Flexbox grid and MotionUI](http://codepen.io/IamManchanda/pen/zZrBEv)

- [CodePen with Foundation 6.4.1, XY Flexbox grid and MotionUI](http://codepen.io/IamManchanda/pen/EXbGKJ)
- [CodePen with Foundation 6.4.1, XY Flexbox grid with RTL Direction and MotionUI](http://codepen.io/IamManchanda/pen/qjVLoO)
- [CodePen with Foundation 6.4.1, XY Flexbox grid with Prototype Mode and MotionUI](http://codepen.io/IamManchanda/pen/XgzopG)
- [CodePen with Foundation 6.4.1, Float Grid and MotionUI](http://codepen.io/IamManchanda/pen/qjVLrB)
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Before submitting a pull request, make sure it's targeting the right branch:

- For documentation fixes, use `master`.
- For bug fixes, use `develop`.
- For new features, use the branch for the next minor version, which will be formatted `v6.x`.
- For bug fixes or new features compatible with the next version, use `develop`.
- For bug fixes incompatible with `develop`, use the support branch of the latest compatible version, which will be formatted `support/6.x`.

If you're fixing a JavaScript issue, it would help to create a new test case under the folder `test/visual/` that recreates the issue and show's that it's been fixed. Run `npm test` to compile the testing folder.

Expand Down
Loading

0 comments on commit c72b1f0

Please sign in to comment.