Skip to content

Commit

Permalink
UIkit updated
Browse files Browse the repository at this point in the history
  • Loading branch information
Artur Heinze committed Jan 27, 2016
1 parent e446612 commit 28bed4e
Show file tree
Hide file tree
Showing 142 changed files with 139 additions and 150 deletions.
Empty file modified cockpit/assets/lib/uikit/fonts/FontAwesome.otf
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/fonts/fontawesome-webfont.ttf
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/fonts/fontawesome-webfont.woff
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/fonts/fontawesome-webfont.woff2
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/accordion.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/accordion.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/autocomplete.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/autocomplete.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/datepicker.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/datepicker.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/form-password.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/form-password.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/form-select.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/form-select.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/grid.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/grid.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/htmleditor.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/htmleditor.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/lightbox.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/lightbox.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/nestable.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/nestable.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/notify.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/notify.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/pagination.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/pagination.min.js
100755 → 100644
Empty file.
6 changes: 3 additions & 3 deletions cockpit/assets/lib/uikit/js/components/parallax.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,13 @@
url = element.css('background-image').replace(/^url\(/g, '').replace(/\)$/g, '').replace(/("|')/g, '');
check = function() {

var w = element.width(), h = element.height(), extra = (prop=='bg') ? opts.diff : (opts.diff/100) * h;
var w = element.innerWidth(), h = element.innerHeight(), extra = (prop=='bg') ? opts.diff : (opts.diff/100) * h;

h += extra;
w += Math.ceil(extra * ratio);

if (w-extra > size.w && h < size.h) {
return obj.element.css({'background-size': ''});
if (w-extra < size.w && h < size.h) {
return obj.element.css({'background-size': 'auto'});
}

// if element height < parent height (gap underneath)
Expand Down
2 changes: 1 addition & 1 deletion cockpit/assets/lib/uikit/js/components/parallax.min.js
100755 → 100644

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

Empty file modified cockpit/assets/lib/uikit/js/components/search.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/search.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slider.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slider.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slideset.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slideset.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slideshow-fx.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slideshow-fx.min.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slideshow.js
100755 → 100644
Empty file.
Empty file modified cockpit/assets/lib/uikit/js/components/slideshow.min.js
100755 → 100644
Empty file.
21 changes: 5 additions & 16 deletions cockpit/assets/lib/uikit/js/components/sortable.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
}

// inside or outside of sortable?
var sortable = closestSortable(e.target),
var sortable = closestSortable(currentlyDraggingElement),
component = draggingPlaceholder.$sortable,
ev = { type: e.type };

Expand Down Expand Up @@ -184,19 +184,6 @@
return $this.dragStart(e, this);
});

var handleDragOver = delegate(function(e) {

if (!currentlyDraggingElement) {
return true;
}

if (e.preventDefault) {
e.preventDefault();
}

return false;
});

var handleDragEnter = delegate(UI.Utils.debounce(function(e) {
return $this.dragEnter(e, this);
}), 40);
Expand Down Expand Up @@ -324,7 +311,7 @@
}
}

if (target.is('.'+$this.options.noDragClass) || target.closest('.'+$this.options._noDragClass).length) {
if (target.is('.'+$this.options.noDragClass) || target.closest('.'+$this.options.noDragClass).length) {
return;
}

Expand Down Expand Up @@ -529,7 +516,9 @@
}

triggers.forEach(function (trigger, i) {
trigger.sortable.element.trigger('change.uk.sortable', [trigger.sortable, el, trigger.mode]);
if (trigger.sortable) {
trigger.sortable.element.trigger('change.uk.sortable', [trigger.sortable, el, trigger.mode]);
}
});
},

Expand Down
Loading

0 comments on commit 28bed4e

Please sign in to comment.