Merge remote-tracking branch 'origin/develop' into staging

sapo · Jul 23, 2014 · d80b0c0 · d80b0c0
2 parents 1c117e8 + 3a6d881
commit d80b0c0
Show file tree

Hide file tree

Showing 79 changed files with 2,620 additions and 2,114 deletions.
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 [SAPOs Open Source Software initiative](http://oss.sapo.pt).
 
-## Current Version: 3.0.4
+## Current Version: 3.0.5
 
 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.0.4.zip) release.
+1. Download the [latest](https://github.com/sapo/Ink/archive/3.0.5.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 allready contains the same media queries as Ink.
@@ -173,6 +173,7 @@ git checkout -b origin/gh-pages gh-pages
 + [Bower](http://bower.io/)
 
 ## Versions
+* [Ink 3.0.5](https://github.com/sapo/Ink/archive/3.0.5.zip)
 * [Ink 3.0.4](https://github.com/sapo/Ink/archive/3.0.4.zip)
 * [Ink 3.0.3](https://github.com/sapo/Ink/archive/3.0.3.zip)
 * [Ink 3.0.2](https://github.com/sapo/Ink/archive/3.0.2.zip)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Ink",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
   "keywords": [
     "HTML",

diff --git a/dist/cookbook/carousel.html b/dist/cookbook/carousel.html
@@ -168,7 +168,7 @@ <h5 class="slab">Baby Doe</h5>
 
         </div>
 
-        <nav id="p1" class="ink-navigation" data-instance="pagination1">
+        <nav id="p1" class="ink-navigation">
             <ul class="pagination black">
             </ul>
         </nav>
@@ -247,7 +247,7 @@ <h5 class="slab">Baby Doe</h5>
                 </li>
             </ul>
 
-            <nav id="p2" class="ink-navigation" data-instance="pagination2" data-next-label="" data-previous-label="">
+            <nav id="p2" class="ink-navigation" data-next-label="" data-previous-label="">
                 <ul class="pagination dotted">
                 </ul>
             </nav>
@@ -328,7 +328,7 @@ <h5 class="slab">Baby Doe</h5>
             </ul>
 
 
-            <nav id="p3" class="ink-navigation" data-instance="pagination3" data-previous-label="" data-next-label="">
+            <nav id="p3" class="ink-navigation" data-previous-label="" data-next-label="">
                 <ul class="pagination chevron">
                 </ul>
             </nav>