From 4f9f583abd90d893354692957bdf35fb78aeea68 Mon Sep 17 00:00:00 2001 From: Pusher Robot Date: Sat, 13 Oct 2018 15:56:41 -0700 Subject: [PATCH] Updated distribution to version 2.4.1 --- definitions/collections/grid.less | 12 ++++++------ definitions/collections/menu.less | 2 +- definitions/modules/dropdown.js | 4 ++-- definitions/modules/dropdown.less | 2 +- definitions/modules/embed.js | 12 +++++++++++- definitions/modules/modal.less | 4 ---- package.js | 5 ++++- package.json | 2 +- themes/default/collections/menu.variables | 4 ++-- themes/default/collections/table.variables | 2 +- themes/default/elements/label.variables | 14 +++++++------- themes/default/elements/segment.variables | 2 +- themes/default/elements/step.variables | 2 +- 13 files changed, 38 insertions(+), 29 deletions(-) diff --git a/definitions/collections/grid.less b/definitions/collections/grid.less index ba1b535..05c0a2b 100644 --- a/definitions/collections/grid.less +++ b/definitions/collections/grid.less @@ -139,7 +139,7 @@ margin: (@rowSpacing / 2) (@gutterWidth / 2); } .ui.grid .column + .ui.vertical.divider { - height: ~"calc(50% - "(@rowSpacing/2)~")"; + height: calc(50% - (@rowSpacing / 2)); } /* Remove Border on Last Horizontal Segment */ @@ -1077,7 +1077,7 @@ top: 0em; left: 0px; - width: ~"calc(100% - "@gutterWidth~")"; + width: calc(100% - @gutterWidth); height: 1px; margin: 0% (@gutterWidth / 2); @@ -1112,12 +1112,12 @@ .ui.relaxed[class*="vertically divided"].grid > .row:before { margin-left: (@relaxedGutterWidth / 2); margin-right: (@relaxedGutterWidth / 2); - width: ~"calc(100% - "@relaxedGutterWidth~")"; + width: calc(100% - @relaxedGutterWidth); } .ui[class*="very relaxed"][class*="vertically divided"].grid > .row:before { - margin-left: @veryRelaxedGutterWidth; - margin-right: @veryRelaxedGutterWidth; - width: ~"calc(100% - "@veryRelaxedGutterWidth~")"; + margin-left: (@veryRelaxedGutterWidth / 2); + margin-right: (@veryRelaxedGutterWidth / 2); + width: calc(100% - @veryRelaxedGutterWidth); } /*---------------------- diff --git a/definitions/collections/menu.less b/definitions/collections/menu.less index 3806b00..5e48306 100644 --- a/definitions/collections/menu.less +++ b/definitions/collections/menu.less @@ -211,7 +211,7 @@ /* Menu */ .ui.menu .dropdown.item .menu { - min-width: ~"calc(100% - 1px)"; + min-width: calc(100% - 1px); border-radius: 0em 0em @dropdownMenuBorderRadius @dropdownMenuBorderRadius; background: @dropdownBackground; margin: @dropdownMenuDistance 0px 0px; diff --git a/definitions/modules/dropdown.js b/definitions/modules/dropdown.js index 9af348a..04da799 100644 --- a/definitions/modules/dropdown.js +++ b/definitions/modules/dropdown.js @@ -605,7 +605,6 @@ $.fn.dropdown = function(parameters) { else { if(settings.on == 'click') { $module - .on('click' + eventNamespace, selector.icon, module.event.icon.click) .on('click' + eventNamespace, module.event.test.toggle) ; } @@ -621,6 +620,7 @@ $.fn.dropdown = function(parameters) { ; } $module + .on('click' + eventNamespace, selector.icon, module.event.icon.click) .on('mousedown' + eventNamespace, module.event.mousedown) .on('mouseup' + eventNamespace, module.event.mouseup) .on('focus' + eventNamespace, module.event.focus) @@ -1022,7 +1022,7 @@ $.fn.dropdown = function(parameters) { if($icon.hasClass(className.clear)) { module.clear(); } - else { + else if (module.can.click()) { module.toggle(); } } diff --git a/definitions/modules/dropdown.less b/definitions/modules/dropdown.less index 4e8ce57..721aa01 100644 --- a/definitions/modules/dropdown.less +++ b/definitions/modules/dropdown.less @@ -1110,7 +1110,7 @@ select.ui.dropdown { @media all and (-ms-high-contrast:none) { .ui.scrolling.dropdown .menu, .ui.dropdown .scrolling.menu { - min-width: ~"calc(100% - "@scrollbarWidth~")"; + min-width: calc(100% - @scrollbarWidth); } } @media only screen and (max-width : @largestMobileScreen) { diff --git a/definitions/modules/embed.js b/definitions/modules/embed.js index 682a6ec..a9f684d 100644 --- a/definitions/modules/embed.js +++ b/definitions/modules/embed.js @@ -10,7 +10,7 @@ ;(function ($, window, document, undefined) { -'use strict'; +"use strict"; window = (typeof window != 'undefined' && window.Math == Math) ? window @@ -181,6 +181,7 @@ $.fn.embed = function(parameters) { // clears embed reset: function() { module.debug('Clearing embed and showing placeholder'); + module.remove.data(); module.remove.active(); module.remove.embed(); module.showPlaceholder(); @@ -300,6 +301,15 @@ $.fn.embed = function(parameters) { }, remove: { + data: function() { + $module + .removeData(metadata.id) + .removeData(metadata.icon) + .removeData(metadata.placeholder) + .removeData(metadata.source) + .removeData(metadata.url) + ; + }, active: function() { $module.removeClass(className.active); }, diff --git a/definitions/modules/modal.less b/definitions/modules/modal.less index 479786a..1d59597 100644 --- a/definitions/modules/modal.less +++ b/definitions/modules/modal.less @@ -421,12 +421,8 @@ .ui.fullscreen.modal { width: @fullScreenWidth !important; - left: @fullScreenOffset !important; margin: @fullScreenMargin; } -.ui.fullscreen.scrolling.modal { - left: 0em !important; -} .ui.fullscreen.modal > .header { padding-right: @closeHitbox; } diff --git a/package.js b/package.js index 247a39b..1693432 100644 --- a/package.js +++ b/package.js @@ -5,7 +5,7 @@ var Package.describe({ name : 'semantic:ui', summary : 'Semantic UI - LESS Release of Semantic UI', - version : '2.4.0', + version : '2.4.1', git : 'git://github.com/Semantic-Org/Semantic-UI-LESS.git', }); @@ -130,6 +130,7 @@ Package.onUse(function(api) { 'definitions/elements/label.less', 'definitions/elements/list.less', 'definitions/elements/loader.less', + 'definitions/elements/placeholder.less', 'definitions/elements/rail.less', 'definitions/elements/reveal.less', 'definitions/elements/segment.less', @@ -277,6 +278,8 @@ Package.onUse(function(api) { 'themes/default/elements/list.variables', 'themes/default/elements/loader.overrides', 'themes/default/elements/loader.variables', + 'themes/default/elements/placeholder.overrides', + 'themes/default/elements/placeholder.variables', 'themes/default/elements/rail.overrides', 'themes/default/elements/rail.variables', 'themes/default/elements/reveal.overrides', diff --git a/package.json b/package.json index 671ece0..b9869ea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "semantic-ui-less", - "version": "2.4.0", + "version": "2.4.1", "title": "Semantic UI", "description": "LESS Only distribution of Semantic UI", "homepage": "http://www.semantic-ui.com", diff --git a/themes/default/collections/menu.variables b/themes/default/collections/menu.variables index 71ccb67..b41eb00 100644 --- a/themes/default/collections/menu.variables +++ b/themes/default/collections/menu.variables @@ -321,7 +321,7 @@ @tabularVerticalBackground: none @tabularBackgroundColor; @tabularFluidOffset: 1px; -@tabularFluidWidth: ~"calc(100% + "(@tabularFluidOffset * 2)~")"; +@tabularFluidWidth: calc(100% + (@tabularFluidOffset * 2)); @tabularActiveBackground: none @white; @tabularActiveColor: @selectedTextColor; @@ -430,7 +430,7 @@ @attachedTopOffset: 0px; @attachedBottomOffset: 0px; @attachedHorizontalOffset: -@borderWidth; -@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")"; +@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2)); @attachedBoxShadow: none; @attachedBorder: @borderWidth solid @solidBorderColor; @attachedBottomBoxShadow: diff --git a/themes/default/collections/table.variables b/themes/default/collections/table.variables index adb1635..420986d 100644 --- a/themes/default/collections/table.variables +++ b/themes/default/collections/table.variables @@ -152,7 +152,7 @@ @attachedTopOffset: 0px; @attachedBottomOffset: 0px; @attachedHorizontalOffset: -@borderWidth; -@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")"; +@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2)); @attachedBoxShadow: none; @attachedBorder: @borderWidth solid @solidBorderColor; @attachedBottomBoxShadow: diff --git a/themes/default/elements/label.variables b/themes/default/elements/label.variables index 6729643..91868a3 100755 --- a/themes/default/elements/label.variables +++ b/themes/default/elements/label.variables @@ -130,18 +130,18 @@ @ribbonShadowColor: rgba(0, 0, 0, 0.15); @ribbonMargin: 1rem; -@ribbonOffset: ~"calc("-@ribbonMargin~" - "@ribbonTriangleSize~")"; -@ribbonDistance: ~"calc("@ribbonMargin~" + "@ribbonTriangleSize~")"; -@rightRibbonOffset: ~"calc(100% + "@ribbonMargin~" + "@ribbonTriangleSize~")"; +@ribbonOffset: calc(-@ribbonMargin - @ribbonTriangleSize); +@ribbonDistance: calc(@ribbonMargin + @ribbonTriangleSize); +@rightRibbonOffset: calc(100% + @ribbonMargin + @ribbonTriangleSize); @ribbonImageTopDistance: 1rem; @ribbonImageMargin: -0.05rem; /* Rounding Offset on Triangle */ -@ribbonImageOffset: ~"calc("-@ribbonImageMargin~" - "@ribbonTriangleSize~")"; -@rightRibbonImageOffset: ~"calc(100% + "@ribbonImageMargin~" + "@ribbonTriangleSize~")"; +@ribbonImageOffset: calc(-@ribbonImageMargin - @ribbonTriangleSize); +@rightRibbonImageOffset: calc(100% + @ribbonImageMargin + @ribbonTriangleSize); @ribbonTableMargin: @relativeMini; /* Rounding Offset on Triangle */ -@ribbonTableOffset: ~"calc("-@ribbonTableMargin~" - "@ribbonTriangleSize~")"; -@rightRibbonTableOffset: ~"calc(100% + "@ribbonTableMargin~" + "@ribbonTriangleSize~")"; +@ribbonTableOffset: calc(-@ribbonTableMargin - @ribbonTriangleSize); +@rightRibbonTableOffset: calc(100% + @ribbonTableMargin + @ribbonTriangleSize); /* Colors */ diff --git a/themes/default/elements/segment.variables b/themes/default/elements/segment.variables index 6ae2a2a..9b2c4d4 100755 --- a/themes/default/elements/segment.variables +++ b/themes/default/elements/segment.variables @@ -103,7 +103,7 @@ @attachedTopOffset: 0px; @attachedBottomOffset: 0px; @attachedHorizontalOffset: -@borderWidth; -@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")"; +@attachedWidth: calc(100% - (@attachedHorizontalOffset * 2)); @attachedBoxShadow: none; @attachedBorder: @borderWidth solid @solidBorderColor; @attachedBottomBoxShadow: diff --git a/themes/default/elements/step.variables b/themes/default/elements/step.variables index f54213c..332472d 100755 --- a/themes/default/elements/step.variables +++ b/themes/default/elements/step.variables @@ -95,7 +95,7 @@ @attachedHorizontalOffset: -@borderWidth; @attachedVerticalOffset: 0; -@attachedWidth: ~"calc(100% + "-@attachedHorizontalOffset * 2~")"; +@attachedWidth: calc(100% + (-@attachedHorizontalOffset * 2)); @orderedFontFamily: inherit; @orderedFontWeight: @bold;