Skip to content

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
AntJanus committed Dec 3, 2014
2 parents 48cf44f + b8340e7 commit 2be7cbc
Show file tree
Hide file tree
Showing 113 changed files with 4,533 additions and 2,176 deletions.
32 changes: 32 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Version 1.0.0 RC1 — Mont Blanc

It's our 1.0 release candidate! Thanks for stopping by to take a look.

## How to mess with it

If you want a quick way to jump in, check out our [starter template](https://github.com/zurb/foundation-apps-template), which has a basic directory structure and a blank index file for you to work with. Follow the instructions in the [readme](https://github.com/zurb/foundation-apps-template/blob/master/readme.md) to get going.

The first thing you'll probably want to check out is the grid. If you compile this repo on your machine, you can find the grid documentation at <http://localhost:8080/#!/grid>. You can also view the source of that file [here](https://github.com/zurb/foundation-apps/blob/master/docs/templates/grid.html).

To incorporate our Sass components and Angular directives into your own project, install Foundation using Bower:

```bash
bower install zurb/foundation-apps
```

The JavaScript is organized into common components, specific directives, and vendor files. There's also a sample `app.js` that shows how to import the Foundation modules, but you'll likely want to set up your Angular application your own way.

## How to contribute

We love feedback! We have a few [discussion topics](https://github.com/zurb/foundation-apps/issues?q=is%3Aopen+is%3Aissue+label%3Adiscussion) open on our issue tracker, but if you have more specific feedback, please open a new issue! If you encounter any bugs, let us know as well. Be sure to specify the browser and operating system you're using, and show us how we can recreate the issue. Code samples are great!

## What's left

The codebase is very close to feature-complete. Here are the things we're still working on:
- Fully-working motion classes (see #113)
- Loose ends on components (see #109, #110, #111)
- Animation on directives (see #107)
- Unit tests for Angular and Sass (see #106)
- A finished settings file
- The command-line interface (being built in a separate repo, currently private)
- Testing, testing, testing
Binary file added Docs/assets/img/drop-arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-expo-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-expo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-foundation-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-foundation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-icons-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-large-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-products-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-products.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-studios-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-studios.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-top-icons-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/footer-top-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/search.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/social-retina.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/social.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/university-header-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Docs/assets/img/zurb-properties.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
129 changes: 129 additions & 0 deletions Docs/templates/iconic.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
---
name: iconic
url: /iconic
---

## Iconic
<h3 class="subheader">We partnered with Iconic to include 24 responsive, highly flexible icons for use in your apps. For more info on iconic or to buy the complete set head to <a href="https://useiconic.com/">useiconic.com</a></h3>

---

<a href="#" class="large button">
<img class="iconic-sm" zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Search
</a>
<a href="#" class="large alert button">
<img class="iconic-sm" zf-iconic data-src="/assets/img/iconic/ban.svg">
Delete
</a>
<a href="#" class="large success button">
<img class="iconic-sm" zf-iconic data-src="/assets/img/iconic/circle-check.svg">
Save
</a>
<a href="#" class="large secondary button">
<img class="iconic-sm" zf-iconic data-src="/assets/img/iconic/cart.svg">
Add to Cart
</a>

---

<ul class="button-group">
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
<li class="secondary"><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Sleep
</a></li>
</ul>

<ul class="expanded segmented button-group">
<li class="is-active"><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Sleep
</a></li>
</ul>

---

<ul class="menu-bar icon-left">
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
</ul>

<ul class="primary menu-bar icon-top">
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
<li><a href="#">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg">
Eat
</a></li>
</ul>

---

<div class="title-bar">
<div class="left">
<a href="#">
<img zf-iconic data-src="/assets/img/iconic/account.svg">
Buy
</a>
</div>
</div>

<div class="dark title-bar">
<div class="center">
<a href="#">
<img zf-iconic data-src="/assets/img/iconic/account.svg">
Buy
</a>
</div>
</div>

---

<img zf-iconic data-src="/assets/img/iconic/account.svg">
<img zf-iconic data-src="/assets/img/iconic/action.svg" class="iconic-lg">
<img zf-iconic data-src="/assets/img/iconic/ban.svg" class="iconic-lg">
<img zf-iconic data-src="/assets/img/iconic/bell.svg" class="iconic-lg">
<img zf-iconic data-src="/assets/img/iconic/bookmark.svg" class="iconic-lg iconic-color-dark">
<img zf-iconic data-src="/assets/img/iconic/cart.svg" class="iconic-lg iconic-color-dark">
<img zf-iconic data-src="/assets/img/iconic/chevron.svg" class="iconic-lg iconic-color-dark">
<img zf-iconic data-src="/assets/img/iconic/circle-check.svg" class="iconic-lg iconic-color-dark">
<img zf-iconic data-src="/assets/img/iconic/circle-x.svg" class="iconic-lg iconic-color-success">
<img zf-iconic data-src="/assets/img/iconic/cog.svg" class="iconic-lg iconic-color-success">
<img zf-iconic data-src="/assets/img/iconic/comment-square.svg" class="iconic-lg iconic-color-success">
<img zf-iconic data-src="/assets/img/iconic/dashboard.svg" class="iconic-lg iconic-color-success">
<img zf-iconic data-src="/assets/img/iconic/document.svg" class="iconic-lg iconic-color-warning">
<img zf-iconic data-src="/assets/img/iconic/envelope.svg" class="iconic-lg iconic-color-warning">
<img zf-iconic data-src="/assets/img/iconic/flag.svg" class="iconic-lg iconic-color-warning">
<img zf-iconic data-src="/assets/img/iconic/home.svg" class="iconic-lg iconic-color-warning">
<img zf-iconic data-src="/assets/img/iconic/lock.svg" class="iconic-lg iconic-color-alert">
<img zf-iconic data-src="/assets/img/iconic/magnifying-glass.svg" class="iconic-lg iconic-color-alert">
<img zf-iconic data-src="/assets/img/iconic/person.svg" class="iconic-lg iconic-color-alert">
<img zf-iconic data-src="/assets/img/iconic/reload.svg" class="iconic-lg iconic-color-alert">
<img zf-iconic data-src="/assets/img/iconic/share-boxed.svg" class="iconic-lg">
<img zf-iconic data-src="/assets/img/iconic/star.svg" class="iconic-lg">
<img zf-iconic data-src="/assets/img/iconic/thumb.svg" class="iconic-lg">
<img zf-iconic data-src="/assets/img/iconic/zoom.svg" class="iconic-lg">
2 changes: 1 addition & 1 deletion bin/gulp-dynamic-routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module.exports = function(options) {
file.contents = new Buffer(content.body);
config = content.attributes;
var relativePath = path.relative(directory + path.sep + options.root, file.path);
config.path = '/' + relativePath.split(path.sep).join('/');
config.path = relativePath.split(path.sep).join('/');
configs.push(config);
}
}
Expand Down
11 changes: 7 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
"viewport-units-buggyfill": "~0.4.1",
"tether": "~0.6.5",
"fastclick": "~1.0.3",
"angular": "~!1.3.4",
"angular": "~1.3.4",
"ui-router": "~0.2.12",
"angular-animate": "~1.3.2",
"angular-mocks": "~1.3.2",
"angular-animate": "~1.3.4",
"angular-mocks": "~1.3.4",
"marked": "~0.3.2",
"jsdiff": "~1.0.8",
"allmighty-autocomplete": "*"
Expand All @@ -38,5 +38,8 @@
"package.json",
"tests",
"variables.md"
]
],
"devDependencies": {
"angular-highlightjs": "~0.3.2"
}
}
Binary file added docs/assets/img/large.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/medium.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/assets/img/small.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions docs/assets/js/angular.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
var app = angular.module('application', [
'ui.router',
'ngAnimate',
'markdown',
'hljs',
'foundation.init',
'foundation.init.state',
'foundation.common.services',
'foundation.common.directives',
'foundation.common.animations',
'foundation.accordion',
'foundation.actionsheet',
'foundation.interchange',
'foundation.modal',
'foundation.notification',
'foundation.offcanvas',
'foundation.panel',
'foundation.popup',
'foundation.tabs',
'foundation.iconic'
])
.config(['$FoundationStateProvider', '$urlRouterProvider', '$locationProvider', function(FoundationStateProvider, $urlProvider, $locationProvider) {

$urlProvider.otherwise('/');

FoundationStateProvider.registerDynamicRoutes();

$locationProvider.html5Mode({
enabled:false,
requireBase: false
});

$locationProvider.hashPrefix('!');
}])
.run(['FoundationInit', '$rootScope', '$state', '$stateParams', function(foundationInit, $rootScope, $state, $stateParams) {
foundationInit.init();

$rootScope.$state = $state;
$rootScope.$stateParams = $stateParams;
}]);

Loading

0 comments on commit 2be7cbc

Please sign in to comment.