Skip to content

Commit

Permalink
v3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
janschoenherr committed Oct 1, 2019
1 parent d8e5b0c commit a5e8b68
Show file tree
Hide file tree
Showing 12 changed files with 76 additions and 95 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Expand Up @@ -15,7 +15,7 @@ Also try to search for your issue. It may have already been answered or even fix
<!-- BUG REPORT TEMPLATE -->
### UIkit version
<!-- Check if the issue is reproducible with the latest stable version. -->
3.2.0
3.2.1

### Browser

Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog

## WIP
## 3.2.1 (October 1, 2019)

### Added

Expand Down
20 changes: 12 additions & 8 deletions dist/css/uikit-rtl.css
@@ -1,4 +1,4 @@
/*! UIkit 3.2.0 | http://www.getuikit.com | (c) 2014 - 2019 YOOtheme | MIT License */
/*! UIkit 3.2.1 | http://www.getuikit.com | (c) 2014 - 2019 YOOtheme | MIT License */
/* ========================================================================
Component: Base
========================================================================== */
Expand Down Expand Up @@ -1889,11 +1889,12 @@ select.uk-form-width-xsmall {
* 3. Address `overflow` set to `hidden` in IE.
* 4. Correct `font` properties and `color` not being inherited for `button`.
* 5. Remove the inheritance of text transform in Edge, Firefox, and IE.
* 6. Style
* 7. `line-height` is used to create a height because it also centers the text vertically for `a` elements.
* 6. Remove default style for `input type="submit"`in iOS.
* 7. Style
* 8. `line-height` is used to create a height because it also centers the text vertically for `a` elements.
* Better would be to use height and flexbox to center the text vertically but flexbox doesn't work in Firefox on `button` elements.
* 8. Align text if button has a width
* 9. Required for `a`.
* 9. Align text if button has a width
* 10. Required for `a`.
*/
.uk-button {
/* 1 */
Expand All @@ -1908,16 +1909,19 @@ select.uk-form-width-xsmall {
/* 5 */
text-transform: none;
/* 6 */
-webkit-appearance: none;
border-radius: 0;
/* 7 */
display: inline-block;
box-sizing: border-box;
padding: 0 30px;
vertical-align: middle;
font-size: 0.875rem;
/* 7 */
line-height: 38px;
/* 8 */
text-align: center;
line-height: 38px;
/* 9 */
text-align: center;
/* 10 */
text-decoration: none;
text-transform: uppercase;
transition: 0.1s ease-in-out;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/uikit-rtl.min.css

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions dist/css/uikit.css
@@ -1,4 +1,4 @@
/*! UIkit 3.2.0 | http://www.getuikit.com | (c) 2014 - 2019 YOOtheme | MIT License */
/*! UIkit 3.2.1 | http://www.getuikit.com | (c) 2014 - 2019 YOOtheme | MIT License */
/* ========================================================================
Component: Base
========================================================================== */
Expand Down Expand Up @@ -1889,11 +1889,12 @@ select.uk-form-width-xsmall {
* 3. Address `overflow` set to `hidden` in IE.
* 4. Correct `font` properties and `color` not being inherited for `button`.
* 5. Remove the inheritance of text transform in Edge, Firefox, and IE.
* 6. Style
* 7. `line-height` is used to create a height because it also centers the text vertically for `a` elements.
* 6. Remove default style for `input type="submit"`in iOS.
* 7. Style
* 8. `line-height` is used to create a height because it also centers the text vertically for `a` elements.
* Better would be to use height and flexbox to center the text vertically but flexbox doesn't work in Firefox on `button` elements.
* 8. Align text if button has a width
* 9. Required for `a`.
* 9. Align text if button has a width
* 10. Required for `a`.
*/
.uk-button {
/* 1 */
Expand All @@ -1908,16 +1909,19 @@ select.uk-form-width-xsmall {
/* 5 */
text-transform: none;
/* 6 */
-webkit-appearance: none;
border-radius: 0;
/* 7 */
display: inline-block;
box-sizing: border-box;
padding: 0 30px;
vertical-align: middle;
font-size: 0.875rem;
/* 7 */
line-height: 38px;
/* 8 */
text-align: center;
line-height: 38px;
/* 9 */
text-align: center;
/* 10 */
text-decoration: none;
text-transform: uppercase;
transition: 0.1s ease-in-out;
Expand Down
2 changes: 1 addition & 1 deletion dist/css/uikit.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/uikit-icons.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/js/uikit-icons.min.js

Large diffs are not rendered by default.

91 changes: 30 additions & 61 deletions dist/js/uikit.js
@@ -1,4 +1,4 @@
/*! UIkit 3.2.0 | http://www.getuikit.com | (c) 2014 - 2019 YOOtheme | MIT License */
/*! UIkit 3.2.1 | http://www.getuikit.com | (c) 2014 - 2019 YOOtheme | MIT License */

(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
Expand Down Expand Up @@ -89,8 +89,9 @@
return obj !== null && typeof obj === 'object';
}

var toString = objPrototype.toString;
function isPlainObject(obj) {
return isObject(obj) && Object.getPrototypeOf(obj) === objPrototype;
return toString.call(obj) === '[object Object]';
}

function isWindow(obj) {
Expand All @@ -109,7 +110,6 @@
return obj instanceof Node || isObject(obj) && obj.nodeType >= 1;
}

var toString = objPrototype.toString;
function isNodeCollection(obj) {
return toString.call(obj).match(/^\[object (NodeList|HTMLCollection)\]$/);
}
Expand Down Expand Up @@ -7357,72 +7357,38 @@
this.elements.forEach(function (el) {

var state = el._ukScrollspyState;
var cls = state.cls;

if (state.show && !state.inview && !state.queued) {

var show = function () {

css(el, 'visibility', '');
addClass(el, this$1.inViewClass);
toggleClass(el, cls);

trigger(el, 'inview');

this$1.$update(el);

state.inview = true;
state.abort && state.abort();
};

if (this$1.delay) {

state.queued = true;
data.promise = (data.promise || Promise.resolve()).then(function () {
return !state.inview && new Promise(function (resolve) {

var timer = setTimeout(function () {
var toggle = function (inview) {

show();
resolve();
css(el, 'visibility', !inview && this$1.hidden ? 'hidden' : '');

}, data.promise || this$1.elements.length === 1 ? this$1.delay : 0);
toggleClass(el, this$1.inViewClass, inview);
toggleClass(el, state.cls);

state.abort = function () {
clearTimeout(timer);
resolve();
state.queued = false;
};
trigger(el, inview ? 'inview' : 'outview');

});
state.inview = inview;

});

} else {
show();
}

} else if (!state.show && (state.inview || state.queued) && this$1.repeat) {
this$1.$update(el);

state.abort && state.abort();
};

if (!state.inview) {
return;
}
if (state.show && !state.inview && !state.queued) {

css(el, 'visibility', this$1.hidden ? 'hidden' : '');
removeClass(el, this$1.inViewClass);
toggleClass(el, cls);
state.queued = true;

trigger(el, 'outview');
data.promise = (data.promise || Promise.resolve()).then(function () { return new Promise(function (resolve) { return setTimeout(resolve, this$1.delay); }
); }
).then(function () {
toggle(true);
setTimeout(function () { return state.queued = false; }, 300);
});

this$1.$update(el);
} else if (!state.show && state.inview && !state.queued && this$1.repeat) {

state.inview = false;
toggle(false);

}


});

},
Expand Down Expand Up @@ -8249,7 +8215,7 @@

}

UIkit.version = '3.2.0';
UIkit.version = '3.2.1';

core(UIkit);

Expand Down Expand Up @@ -9105,6 +9071,7 @@

if (!this.draggable
|| !isTouch(e) && hasTextNodesOnly(e.target)
|| closest(e.target, selInput)
|| e.button > 0
|| this.length < 2
) {
Expand Down Expand Up @@ -9406,7 +9373,8 @@
easing: String,
index: Number,
finite: Boolean,
velocity: Number
velocity: Number,
selSlides: String
},

data: function () { return ({
Expand Down Expand Up @@ -9453,14 +9421,15 @@

selSlides: function(ref) {
var selList = ref.selList;
var selSlides = ref.selSlides;

return (selList + " > *");
return (selList + " " + (selSlides || '> *'));
},

slides: {

get: function() {
return toNodes(this.list.children);
return $$(this.selSlides, this.$el);
},

watch: function() {
Expand Down Expand Up @@ -10962,7 +10931,7 @@
finite: function(ref) {
var finite = ref.finite;

return finite || getWidth(this.list) < bounds(this.list).width + getMaxWidth(this.list) + this.center;
return finite || Math.ceil(getWidth(this.list)) < bounds(this.list).width + getMaxWidth(this.list) + this.center;
},

maxIndex: function() {
Expand Down Expand Up @@ -11060,7 +11029,7 @@
this$1.maxIndex && toggleClass(el, 'uk-hidden', isNumeric(index) && (this$1.sets && !includes(this$1.sets, toFloat(index)) || index > this$1.maxIndex));
});

if (!this.dragging && !this.stack.length) {
if (this.length && !this.dragging && !this.stack.length) {
this._getTransitioner().translate(1);
}

Expand Down
4 changes: 2 additions & 2 deletions dist/js/uikit.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -2,7 +2,7 @@
"name": "uikit",
"title": "UIkit",
"description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
"version": "3.2.0",
"version": "3.2.1",
"main": "dist/js/uikit.js",
"style": "dist/css/uikit.css",
"sideEffects": [
Expand Down
18 changes: 11 additions & 7 deletions src/scss/components/button.scss
Expand Up @@ -87,11 +87,12 @@ $button-link-disabled-color: $global-muted-color !default;
* 3. Address `overflow` set to `hidden` in IE.
* 4. Correct `font` properties and `color` not being inherited for `button`.
* 5. Remove the inheritance of text transform in Edge, Firefox, and IE.
* 6. Style
* 7. `line-height` is used to create a height because it also centers the text vertically for `a` elements.
* 6. Remove default style for `input type="submit"`in iOS.
* 7. Style
* 8. `line-height` is used to create a height because it also centers the text vertically for `a` elements.
* Better would be to use height and flexbox to center the text vertically but flexbox doesn't work in Firefox on `button` elements.
* 8. Align text if button has a width
* 9. Required for `a`.
* 9. Align text if button has a width
* 10. Required for `a`.
*/

.uk-button {
Expand All @@ -107,16 +108,19 @@ $button-link-disabled-color: $global-muted-color !default;
/* 5 */
text-transform: none;
/* 6 */
-webkit-appearance: none;
border-radius: 0;
/* 7 */
display: inline-block;
box-sizing: border-box;
padding: 0 $button-padding-horizontal;
vertical-align: middle;
font-size: $button-font-size;
/* 7 */
line-height: $button-line-height;
/* 8 */
text-align: center;
line-height: $button-line-height;
/* 9 */
text-align: center;
/* 10 */
text-decoration: none;
@if(mixin-exists(hook-button)) {@include hook-button();}
}
Expand Down

0 comments on commit a5e8b68

Please sign in to comment.