Merge branch 'develop' into staging

sapo · May 27, 2015 · 01776c9 · 01776c9
2 parents 39e7879 + 078e797
commit 01776c9
Show file tree

Hide file tree

Showing 171 changed files with 3,289 additions and 14,487 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -406,6 +406,13 @@ module.exports = function (grunt) {
     grunt.registerTask('dist', ['css', 'js', 'compress']);
     grunt.registerTask('dependencies', ['bower', 'copy:fontAwesome', 'copy:compass']);
     grunt.registerTask('default', ['dependencies','css','js']);
+    grunt.registerTask('lintdoc', function (module) {
+        require('eslint/lib/cli').execute([
+            'x',
+            'x',
+            path.join(__dirname, 'src/js/Ink')
+        ]);
+    });
     grunt.registerTask('_phantomjs', function (module) {
         this.requires('connect:test');
 

diff --git a/README.md b/README.md
@@ -4,15 +4,15 @@ Ink is an interface kit for quick development of web interfaces, simple to use a
 
 Ink is part of [SAPO's Open Source Software initiative](http://oss.sapo.pt).
 
-## Current Version: 3.1.7
+## Current Version: 3.1.8
 
 You can read our full documentation, examples and recipes in http://ink.sapo.pt
 
 ## Getting started
 
 Let's get you started with Ink right away. Here's what you need to know and do:
 
-1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.7.zip) release.
+1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.8.zip) release.
 2. Check the recipes we provide in the ```dist/cookbook``` folder and choose one to start from or use ```quick-start.html``` as a blank slate.
 3. Make sure you have `ink.css`, `ink-ie.css` and `ink.js` included somewhere in the `<head>`.
 4. Add your own css and scripts to carry all your project-specific changes. You can use ```quick-start.css``` from the ```dist/css``` folder. It already contains the same media queries as Ink.
@@ -171,6 +171,7 @@ Get its source, contribute or report and issue here: **https://github.com/sapo/I
 + [Bower](http://bower.io/)
 
 ## Versions
+* [Ink 3.1.8](https://github.com/sapo/Ink/archive/3.1.8.zip)
 * [Ink 3.1.7](https://github.com/sapo/Ink/archive/3.1.7.zip)
 * [Ink 3.1.6](https://github.com/sapo/Ink/archive/3.1.6.zip)
 * [Ink 3.1.5](https://github.com/sapo/Ink/archive/3.1.5.zip)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Ink",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
   "keywords": [
     "HTML",
@@ -88,7 +88,7 @@
     "node_modules"
   ],
   "dependencies": {
-    "font-awesome": "~4.2.0",
+    "font-awesome": "~4.3.0",
     "animate.css": "~3.2.0",
     "bower-compass-core": ">=0.0.1"
   },

diff --git a/dist/cookbook/3-boxes.html b/dist/cookbook/3-boxes.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>3 Boxes</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -72,7 +72,7 @@
 
         <div class="ink-grid">
 
-            <!--[if lte IE 9 ]>
+            <!--[if lt IE 9 ]>
             <div class="ink-alert basic" role="alert">
                 <button class="ink-dismiss">&times;</button>
                 <p>

diff --git a/dist/cookbook/4-boxes.html b/dist/cookbook/4-boxes.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>4 Boxes</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -68,7 +68,7 @@
 
         <div class="ink-grid">
 
-            <!--[if lte IE 9 ]>
+            <!--[if lt IE 9 ]>
             <div class="ink-alert basic" role="alert">
                 <button class="ink-dismiss">&times;</button>
                 <p><strong>You are using an outdated Internet Explorer version.</strong>

diff --git a/dist/cookbook/advanced-grid.html b/dist/cookbook/advanced-grid.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Advanced Grid</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -67,7 +67,7 @@
 
         <div class="ink-grid">
 
-            <!--[if lte IE 9 ]>
+            <!--[if lt IE 9 ]>
             <div class="ink-alert basic" role="alert">
                 <button class="ink-dismiss">&times;</button>
                 <p>

diff --git a/dist/cookbook/article-page.html b/dist/cookbook/article-page.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Article page</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -91,7 +91,7 @@
 
         <div class="ink-grid">
 
-            <!--[if lte IE 9 ]>
+            <!--[if lt IE 9 ]>
             <div class="ink-alert basic" role="alert">
                 <button class="ink-dismiss">&times;</button>
                 <p>

diff --git a/dist/cookbook/carousel.html b/dist/cookbook/carousel.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Carousel</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -69,7 +69,7 @@
 <div class="ink-grid vertical-space">
 
 
-    <!--[if lte IE 9 ]>
+    <!--[if lt IE 9 ]>
     <div class="ink-alert basic" role="alert">
         <button class="ink-dismiss">&times;</button>
         <p>

diff --git a/dist/cookbook/fixed-width-column.html b/dist/cookbook/fixed-width-column.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Fixed width column</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -119,7 +119,7 @@
     <body>
         <div class="ink-grid">
 
-            <!--[if lte IE 9 ]>
+            <!--[if lt IE 9 ]>
             <div class="ink-alert basic" role="alert">
                 <button class="ink-dismiss">&times;</button>
                 <p>

diff --git a/dist/cookbook/forms.html b/dist/cookbook/forms.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Forms</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -74,7 +74,7 @@
     <body>
         <div class="ink-grid">
 
-            <!--[if lte IE 9 ]>
+            <!--[if lt IE 9 ]>
             <div class="ink-alert basic" role="alert">
                 <button class="ink-dismiss">&times;</button>
                 <p>

diff --git a/dist/cookbook/gallery-modal.html b/dist/cookbook/gallery-modal.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Modal gallery</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">

diff --git a/dist/cookbook/quick-start.html b/dist/cookbook/quick-start.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Quick start</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -105,7 +105,7 @@
 
     <body>
 
-        <!--[if lte IE 9 ]>
+        <!--[if lt IE 9 ]>
         <div class="ink-alert basic" role="alert">
             <button class="ink-dismiss">&times;</button>
             <p>

diff --git a/dist/cookbook/sticky-footer.html b/dist/cookbook/sticky-footer.html
@@ -3,7 +3,7 @@
 
     <head>
         <meta charset="utf-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <title>Sticky footer</title>
         <meta name="description" content="">
         <meta name="author" content="ink, cookbook, recipes">
@@ -77,7 +77,7 @@
 
     <body>
 
-        <!--[if lte IE 9 ]>
+        <!--[if lt IE 9 ]>
         <div class="ink-grid">
             <div class="ink-alert basic">
                 <button class="ink-dismiss">&times;</button>