Skip to content

Commit

Permalink
Fixes issue with drawer menu. Bumps version up to 3.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedro Correia committed Oct 3, 2014
1 parent 0559349 commit a3f8b1f
Show file tree
Hide file tree
Showing 18 changed files with 885 additions and 937 deletions.
892 changes: 442 additions & 450 deletions dist/css/font-awesome.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/font-awesome.min.css

Large diffs are not rendered by default.

422 changes: 200 additions & 222 deletions dist/css/ink-flex.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/ink-flex.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/ink-ie.css
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/
/**
* Ink class names prefix
Expand Down
4 changes: 2 additions & 2 deletions dist/css/ink-legacy.css
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/
/**
* Ink class names prefix
Expand Down Expand Up @@ -125,7 +125,7 @@

html.no-flexbox,
html.no-flexboxlegacy {
font-size: 0.97em;
font-size: 1em;
}
html.no-flexbox .ink-grid,
html.no-flexboxlegacy .ink-grid {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/ink-legacy.min.css

Large diffs are not rendered by default.

424 changes: 201 additions & 223 deletions dist/css/ink.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/ink.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/css/quick-start.css
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/
/**
* Sets the grids maximum width
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "sapo_ink",
"version": "3.0.5",
"version": "3.1.1",
"description": "SAPO InK - Interface Toolkit",
"homepage": "http://ink.sapo.pt",
"main": "dist/js/ink-all.js",
Expand Down
48 changes: 24 additions & 24 deletions src/js/Ink/1/lib.js
Expand Up @@ -44,7 +44,7 @@
*/

window.Ink = {
VERSION: '3.1.0',
VERSION: '3.1.1',
_checkPendingRequireModules: function() {
var I, F, o, dep, mod, cb, pRMs = [];
var toApply = [];
Expand Down Expand Up @@ -129,12 +129,12 @@
}
return path;
},

/**
* Sets the URL path for a namespace.
* Use this to customize where requireModules and createModule will load dependencies from.
* This can be useful to set your own CDN for dynamic module loading or simply to change your module folder structure
*
*
* @method setPath
*
* @param {String} key Module or namespace
Expand Down Expand Up @@ -260,15 +260,15 @@
},

/**
* Creates a new module.
* Creates a new module.
* Use this to wrap your code and benefit from the module loading used throughout the Ink library
*
* @method createModule
* @param {String} mod Module name, separated by dots. Like Ink.Dom.Selector, Ink.UI.Modal
* @param {Number} version Version number
* @param {Array} deps Array of module names which are dependencies of the module being created. The order in which they are passed here will define the order they will be passed to the callback function.
* @param {Function} modFn The callback function to be executed when all the dependencies are resolved. The dependencies are passed as arguments, in the same order they were declared. The function itself should return the module.
* @sample Ink_1_createModule.html
* @sample Ink_1_createModule.html
*
*/
createModule: function(mod, ver, deps, modFn) { // define
Expand Down Expand Up @@ -356,13 +356,13 @@
},

