Skip to content

Commit 806bd67

Browse files
Updated distribution to version 2.5.0
1 parent e439521 commit 806bd67

File tree

11 files changed

+57
-14
lines changed

11 files changed

+57
-14
lines changed

definitions/elements/button.less

+17
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,23 @@
879879
transform: translateY(-50%);
880880
}
881881

882+
/* Loading */
883+
.ui.labeled.icon.button > .icon.loading {
884+
animation: none;
885+
}
886+
.ui.labeled.icon.button > .icon.loading:before {
887+
animation: labeled-button-icon-loading @loadingIconDuration linear infinite;
888+
}
889+
890+
@keyframes labeled-button-icon-loading {
891+
from {
892+
transform: translateY(-50%) rotate(0deg);
893+
}
894+
to {
895+
transform: translateY(-50%) rotate(360deg);
896+
}
897+
}
898+
882899
.ui.labeled.icon.buttons .button > .icon {
883900
border-radius: 0em;
884901
}

definitions/elements/icon.less

+8-4
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,19 @@ i.icon:before {
7171
i.icon.loading {
7272
height: 1em;
7373
line-height: 1;
74+
}
75+
76+
i.icon.loading {
7477
animation: icon-loading @loadingDuration linear infinite;
7578
}
79+
7680
@keyframes icon-loading {
77-
from {
81+
from {
7882
transform: rotate(0deg);
79-
}
80-
to {
83+
}
84+
to {
8185
transform: rotate(360deg);
82-
}
86+
}
8387
}
8488

8589
/*******************************

definitions/modules/dimmer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ $.fn.dimmer = function(parameters) {
151151

152152
event: {
153153
click: function(event) {
154-
module.verbose('Determining if event occured on dimmer', event);
154+
module.verbose('Determining if event occurred on dimmer', event);
155155
if( $dimmer.find(event.target).length === 0 || $(event.target).is(selector.content) ) {
156156
module.hide();
157157
event.stopImmediatePropagation();

definitions/modules/dropdown.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,9 @@
314314
}
315315

316316
/* Automatically float dropdown menu right on last menu item */
317-
.ui.menu .right.menu .dropdown:last-child .menu,
318-
.ui.menu .right.dropdown.item .menu,
319-
.ui.buttons > .ui.dropdown:last-child .menu {
317+
.ui.menu .right.menu .dropdown:last-child > .menu,
318+
.ui.menu .right.dropdown.item > .menu,
319+
.ui.buttons > .ui.dropdown:last-child > .menu {
320320
left: auto;
321321
right: 0em;
322322
}

definitions/modules/modal.js

+3
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ $.fn.modal = function(parameters) {
138138
},
139139

140140
destroy: function() {
141+
if (observer) {
142+
observer.disconnect();
143+
}
141144
module.verbose('Destroying previous modal');
142145
$module
143146
.removeData(moduleNamespace)

definitions/modules/sticky.js

+20-2
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,18 @@ $.fn.sticky = function(parameters) {
402402
module.determineContainer();
403403
}
404404
else {
405+
var tallestHeight = Math.max(module.cache.context.height, module.cache.element.height);
406+
if(tallestHeight - $container.outerHeight() > settings.jitter) {
407+
module.debug('Context is taller than container. Specifying exact height for container', module.cache.context.height);
408+
$container.css({
409+
height: tallestHeight,
410+
});
411+
}
412+
else {
413+
$container.css({
414+
height: '',
415+
});
416+
}
405417
if( Math.abs($container.outerHeight() - module.cache.context.height) > settings.jitter) {
406418
module.debug('Context has padding, specifying exact height for container', module.cache.context.height);
407419
$container.css({
@@ -438,7 +450,7 @@ $.fn.sticky = function(parameters) {
438450
},
439451
size: function() {
440452
if(module.cache.element.height !== 0 && module.cache.element.width !== 0) {
441-
element.style.setProperty('width', module.cache.element.width + 'px', 'important');
453+
element.style.setProperty('width', module.cache.element.width + 'px', 'important');
442454
element.style.setProperty('height', module.cache.element.height + 'px', 'important');
443455
}
444456
}
@@ -501,7 +513,7 @@ $.fn.sticky = function(parameters) {
501513
module.bindBottom();
502514
}
503515
else if(scroll.top > element.top) {
504-
if( (element.height + scroll.top - elementScroll) >= context.bottom ) {
516+
if((element.height + scroll.top - elementScroll) >= context.bottom && element.height < context.height) {
505517
module.debug('Initial element position is bottom of container');
506518
module.bindBottom();
507519
}
@@ -580,6 +592,9 @@ $.fn.sticky = function(parameters) {
580592
bindTop: function() {
581593
module.debug('Binding element to top of parent container');
582594
module.remove.offset();
595+
if(settings.setSize) {
596+
module.set.size();
597+
}
583598
$module
584599
.css({
585600
left : '',
@@ -597,6 +612,9 @@ $.fn.sticky = function(parameters) {
597612
bindBottom: function() {
598613
module.debug('Binding element to bottom of parent container');
599614
module.remove.offset();
615+
if(settings.setSize) {
616+
module.set.size();
617+
}
600618
$module
601619
.css({
602620
left : '',

package.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var
55
Package.describe({
66
name : 'semantic:ui',
77
summary : 'Semantic UI - LESS Release of Semantic UI',
8-
version : '2.4.1',
8+
version : '2.5.0',
99
git : 'git://github.com/Semantic-Org/Semantic-UI-LESS.git',
1010
});
1111

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "semantic-ui-less",
3-
"version": "2.4.1",
3+
"version": "2.5.0",
44
"title": "Semantic UI",
55
"description": "LESS Only distribution of Semantic UI",
66
"homepage": "http://www.semantic-ui.com",

theme.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
@import "@{themesFolder}/default/globals/site.variables";
1717

1818
/* Packaged site.variables */
19-
@import "@{themesFolder}/@{site}/globals/site.variables";
19+
@import (optional) "@{themesFolder}/@{site}/globals/site.variables";
2020

2121
/* Component's site.variables */
2222
@import (optional) "@{themesFolder}/@{theme}/globals/site.variables";

themes/default/elements/button.variables

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162

163163
/* Icon */
164164
@iconButtonOpacity: 0.9;
165+
@loadingIconDuration: 2s;
165166

166167
/* Labeled */
167168
@labeledLabelFontSize: @medium;

0 commit comments

Comments
 (0)