Skip to content
This repository has been archived by the owner on Sep 10, 2019. It is now read-only.

Commit

Permalink
Merge pull request #112 from zurb/fa-to-zf
Browse files Browse the repository at this point in the history
Fa to Zf namespace conversion
  • Loading branch information
AntJanus committed Nov 21, 2014
2 parents 44c4125 + 440f07e commit ab208f1
Show file tree
Hide file tree
Showing 26 changed files with 217 additions and 211 deletions.
22 changes: 11 additions & 11 deletions Docs/templates/kitchen-sink.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ <h3 class="subheader">This is a collection of all the Foundation components.</h3

##### Accordion

<div fa-accordion-set>
<div fa-accordion title="Test Title">
<div zf-accordion-set>
<div zf-accordion title="Test Title">
<p>Proin quis tortor orci. Etiam at risus et justo dignissim congue. Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at.</p>
</div>
<div fa-accordion title="Another Test">
<div zf-accordion title="Another Test">
<p>Proin quis tortor orci. Etiam at risus et justo dignissim congue. Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at.</p>
</div>
</div>

```html
<div fa-accordion-set>
<div fa-accordion title="Test Title">
<div zf-accordion-set>
<div zf-accordion title="Test Title">
<p>Proin quis tortor orci. Etiam at risus et justo dignissim congue. Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at.</p>
</div>
<div fa-accordion title="Another Test">
<div zf-accordion title="Another Test">
<p>Proin quis tortor orci. Etiam at risus et justo dignissim congue. Donec congue lacinia dui, a porttitor lectus condimentum laoreet. Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at.</p>
</div>
</div>
Expand Down Expand Up @@ -232,19 +232,19 @@ <h4>The Basics: Group and Block</h4>
***

##### Iconic
<img data-src="/iconic/svg/smart/account.svg" data-file-extension="CCP4" fa-iconic />
<img data-src="/iconic/svg/smart/account.svg" data-file-extension="CCP4" zf-iconic />

***

##### Tabs
<div fa-tabs>
<div fa-tab title="This is Tab 1">
<div zf-tabs>
<div zf-tab title="This is Tab 1">
<p>Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet egestas purus in blandit. Curabitur.</p>
</div>
<div fa-tab title="Tab 2">
<div zf-tab title="Tab 2">
<p>Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet egestas purus in blandit. Curabitur.</p>
</div>
<div fa-tab title="Tab 3">
<div zf-tab title="Tab 3">
<p>Nunc eu ullamcorper orci. Quisque eget odio ac lectus vestibulum faucibus eget in metus. In pellentesque faucibus vestibulum. Nulla at nulla justo, eget luctus tortor. Nulla facilisi. Duis aliquet egestas purus in blandit. Curabitur.</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion Docs/templates/page_iconic.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
---
<h4>Iconic</h4>

<img data-src="/iconic/svg/smart/account.svg" data-file-extension="CCP4" fa-iconic />
<img data-src="/iconic/svg/smart/account.svg" data-file-extension="CCP4" zf-iconic />
8 changes: 4 additions & 4 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@
<!-- Title bar -->
<div id="header" class="shrink collapse grid-content">
<ul class="menu-bar primary condense">
<li fa-toggle="sidebar"><a href="#">Foundation for Apps</a></li>
<li zf-toggle="sidebar"><a href="#">Foundation for Apps</a></li>
</ul>
</div>
<!-- /Title bar -->
<div class="grid-block">
<div fa-panel id="sidebar" class="fast bounceInOut medium-3 large-2 medium-grid-block sidebar vertical">
<div zf-panel id="sidebar" class="fast bounceInOut medium-3 large-2 medium-grid-block sidebar vertical">
<div class="grid-content shrink">
This is search
</div>
<!-- Sidebar nav -->
<div class="grid-content collapse">
<a fa-close class="close-button hide-for-medium">&times;</a>
<a zf-close class="close-button hide-for-medium">&times;</a>
<section>
<ul class="menu-bar vertical">
<li class="title">Setup</li>
Expand Down Expand Up @@ -122,7 +122,7 @@
<!-- Main content -->
<div class="medium-9 large-10 grid-content">
<div class="grid-container">
<a class="small secondary expand button hide-for-medium" fa-toggle="sidebar">Show Components</a>
<a class="small secondary expand button hide-for-medium" zf-toggle="sidebar">Show Components</a>
<div ng-class="[currentSlug, 'ui-animation']" ui-view></div>
</div>
</div>
Expand Down
14 changes: 7 additions & 7 deletions docs/templates/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ <h1>Foundation Angular Playground</h1>
</div>
<div class="small-12 medium-8 large-9 content block docs-component-overview">
<h1>Page</h1>
<button fa-open="pageModal">Modal</button>
<button fa-toggle="pagePanel">Panel</button>
<button fa-toggle="pageCanvas">Offcanvas</button>
<button zf-open="pageModal">Modal</button>
<button zf-toggle="pagePanel">Panel</button>
<button zf-toggle="pageCanvas">Offcanvas</button>
<div ng-class="[currentSlug, 'ui-animation' ]" ui-view></div>
</div>
</div>
<div fa-modal id="pageModal" >
<a href="#" fa-close>&times;</a>
<div zf-modal id="pageModal" >
<a href="#" zf-close>&times;</a>
<section class="content block">
{{ vars.name }} | {{ vars.url }}
</section>
Expand All @@ -33,10 +33,10 @@ <h1>Page</h1>
<span class="button">Cancel</span>
</footer>
</div>
<div fa-panel id="pagePanel" position="left">
<div zf-panel id="pagePanel" position="left">
<p>Test Panel</p>
</div>

<div fa-offcanvas id="pageCanvas" position="right">
<div zf-offcanvas id="pageCanvas" position="right">
<p>Test Canvas</p>
</div>
12 changes: 6 additions & 6 deletions docs/templates/page_accordion.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
animationOut: fadeOut
---
<h4>Accordion</h4>
<div fa-accordion-set>
<div fa-accordion title="Test Title">
<div zf-accordion-set>
<div zf-accordion title="Test Title">
Test Content
</div>
<div fa-accordion title="Another Test">
<div zf-accordion title="Another Test">
Test3
</div>
</div>

<h5>Multi selection</h5>
<div fa-accordion-set multi-open="true">
<div fa-accordion title="Test Title">
<div zf-accordion-set multi-open="true">
<div zf-accordion title="Test Title">
Test Content
</div>
<div fa-accordion title="Another Test">
<div zf-accordion title="Another Test">
Test3
</div>
</div>
20 changes: 10 additions & 10 deletions docs/templates/page_actionsheet.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
animationOut: fadeOut
---
<h4>Action sheet</h4>
<div fa-action-sheet>
<div fa-as-button title="My button"></div>
<div fa-as-content position="top" class="primary">
<div zf-action-sheet>
<div zf-as-button title="My button"></div>
<div zf-as-content position="top" class="primary">
<p>Some html</p>
<ul>
<li><a href="#">Option One</a></li>
Expand All @@ -20,9 +20,9 @@ <h4>Action sheet</h4>

Custom button:

<div fa-action-sheet>
<div fa-as-button><a href="#" class="button secondary">my custom button</a></div>
<div fa-as-content position="top" class="dark">
<div zf-action-sheet>
<div zf-as-button><a href="#" class="button secondary">my custom button</a></div>
<div zf-as-content position="top" class="dark">
<p>Some html</p>
<ul>
<li><a href="#">Option One</a></li>
Expand All @@ -34,11 +34,11 @@ <h4>Action sheet</h4>
<br />

Remote trigger:
<a href="#" fa-toggle="my-actionsheet">remote trigger</a>
<a href="#" zf-toggle="my-actionsheet">remote trigger</a>

<div fa-action-sheet id="my-actionsheet">
<div fa-as-button></div>
<div fa-as-content position="bottom">
<div zf-action-sheet id="my-actionsheet">
<div zf-as-button></div>
<div zf-as-content position="bottom">
<p>Some html</p>
<ul>
<li><a href="#">Option One</a></li>
Expand Down
8 changes: 4 additions & 4 deletions docs/templates/page_child.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
title: Interchange Playground
url: /interchange
---
<div fa-interchange>
<div fa-source media="small" src="/templates/interchange/partial_1.html">
<div zf-interchange>
<div zf-source media="small" src="/templates/interchange/partial_1.html">
</div>
<div fa-source media="medium" src="/templates/interchange/partial_2.html">
<div zf-source media="medium" src="/templates/interchange/partial_2.html">
</div>
<div fa-source media="large">
<div zf-source media="large">
On-page template!
</div>
</div>
8 changes: 4 additions & 4 deletions docs/templates/page_notification.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ <h4>Notifications</h4>
content="Notification example"
color="success"
position="top left"
fa-notify="main-notifications">Dynamic Notification</a>
<a href="#" fa-open="my-notify">Static Notification</a>
<div fa-notification-set id="main-notifications"></div>
<div fa-notification-static id="my-notify" title="My static notification" image="http://placehold.it/40x40">
zf-notify="main-notifications">Dynamic Notification</a>
<a href="#" zf-open="my-notify">Static Notification</a>
<div zf-notification-set id="main-notifications"></div>
<div zf-notification-static id="my-notify" title="My static notification" image="http://placehold.it/40x40">
This notification is static, it works similarly to a programmatic with some subtle differences
</div>
4 changes: 2 additions & 2 deletions docs/templates/page_popup.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
url: /popup
---
<h4>Popup</h4>
<a href="#" fa-popup-toggle="popups">Open popup</a>
<div fa-popup
<a href="#" zf-popup-toggle="popups">Open popup</a>
<div zf-popup
title="My title"
footer="Footer!"
id="popups"
Expand Down
32 changes: 16 additions & 16 deletions docs/templates/page_tabs.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,44 @@
url: /tabs
---
<h4>Automatic Tabs</h4>
<a href="#" fa-open="automatic-tab-3">Open tab 3</a>
<div fa-tabs>
<div fa-tab title="Tab 1">
<a href="#" zf-open="automatic-tab-3">Open tab 3</a>
<div zf-tabs>
<div zf-tab title="Tab 1">
Tab 1
</div>
<div fa-tab title="Tab 2">
<div zf-tab title="Tab 2">
Tab 2
</div>
<div fa-tab title="Tab 3" id="automatic-tab-3">
<div zf-tab title="Tab 3" id="automatic-tab-3">
Tab 3
</div>
</div>

<h4>Automatic Tabs with displaced tab content</h4>
<div fa-tabs id="displaced-tabs" displaced="true">
<div fa-tab title="Tab 1">
<div zf-tabs id="displaced-tabs" displaced="true">
<div zf-tab title="Tab 1">
Tab 1
</div>
<div fa-tab title="Tab 2">
<div zf-tab title="Tab 2">
Tab 2
</div>
<div fa-tab title="Tab 3" id="displaced-tab-3">
<div zf-tab title="Tab 3" id="displaced-tab-3">
Tab 3
</div>
</div>

<a href="#" fa-open="displaced-tab-3">open tab 3</a>
<a href="#" zf-open="displaced-tab-3">open tab 3</a>
<h5>Displaced content:</h5>
<div fa-tab-content target="displaced-tabs">
<div zf-tab-content target="displaced-tabs">
</div>

<h4>Manually built tabs</h4>
<a href="#" fa-open="tabTwo">Open Tab Two</a>
<ul class="button-group" fa-tab-custom>
<li fa-tab-href="tabOne"><a>Tab One</a></li>
<li fa-tab-href="tabTwo"><a>Tab Two</a></li>
<a href="#" zf-open="tabTwo">Open Tab Two</a>
<ul class="button-group" zf-tab-custom>
<li zf-tab-href="tabOne"><a>Tab One</a></li>
<li zf-tab-href="tabTwo"><a>Tab Two</a></li>
</ul>
<div fa-tab-content-custom>
<div zf-tab-content-custom>
<div id="tabOne">Content!</div>
<div id="tabTwo">Second Content!</div>
</div>
Loading

0 comments on commit ab208f1

Please sign in to comment.