Merge branch 'master' of https://github.com/zurb/foundation-apps

dfeeney-webdev · Dec 4, 2014 · b6427d8 · b6427d8
2 parents 2210a77 + 9e2bf0b
commit b6427d8
Show file tree

Hide file tree

Showing 18 changed files with 497 additions and 949 deletions.
diff --git a/Docs/assets/img/matterhorn-small.jpg b/Docs/assets/img/matterhorn-small.jpg
diff --git a/Docs/assets/img/matterhorn.jpg b/Docs/assets/img/matterhorn.jpg
diff --git a/Docs/templates/iconic.html b/Docs/templates/iconic.html
diff --git a/docs/assets/js/angular.js b/docs/assets/js/angular.js
@@ -38,7 +38,13 @@ var app = angular.module('application', [
 
     $rootScope.$state = $state;
     $rootScope.$stateParams = $stateParams;
-}]);
+}])
+  .run(['$rootScope','$window', '$location', function($rootScope, $window, $location) {
+    var track = function() {
+      $window.ga('send', 'pageview', { page: $location.path() });
+    };
+    $rootScope.$on('$locationChangeSuccess', track);
+  }]);
 
 angular.module('application')
   .controller('MotionUIController', ['$scope', '$state', 'FoundationApi', '$animate', '$window', function($scope, $state, FoundationApi, $animate, $window) {
@@ -173,4 +179,4 @@ angular.module('application')
       }
     };
   }
-]);
+]);
diff --git a/docs/assets/scss/docs/_docs.scss b/docs/assets/scss/docs/_docs.scss
@@ -761,3 +761,15 @@ hr {
     justify-content: center;
     }
   }
+
+.inline-list {
+  display: inline-block;
+}
+
+.icon-label {
+  margin-left: 1rem;
+}
+
+.icon li {
+  margin-bottom: 1rem;
+}
diff --git a/docs/index.html b/docs/index.html
@@ -8,9 +8,18 @@
     <script src="assets/js/app.js"></script>
     <script src="assets/js/routes.js"></script>
     <script src="assets/js/angular-app.js"></script>
-    <!-- TEST COMMENT -->
   </head>
   <body>
+
+      <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),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+        ga('create', 'UA-2195009-60', 'auto');
+
+      </script>
 
       <!-- Right Off Canvas -->
       <zf-offcanvas id="example-canvas-top" position="top">

diff --git a/docs/templates/angular.html b/docs/templates/angular.html
diff --git a/docs/templates/changelog.html b/docs/templates/changelog.html
@@ -72,6 +72,61 @@ <h4>Known Issues</h4>
 
 <hr>
 
+<h3>Version 1.0.0 — Matterhorn</h3>
+
+<p>Welcome to Foundation for Apps 1.0.0! Thanks for swinging by to try it out.</p>
+
+<p>Our initial release of the framework includes:</p>
+
+<p><strong>An awesome, responsive flexbox-based grid</strong> for creating robust, responsive app layouts.</p>
+
+<p><strong>The Motion UI library</strong> for easily animating pages and components. You can also use our mixins to write custom animations.</p>
+
+<p><strong>Our Gulp-powered Angular helpers</strong> which allow you to harness the power of the Angular UI Router library without writing any JavaScript.</p>
+
+<p>The framework also includes these sweet components:</p>
+<ul>
+ <li>Block list</li>
+ <li>Button</li>
+ <li>Button group</li>
+ <li>Card</li>
+ <li>Forms</li>
+ <li>Label and badge</li>
+ <li>Menu bar</li>
+ <li>Switch</li>
+ <li>Title bar</li>
+ <li>Typography</li>
+ <li>Visibility and utility classes</li>
+</ul>
+
+<p>These components are also available as Angular directives:</p>
+<ul>
+ <li>Accordion</li>
+ <li>Action sheet</li>
+ <li>Modal</li>
+ <li>Notification</li>
+ <li>Off-canvas</li>
+ <li>Panel</li>
+ <li>Popup</li>
+ <li>Tabs</li>
+</ul>
+
+<h4>How to Contribute</h4>
+
+<p>We love feedback! Help us find bugs and suggest improvements or new features. Follow us on Twitter at [@ZURBFoundation](https://twitter.com/zurbfoundation) to keep up-to-date with what's new, or to just shoot the breeze.</p>
+
+<p>If you find a problem or have an idea, open a [new issue](https://github.com/zurb/foundation-apps/issues) on GitHub. When filing a bug report, make sure you specify the browser and operating system you're on, and toss us a screenshot or show us how we can recreate the issue.</p>
+
+<h4>Known Issues</h4>
+
+<ul>
+ <li>Some issues with the flexbox grid in IE10</li>
+ <li>Mobile Safari doesn't place fixed-position elements (modals, notifications) at the </li>right z-index — #190
+ <li>Range sliders aren't properly styled in IE10+ — #191</li>
+</ul>
+
+<hr>
+
 <h3>Version 1.0.0 RC1 — Mont Blanc</h3>
 
 <p>It's our 1.0 release candidate! Thanks for stopping by to take a look.</p>