/**
* Requires modules asynchronously
* Requires modules asynchronously
* Use this to get modules, even if they're not loaded yet
*
* @method requireModules
* @param {Array} deps Array of module names. The order in which they are passed here will define the order they will be passed to the callback function.
* @param {Array} deps Array of module names. The order in which they are passed here will define the order they will be passed to the callback function.
* @param {Function} cbFn The callback function to be executed when all the dependencies are resolved. The dependencies are passed as arguments, in the same order they were declared.
* @sample Ink_1_requireModules.html
* @sample Ink_1_requireModules.html
*/
requireModules: function(deps, cbFn) { // require
//console.log(['requireModules([', deps.join(', '), '], ', !!cbFn, ')'].join(''));
Expand Down Expand Up @@ -434,7 +434,7 @@
/**
* Builds the markup needed to load the modules.
* This method builds the script tags needed to load the currently used modules
*
*
* @method getModuleScripts
* @uses getModulesLoadOrder
* @return {String} The script markup
Expand All @@ -448,7 +448,7 @@

return mlo.join('\n');
},

/**
* Creates an Ink.Ext module
*
Expand All @@ -460,7 +460,7 @@
* @param {String} version Extension version
* @param {Array} dependencies Extension dependencies
* @param {Function} modFn Function returning the extension
* @sample Ink_1_createExt.html
* @sample Ink_1_createExt.html
*/
createExt: function (moduleName, version, dependencies, modFn) {
return Ink.createModule('Ink.Ext.' + moduleName, version, dependencies, modFn);
Expand All @@ -471,11 +471,11 @@
* Creates a new function that, when called, has its this keyword set to the provided value, with a given sequence of arguments preceding any provided when the new function is called.
*
* @method bind
* @param {Function} fn The function
* @param {Function} fn The function
* @param {Object} context The value to be passed as the this parameter to the target function when the bound function is called. If used as false, it preserves the original context and just binds the arguments.
* @param {Any} [args*] Additional arguments will be sent to the original function as prefix arguments.
* @return {Function}
* @sample Ink_1_bind.html
* @sample Ink_1_bind.html
*/
bind: function(fn, context) {
var args = Array.prototype.slice.call(arguments, 2);
Expand All @@ -495,7 +495,7 @@
* @param {String} methodName The name of the method that will be bound
* @param {Any} [args*] Additional arguments will be sent to the new method as prefix arguments.
* @return {Function}
* @sample Ink_1_bindMethod.html
* @sample Ink_1_bindMethod.html
*/
bindMethod: function (object, methodName) {
return Ink.bind.apply(Ink,
Expand All @@ -508,11 +508,11 @@
* Set "context" to `false` to preserve the original context of the function and just bind the arguments.
*
* @method bindEvent
* @param {Function} fn The function
* @param {Object} context The value to be passed as the this parameter to the target
* @param {Function} fn The function
* @param {Object} context The value to be passed as the this parameter to the target
* @param {Any} [args*] Additional arguments will be sent to the original function as prefix arguments
* @return {Function}
* @sample Ink_1_bindEvent.html
* @sample Ink_1_bindEvent.html
*/
bindEvent: function(fn, context) {
var args = Array.prototype.slice.call(arguments, 2);
Expand All @@ -529,7 +529,7 @@
* @method i
* @param {String} id Element ID
* @return {DOMElement}
* @sample Ink_1_i.html
* @sample Ink_1_i.html
*/
i: function(id) {
if(!id) {
Expand All @@ -549,7 +549,7 @@
* @param {String} rule
* @param {DOMElement} [from]
* @return {Array} array of DOMElements
* @sample Ink_1_ss.html
* @sample Ink_1_ss.html
*/
ss: function(rule, from)
{
Expand All @@ -567,7 +567,7 @@
* @param {String} rule Selector string
* @param {DOMElement} [from] Context element. If set to a DOM element, the rule will only look for descendants of this DOM Element.
* @return {DOMElement}
* @sample Ink_1_s.html
* @sample Ink_1_s.html
*/
s: function(rule, from)
{
Expand All @@ -586,7 +586,7 @@
* @param {Object} source The object whose properties will be copied over to the destination object
* @param {Object} [args*] Additional source objects. The last source will override properties of the same name in the previous defined sources
* @return destination object, enriched with defaults from the sources
* @sample Ink_1_extendObj.html
* @sample Ink_1_extendObj.html
*/
extendObj: function(destination/*, source... */) {
var sources = [].slice.call(arguments, 1);
Expand All @@ -608,7 +608,7 @@
*
* @method log
* @param {Any} [args*] Arguments to be evaluated
* @sample Ink_1_log.html
* @sample Ink_1_log.html
**/
log: function () {
// IE does not have console.log.apply in IE10 emulated mode
Expand All @@ -623,7 +623,7 @@
*
* @method warn
* @param {Any} [args*] Arguments to be evaluated
* @sample Ink_1_warn.html
* @sample Ink_1_warn.html
**/
warn: function () {
// IE does not have console.log.apply in IE10 emulated mode
Expand All @@ -638,7 +638,7 @@
*
* @method error
* @param {Any} [args*] Arguments to be evaluated
* @sample Ink_1_error.html
* @sample Ink_1_error.html
**/
error: function () {
// IE does not have console.log.apply in IE10 emulated mode
Expand Down
4 changes: 2 additions & 2 deletions src/sass/ink-flex.scss
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/

// Import Compass Core
Expand Down Expand Up @@ -93,4 +93,4 @@
@import "modules/js/tabs";
@import "modules/js/tagfield";
@import "modules/js/tooltips";
@import "modules/js/treeview";
@import "modules/js/treeview";
2 changes: 1 addition & 1 deletion src/sass/ink-ie.scss
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/

// Import Compass Core
Expand Down
4 changes: 2 additions & 2 deletions src/sass/ink-legacy.scss
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/

// Import Compass Core
Expand Down Expand Up @@ -52,4 +52,4 @@ html.no-flexboxlegacy {
@import "modules/js/carousel";
}

@import "modules/print";
@import "modules/print";
4 changes: 2 additions & 2 deletions src/sass/ink.scss
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/

// Import Compass Core
Expand Down Expand Up @@ -92,4 +92,4 @@
@import "modules/js/tabs";
@import "modules/js/tagfield";
@import "modules/js/tooltips";
@import "modules/js/treeview";
@import "modules/js/treeview";
2 changes: 1 addition & 1 deletion src/sass/modules/js/_drawer.scss
Expand Up @@ -11,7 +11,7 @@ body {
.left-drawer,
.right-drawer,
.content-drawer {
@include transition-property(translate3d);
@include transition-property(transform);
@include transition-duration($speed);
@include transition-timing-function($easing);
}
Expand Down
2 changes: 1 addition & 1 deletion src/sass/quick-start.scss
Expand Up @@ -7,7 +7,7 @@
* @author Sapo Ink Team
* @license http://opensource.org/licenses/MIT MIT
* @link http://ink.sapo.pt
* @version 3.1.0
* @version 3.1.1
*/

// IMPORT CONFIG FILES (THESE CONTAIN VARIABLE DEFINITIONS)
Expand Down

0 comments on commit a3f8b1f

Please sign in to comment.