From: paladox Date: Sat, 14 Jun 2014 23:41:57 +0000 (+0000) Subject: Update jquery.jStorage.js X-Git-Tag: 1.31.0-rc.0~15372^2 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=fd2909398eb5820365427c714d9b1922d7ec97f6;hp=3f6afa8cf8c9be975dc08403b6cb4ca00ad881eb;p=lhc%2Fweb%2Fwiklou.git Update jquery.jStorage.js Project site * http://www.jstorage.info/ and https://github.com/andris9/jStorage jquery.jStorage.js file * https://github.com/andris9/jStorage/blob/master/jstorage.js Author and contact * Andris Reinman and email andris.reinman@gmail.com README * https://github.com/andris9/jStorage/blob/master/README.md Change-Id: I0ca42e909cc08f8f0b67cec0a7c0aedd0ebf91d7 --- diff --git a/resources/lib/jquery/jquery.jStorage.js b/resources/lib/jquery/jquery.jStorage.js index 324833c92e..902a5cc584 100644 --- a/resources/lib/jquery/jquery.jStorage.js +++ b/resources/lib/jquery/jquery.jStorage.js @@ -502,7 +502,7 @@ // set next check if(nextExpire != Infinity){ - _ttl_timeout = setTimeout(_handleTTL, nextExpire - curtime); + _ttl_timeout = setTimeout(Math.min(_handleTTL, nextExpire - curtime, 0x7FFFFFFF)); } // save changes @@ -664,7 +664,7 @@ * @param {Mixed} value Value to set. This can be any value that is JSON * compatible (Numbers, Strings, Objects etc.). * @param {Object} [options] - possible options to use - * @param {Number} [options.TTL] - optional TTL value + * @param {Number} [options.TTL] - optional TTL value, in milliseconds * @return {Mixed} the used value */ set: function(key, value, options){ diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less b/resources/src/mediawiki.less/mediawiki.mixins.less index 6556af9991..67e2f33e22 100644 --- a/resources/src/mediawiki.less/mediawiki.mixins.less +++ b/resources/src/mediawiki.less/mediawiki.mixins.less @@ -60,13 +60,21 @@ list-style-image: url(@url); } -.transition(@string) { - -webkit-transition: @string; - transition: @string; +.transition(@value) { + -webkit-backface-visibility: hidden; // fixes Chrome 1px movement bug + -webkit-transition: @value; + -moz-transition: @value; + -o-transition: @value; + transition: @value; } .box-sizing(@value) { - -moz-box-sizing: @value; -webkit-box-sizing: @value; + -moz-box-sizing: @value; box-sizing: @value; } + +.box-shadow(@value) { + -webkit-box-shadow: @value; // Android 2.3+, iOS 4.0.2-4.2, Safari 3-4 + box-shadow: @value; // Chrome 6+, Firefox 4+, IE 9+, iOS 5+, Opera 10.50+ +} diff --git a/resources/src/mediawiki.ui/settings/colors.less b/resources/src/mediawiki.ui/settings/colors.less index 18661de684..d456f864fd 100644 --- a/resources/src/mediawiki.ui/settings/colors.less +++ b/resources/src/mediawiki.ui/settings/colors.less @@ -1,10 +1,35 @@ +// FIXME: remove @colorProgressiveShadow (shadows should be generated +// in LESS by dimming the original colors) +@colorProgressiveShadow: #4091ed; + +// White; for background use, and text use on dark backgrounds @colorWhite: #fff; -@colorGrayLight: #ccc; +// Off-white; for background use on white backgrounds +@colorOffWhite: #fafafa; +// Dark gray; for non-text use @colorGrayDark: #898989; +// Light gray; for non-text use +@colorGrayLight: #ccc; +// Very light gray; for non-text use +@colorGrayLighter: #ddd; +// Lightest gray; for non-text use +@colorGrayLightest: #eee; + +// Dark gray; for body text @colorText: #252525; +// Light gray; for less important body text and links +@colorTextLight: #696969; + +// Blue; for contextual use of a continuing action @colorProgressive: #347bff; -// FIXME: remove @colorProgressiveShadow (shadows should be generated -// in LESS by dimming the original colors) -@colorProgressiveShadow: #4091ed; +// Orange; for contextual use of returning to a past action +@colorRegressive: #ff7e1e; +// Green; for contextual use of a positive finalizing action @colorConstructive: #00af89; +// Red; for contextual use of a negative finalizing action @colorDestructive: #d11d13; + +// Used in mixins to darken contextual colors by the same amount (eg. focus) +@colorDarkenPercentage: 13.5%; +// Used in mixins to lighten contextual colors by the same amount (eg. hover) +@colorLightenPercentage: 13.5%; \ No newline at end of file diff --git a/resources/src/mediawiki.ui/vector.less b/resources/src/mediawiki.ui/vector.less index df51efcd89..04e88e8bf4 100644 --- a/resources/src/mediawiki.ui/vector.less +++ b/resources/src/mediawiki.ui/vector.less @@ -20,6 +20,7 @@ // // Styleguide 1. +@import "mediawiki.mixins"; @import "components/utilities"; @import "components/vector/forms"; @import "components/vector/containers";