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

sapo · Mar 18, 2015 · 65dc291 · 65dc291
2 parents dfc6def + 2cd7212
commit 65dc291
Show file tree

Hide file tree

Showing 69 changed files with 2,956 additions and 807 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -378,10 +378,23 @@ module.exports = function (grunt) {
 
         bump : {
             options: {
-                files: [ 'bower.json', 'package.json', '<%= ink.folders.js.src %>/1/lib.js'],
+                files: [
+                    'bower.json',
+                    'package.json',
+                    'README.md',
+                    '<%= ink.folders.js.src %>/1/lib.js',
+                    './src/sass/ink-flex.scss',
+                    './src/sass/ink-ie.scss',
+                    './src/sass/ink-legacy.scss',
+                    './src/sass/ink.scss',
+                    './src/sass/quick-start.scss'
+                ],
                 push: false,
                 commit: false,
                 tagName: '%VERSION%',
+                regExp: new RegExp(
+                    '([\'|\"|@]?version[\'|\"]?[ ]*:?[ ]*[\'|\"]?)(\\d+\\.\\d+\\.\\d+(-' +
+                    '\\.\\d+)?(-\\d+)?)[\\d||A-a|.|-]*([\'|\"]?)', 'i'),
                 createTag: false,
                 commitFiles: []
             }    

diff --git a/README.md b/README.md
@@ -2,20 +2,20 @@
 
 Ink is an interface kit for quick development of web interfaces, simple to use and expand on. It uses a combination of HTML, CSS and JavaScript to offer modern solutions for building layouts, display common interface elements and implement interactive features that are content-centric and user friendly for both your audience and your designers & developers.
 
-Ink is part of [SAPOs Open Source Software initiative](http://oss.sapo.pt).
+Ink is part of [SAPO's Open Source Software initiative](http://oss.sapo.pt).
 
-## Current Version: 3.1.3
+## Current Version: 3.1.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.1.3.zip) release.
+1. Download the [latest](https://github.com/sapo/Ink/archive/3.1.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.
+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.
 5. Keep coming back to the documentation to help you along the way.
 6. That's it! You'll see how easy it is once you pick it up.
 
@@ -33,7 +33,7 @@ ___
 
 ###Structure
 
-Since version 2.3.0 we've moved things around in order keep source code from distibution code separated:
+Since version 2.3.0 we've moved things around in order keep source code from distribution code separated:
 
 * **JS**
   ```
@@ -128,7 +128,7 @@ If you want to build from our source code, you'll need to install a few things:
 
 If you don't need to rebuild Javascript code you can just use [Scout](http://mhs.github.io/scout-app/) which is a nice, free and cross platform Sass/Compass compiler.
 
-Building on Windows is a lot tricker so we won't get into details on how to install all the required tools. Instead here's a list of usefull pages you'll need to read while trying this endeavour:
+Building on Windows is a lot tricker so we won't get into details on how to install all the required tools. Instead here's a list of useful pages you'll need to read while trying this endeavour:
 
   * [Getting started with Sass and Compass](http://thesassway.com/beginner/getting-started-with-sass-and-compass)
   * [Grunt](http://gruntjs.com/frequently-asked-questions)
@@ -152,7 +152,7 @@ The documentation is no longer distributed with Inks releases. We've completely
 You can read it at http://ink.sapo.pt
 Get its source, contribute or report and issue here: **https://github.com/sapo/Ink-doc**
 
-## Ink is built with help from these wonderfull projects:
+## Ink is built with help from these wonderful projects:
 
 **CSS Generation**
 + [Sass](http://sass-lang.com/)
@@ -171,6 +171,8 @@ Get its source, contribute or report and issue here: **https://github.com/sapo/I
 + [Bower](http://bower.io/)
 
 ## Versions
+* [Ink 3.1.5](https://github.com/sapo/Ink/archive/3.1.5.zip)
+* [Ink 3.1.4](https://github.com/sapo/Ink/archive/3.1.4.zip)
 * [Ink 3.1.3](https://github.com/sapo/Ink/archive/3.1.3.zip)
 * [Ink 3.1.2](https://github.com/sapo/Ink/archive/3.1.2.zip)
 * [Ink 3.1.1](https://github.com/sapo/Ink/archive/3.1.1.zip)

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Ink",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "An HTML5/CSS3 framework used at SAPO for fast and efficient website design and prototyping.",
   "keywords": [
     "HTML",
@@ -9,7 +9,79 @@
     "SASS"
   ],
   "main": [
-    "dist/js/ink-all.js"
+    "dist/js/ink-all.js",
+    "dist/css/ink.css",
+    "src/sass/ink.scss",
+    "dist/fonts/Roboto_slab/robotoslab-bold-webfont.eot",
+    "dist/fonts/Roboto_slab/robotoslab-bold-webfont.ttf",
+    "dist/fonts/Roboto_slab/robotoslab-regular-webfont.woff",
+    "dist/fonts/Roboto_slab/robotoslab-light-webfont.ttf",
+    "dist/fonts/Roboto_slab/robotoslab-bold-webfont.woff",
+    "dist/fonts/Roboto_slab/robotoslab-light-webfont.woff",
+    "dist/fonts/Roboto_slab/robotoslab-thin-webfont.eot",
+    "dist/fonts/Roboto_slab/robotoslab-thin-webfont.ttf",
+    "dist/fonts/Roboto_slab/robotoslab-regular-webfont.eot",
+    "dist/fonts/Roboto_slab/robotoslab-light-webfont.eot",
+    "dist/fonts/Roboto_slab/robotoslab-thin-webfont.woff",
+    "dist/fonts/Roboto_slab/robotoslab-regular-webfont.ttf",
+    "dist/fonts/Roboto/roboto-blackitalic-webfont.woff",
+    "dist/fonts/Roboto/roboto-blackitalic-webfont.ttf",
+    "dist/fonts/Roboto/roboto-medium-webfont.ttf",
+    "dist/fonts/Roboto/roboto-mediumitalic-webfont.woff",
+    "dist/fonts/Roboto/roboto-italic-webfont.ttf",
+    "dist/fonts/Roboto/roboto-lightitalic-webfont.woff",
+    "dist/fonts/Roboto/roboto-bold-webfont.woff",
+    "dist/fonts/Roboto/roboto-thinitalic-webfont.woff",
+    "dist/fonts/Roboto/roboto-thin-webfont.woff",
+    "dist/fonts/Roboto/roboto-thinitalic-webfont.ttf",
+    "dist/fonts/Roboto/roboto-thin-webfont.ttf",
+    "dist/fonts/Roboto/roboto-bolditalic-webfont.woff",
+    "dist/fonts/Roboto/roboto-mediumitalic-webfont.eot",
+    "dist/fonts/Roboto/roboto-bolditalic-webfont.ttf",
+    "dist/fonts/Roboto/roboto-black-webfont.ttf",
+    "dist/fonts/Roboto/roboto-bolditalic-webfont.eot",
+    "dist/fonts/Roboto/roboto-bold-webfont.ttf",
+    "dist/fonts/Roboto/roboto-black-webfont.woff",
+    "dist/fonts/Roboto/roboto-bold-webfont.eot",
+    "dist/fonts/Roboto/roboto-regular-webfont.eot",
+    "dist/fonts/Roboto/roboto-lightitalic-webfont.eot",
+    "dist/fonts/Roboto/roboto-blackitalic-webfont.eot",
+    "dist/fonts/Roboto/roboto-italic-webfont.woff",
+    "dist/fonts/Roboto/roboto-black-webfont.eot",
+    "dist/fonts/Roboto/roboto-light-webfont.woff",
+    "dist/fonts/Roboto/roboto-regular-webfont.ttf",
+    "dist/fonts/Roboto/roboto-light-webfont.eot",
+    "dist/fonts/Roboto/roboto-thinitalic-webfont.eot",
+    "dist/fonts/Roboto/roboto-mediumitalic-webfont.ttf",
+    "dist/fonts/Roboto/roboto-medium-webfont.woff",
+    "dist/fonts/Roboto/roboto-lightitalic-webfont.ttf",
+    "dist/fonts/Roboto/roboto-italic-webfont.eot",
+    "dist/fonts/Roboto/roboto-medium-webfont.eot",
+    "dist/fonts/Roboto/roboto-light-webfont.ttf",
+    "dist/fonts/Roboto/roboto-thin-webfont.eot",
+    "dist/fonts/Roboto/roboto-regular-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-bold-webfont.eot",
+    "dist/fonts/Roboto_condensed/robotocondensed-bolditalic-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-regular-webfont.ttf",
+    "dist/fonts/Roboto_condensed/robotocondensed-italic-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-bold-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-bold-webfont.ttf",
+    "dist/fonts/Roboto_condensed/robotocondensed-light-webfont.ttf",
+    "dist/fonts/Roboto_condensed/robotocondensed-regular-webfont.eot",
+    "dist/fonts/Roboto_condensed/robotocondensed-italic-webfont.ttf",
+    "dist/fonts/Roboto_condensed/robotocondensed-lightitalic-webfont.ttf",
+    "dist/fonts/Roboto_condensed/robotocondensed-italic-webfont.eot",
+    "dist/fonts/Roboto_condensed/robotocondensed-lightitalic-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-light-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-bolditalic-webfont.ttf",
+    "dist/fonts/Roboto_condensed/robotocondensed-regular-webfont.woff",
+    "dist/fonts/Roboto_condensed/robotocondensed-light-webfont.eot",
+    "dist/fonts/Roboto_condensed/robotocondensed-bolditalic-webfont.eot",
+    "dist/fonts/Roboto_condensed/robotocondensed-lightitalic-webfont.eot",
+    "dist/fonts/fontawesome-webfont.woff",
+    "dist/fonts/FontAwesome.otf",
+    "dist/fonts/fontawesome-webfont.ttf",
+    "dist/fonts/fontawesome-webfont.eot"
   ],
   "ignore": [
     "**/.*",

diff --git a/dist/css/ink-flex.css b/dist/css/ink-flex.css
@@ -8,7 +8,7 @@
  * @author    Sapo Ink Team
  * @license   http://opensource.org/licenses/MIT MIT
  * @link      http://ink.sapo.pt
- * @version   3.1.3
+ * @version   3.1.5
  */
 /**
  * Ink class names prefix
@@ -26,6 +26,9 @@
 /**
  * Buttons class names
  */
+/**
+ * Dismiss class names
+ */
 /**
  * Forms class names
  */
@@ -9248,10 +9251,20 @@ body.ink-drawer.over.right .right-drawer {
   left: 50%;
   width: 90%;
   height: 90%;
+  margin-top: -45vh;
+  margin-left: -45vw;
   background: #fff;
   z-index: 100;
   position: absolute;
   overflow: hidden;
+  display: flex;
+  -webkit-flex-direction: column;
+  -moz-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  display: -webkit-flex;
+  display: flex;
+  display: -ms-flexbox;
   filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
   opacity: 1;
   -webkit-box-shadow: rgba(0, 0, 0, 0.8) 0 0 15px 0;
@@ -9274,6 +9287,11 @@ body.ink-drawer.over.right .right-drawer {
   overflow-y: auto;
   overflow-x: hidden;
   height: auto;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+  -moz-box-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
 }
 .ink-modal > .modal-body .ink-grid {
   padding-left: 0;

diff --git a/dist/css/ink-flex.min.css b/dist/css/ink-flex.min.css
diff --git a/dist/css/ink-ie.css b/dist/css/ink-ie.css
@@ -7,7 +7,7 @@
  * @author    Sapo Ink Team
  * @license   http://opensource.org/licenses/MIT MIT
  * @link      http://ink.sapo.pt
- * @version   3.1.3
+ * @version   3.1.5
  */
 /**
  * Ink class names prefix
@@ -25,6 +25,9 @@
 /**
  * Buttons class names
  */
+/**
+ * Dismiss class names
+ */
 /**
  * Forms class names
  */

diff --git a/dist/css/ink-legacy.css b/dist/css/ink-legacy.css
@@ -7,7 +7,7 @@
  * @author    Sapo Ink Team
  * @license   http://opensource.org/licenses/MIT MIT
  * @link      http://ink.sapo.pt
- * @version   3.1.3
+ * @version   3.1.5
  */
 /**
  * Ink class names prefix
@@ -25,6 +25,9 @@
 /**
  * Buttons class names
  */
+/**
+ * Dismiss class names
+ */
 /**
  * Forms class names
  */

diff --git a/dist/css/ink.css b/dist/css/ink.css
@@ -8,7 +8,7 @@
  * @author    Sapo Ink Team
  * @license   http://opensource.org/licenses/MIT MIT
  * @link      http://ink.sapo.pt
- * @version   3.1.3
+ * @version   3.1.5
  */
 /**
  * Ink class names prefix
@@ -26,6 +26,9 @@
 /**
  * Buttons class names
  */
+/**
+ * Dismiss class names
+ */
 /**
  * Forms class names
  */
@@ -8127,6 +8130,8 @@ body.ink-drawer.over.right .right-drawer {
   left: 50%;
   width: 90%;
   height: 90%;
+  margin-top: -45vh;
+  margin-left: -45vw;
   background: #fff;
   z-index: 100;
   position: absolute;

diff --git a/dist/css/ink.min.css b/dist/css/ink.min.css
diff --git a/dist/css/quick-start.css b/dist/css/quick-start.css
@@ -7,7 +7,7 @@
  * @author    Sapo Ink Team
  * @license   http://opensource.org/licenses/MIT MIT
  * @link      http://ink.sapo.pt
- * @version   3.1.3
+ * @version   3.1.5
  */
 /** 
  * Sets the grids maximum width

diff --git a/dist/js/autoload.js b/dist/js/autoload.js
@@ -36,9 +36,12 @@ Ink.createModule('Ink.Autoload', 1, ['Ink.Dom.Selector_1', 'Ink.Util.Array_1', '
             'Animate_1'     : '.ink-animate',
             'Carousel_1'    : '.ink-carousel',
             'DatePicker_1'  : '.ink-datepicker',
+            'Draggable_1'   : '.ink-draggable',
             'Dropdown_1'    : '.ink-dropdown',
+            'Droppable_1.add' : '.ink-droppable',
             'FormValidator_2' : '.ink-formvalidator',
             'Gallery_1'     : 'ul.ink-gallery-source',
+            'LazyLoad_1'    : '.ink-lazyload',
             'Modal_1'       : '.ink-modal',
             'ProgressBar_1' : '.ink-progress-bar',
             'SortableList_1': '.ink-sortable-list',
@@ -97,6 +100,12 @@ Ink.createModule('Ink.Autoload', 1, ['Ink.Dom.Selector_1', 'Ink.Util.Array_1', '
             }
 
             function findElements(mod) {
+                var fname;
+                if (/\./.test(mod)) {  // Droppable.add(elm, options)
+                    mod = mod.split('.');
+                    fname = mod[1];
+                    mod = mod[0];
+                }
                 var modName = 'Ink.UI.' + mod;
                 var elements = Selector.select( options.selectors[mod], parentEl );
 
@@ -109,7 +118,11 @@ Ink.createModule('Ink.Autoload', 1, ['Ink.Dom.Selector_1', 'Ink.Util.Array_1', '
                                     Component.getInstance(el) != null) {
                                 return; // Avoid multiple instantiation.
                             }
-                            new Component(el, Autoload.defaultOptions[mod]);
+                            if (!fname) {
+                                new Component(el, Autoload.defaultOptions[mod]);
+                            } else {
+                                Component[fname](el, Autoload.defaultOptions[mod]);
+                            }
                         });
                     });
                 }

diff --git a/dist/js/autoload.min.js b/dist/js/autoload.min.js