diff --git a/definitions/behaviors/form.js b/definitions/behaviors/form.js index cc76d6e..8035357 100644 --- a/definitions/behaviors/form.js +++ b/definitions/behaviors/form.js @@ -336,7 +336,7 @@ $.fn.form = function(parameters) { } }, blank: function($field) { - return $.trim($field.val()) === ''; + return String($field.val()).trim() === ''; }, valid: function(field) { var @@ -1128,7 +1128,7 @@ $.fn.form = function(parameters) { $elGroup = $(el).closest($group), isCheckbox = ($el.filter(selector.checkbox).length > 0), isRequired = $el.prop('required') || $elGroup.hasClass(className.required) || $elGroup.parent().hasClass(className.required), - isDisabled = $el.prop('disabled') || $elGroup.hasClass(className.disabled) || $elGroup.parent().hasClass(className.disabled), + isDisabled = $el.is(':disabled') || $elGroup.hasClass(className.disabled) || $elGroup.parent().hasClass(className.disabled), validation = module.get.validation($el), hasEmptyRule = validation ? $.grep(validation.rules, function(rule) { return rule.type == "empty" }) !== 0 @@ -1207,13 +1207,7 @@ $.fn.form = function(parameters) { module.debug('Using field name as identifier', identifier); field.identifier = identifier; } - var isDisabled = true; - $.each($field, function(){ - if(!$(this).prop('disabled')) { - isDisabled = false; - return false; - } - }); + var isDisabled = !$field.filter(':not(:disabled)').length; if(isDisabled) { module.debug('Field is disabled. Skipping', identifier); } @@ -1270,7 +1264,7 @@ $.fn.form = function(parameters) { // cast to string avoiding encoding special values value = (value === undefined || value === '' || value === null) ? '' - : (settings.shouldTrim) ? $.trim(value + '') : String(value + '') + : (settings.shouldTrim) ? String(value + '').trim() : String(value + '') ; return ruleFunction.call(field, value, ancillary, $module); } diff --git a/definitions/behaviors/visibility.js b/definitions/behaviors/visibility.js index 97a96e2..4e40619 100644 --- a/definitions/behaviors/visibility.js +++ b/definitions/behaviors/visibility.js @@ -902,7 +902,7 @@ $.fn.visibility = function(parameters) { element.offset.top += $context.scrollTop() - $context.offset().top; } if(module.is.horizontallyScrollableContext()) { - element.offset.left += $context.scrollLeft - $context.offset().left; + element.offset.left += $context.scrollLeft() - $context.offset().left; } // store module.cache.element = element; diff --git a/definitions/collections/form.less b/definitions/collections/form.less index ae8953b..6f6d8fb 100644 --- a/definitions/collections/form.less +++ b/definitions/collections/form.less @@ -414,36 +414,40 @@ box-shadow: @inputFocusBoxShadow; } & when (@variationInputAction) { - .ui.form .ui.action.input:not(.left) input:not([type]):focus, - .ui.form .ui.action.input:not(.left) input[type="date"]:focus, - .ui.form .ui.action.input:not(.left) input[type="datetime-local"]:focus, - .ui.form .ui.action.input:not(.left) input[type="email"]:focus, - .ui.form .ui.action.input:not(.left) input[type="number"]:focus, - .ui.form .ui.action.input:not(.left) input[type="password"]:focus, - .ui.form .ui.action.input:not(.left) input[type="search"]:focus, - .ui.form .ui.action.input:not(.left) input[type="tel"]:focus, - .ui.form .ui.action.input:not(.left) input[type="time"]:focus, - .ui.form .ui.action.input:not(.left) input[type="text"]:focus, - .ui.form .ui.action.input:not(.left) input[type="file"]:focus, - .ui.form .ui.action.input:not(.left) input[type="url"]:focus { - border-top-right-radius: 0; - border-bottom-right-radius: 0; + .ui.form .ui.action.input:not([class*="left action"]) { + & input:not([type]):focus, + input[type="date"]:focus, + input[type="datetime-local"]:focus, + input[type="email"]:focus, + input[type="number"]:focus, + input[type="password"]:focus, + input[type="search"]:focus, + input[type="tel"]:focus, + input[type="time"]:focus, + input[type="text"]:focus, + input[type="file"]:focus, + input[type="url"]:focus { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } } - .ui.form .ui.action.input.left input:not([type]), - .ui.form .ui.action.input.left input[type="date"], - .ui.form .ui.action.input.left input[type="datetime-local"], - .ui.form .ui.action.input.left input[type="email"], - .ui.form .ui.action.input.left input[type="number"], - .ui.form .ui.action.input.left input[type="password"], - .ui.form .ui.action.input.left input[type="search"], - .ui.form .ui.action.input.left input[type="tel"], - .ui.form .ui.action.input.left input[type="time"], - .ui.form .ui.action.input.left input[type="text"], - .ui.form .ui.action.input.left input[type="file"], - .ui.form .ui.action.input.left input[type="url"] { - border-bottom-left-radius: 0; - border-top-left-radius: 0; + .ui.form .ui[class*="left action"].input { + & input:not([type]), + input[type="date"], + input[type="datetime-local"], + input[type="email"], + input[type="number"], + input[type="password"], + input[type="search"], + input[type="tel"], + input[type="time"], + input[type="text"], + input[type="file"], + input[type="url"] { + border-bottom-left-radius: 0; + border-top-left-radius: 0; + } } } .ui.form textarea:focus { diff --git a/definitions/elements/button.less b/definitions/elements/button.less index ab28007..d8f55d0 100644 --- a/definitions/elements/button.less +++ b/definitions/elements/button.less @@ -615,15 +615,17 @@ .ui.button > .icon:not(.button) { height: @iconHeight; opacity: @iconOpacity; - margin: @iconMargin; transition: @iconTransition; - vertical-align: @iconVerticalAlign; color: @iconColor; } .ui.button:not(.icon) > .icon:not(.button):not(.dropdown), .ui.button:not(.icon) > .icons:not(.button):not(.dropdown) { margin: @iconMargin; + vertical-align: @iconVerticalAlign; +} +.ui.button:not(.icon) > .icons:not(.button):not(.dropdown) > .icon { + vertical-align: @iconVerticalAlign; } .ui.button:not(.icon) > .right.icon:not(.button):not(.dropdown) { margin: @rightIconMargin; @@ -706,15 +708,19 @@ ---------------*/ .ui.icon.buttons .button, -.ui.icon.button { +.ui.icon.button:not(.animated) { padding: @verticalPadding @verticalPadding ( @verticalPadding + @shadowOffset ); } +.ui.animated.icon.button > .content > .icon, .ui.icon.buttons .button > .icon, .ui.icon.button > .icon { opacity: @iconButtonOpacity; margin: 0 !important; vertical-align: top; } +.ui.animated.button > .content > .icon { + vertical-align: top; +} & when (@variationButtonBasic) { /*------------------- diff --git a/definitions/elements/divider.less b/definitions/elements/divider.less index 1979457..d23167d 100644 --- a/definitions/elements/divider.less +++ b/definitions/elements/divider.less @@ -42,8 +42,8 @@ ---------------*/ .ui.divider:not(.vertical):not(.horizontal) { - border-top: @shadowWidth solid @shadowColor; - border-bottom: @highlightWidth solid @highlightColor; + border-top: @shadowWidth @borderStyle @shadowColor; + border-bottom: @highlightWidth @borderStyle @highlightColor; } /*-------------- @@ -117,8 +117,8 @@ content: ''; z-index: 3; - border-left: @shadowWidth solid @shadowColor; - border-right: @highlightWidth solid @highlightColor; + border-left: @shadowWidth @borderStyle @shadowColor; + border-right: @highlightWidth @borderStyle @highlightColor; width: 0; height: @verticalDividerHeight; diff --git a/definitions/elements/icon.less b/definitions/elements/icon.less index 8f2f6ad..d0d3ced 100644 --- a/definitions/elements/icon.less +++ b/definitions/elements/icon.less @@ -288,14 +288,14 @@ each(@colors, { i.icon, i.icons { font-size: @medium; + line-height: 1; + vertical-align: middle; } & when not (@variationIconSizes = false) { each(@variationIconSizes, { @s: @@value; i.@{value}.@{value}.@{value}.icon, i.@{value}.@{value}.@{value}.icons { - line-height: 1; - vertical-align: middle; font-size: @s; } }) diff --git a/definitions/elements/input.less b/definitions/elements/input.less index 3eb8736..93e46ff 100644 --- a/definitions/elements/input.less +++ b/definitions/elements/input.less @@ -444,15 +444,15 @@ border-top: @borderWidth solid @borderColor; border-bottom: @borderWidth solid @borderColor; } - .ui.form > .field.@{state} > .ui.left.action.input > .ui.button, + .ui.form > .field.@{state} > .ui[class*="left action"].input > .ui.button, .ui.form > .field.@{state} > .ui.labeled.input:not(.right):not([class*="corner labeled"]) > .ui.label, - .ui.left.action.input.@{state} > .ui.button, + .ui[class*="left action"].input.@{state} > .ui.button, .ui.labeled.input.@{state}:not(.right):not([class*="corner labeled"]) > .ui.label { border-left: @borderWidth solid @borderColor; } - .ui.form > .field.@{state} > .ui.action.input:not(.left) > input + .ui.button, + .ui.form > .field.@{state} > .ui.action.input:not([class*="left action"]) > input + .ui.button, .ui.form > .field.@{state} > .ui.right.labeled.input:not([class*="corner labeled"]) > input + .ui.label, - .ui.action.input.@{state}:not(.left) > input + .ui.button, + .ui.action.input.@{state}:not([class*="left action"]) > input + .ui.button, .ui.right.labeled.input.@{state}:not([class*="corner labeled"]) > input + .ui.label { border-right: @borderWidth solid @borderColor; } diff --git a/definitions/elements/step.less b/definitions/elements/step.less index 4f72c20..acc7f36 100644 --- a/definitions/elements/step.less +++ b/definitions/elements/step.less @@ -235,6 +235,12 @@ border-width: @verticalArrowBorderWidth; display: @verticalArrowDisplay; } + .ui.right.vertical.steps .step:after { + border-width: @verticalLeftArrowBorderWidth; + left: @verticalLeftArrowLeftOffset; + right: @verticalLeftArrowRightOffset; + transform: translateY(-50%) translateX(-50%) rotate(-45deg); + } .ui.vertical.steps .active.step:after { display: @verticalActiveArrowDisplay; diff --git a/definitions/modules/calendar.js b/definitions/modules/calendar.js index a748681..7cb7a76 100644 --- a/definitions/modules/calendar.js +++ b/definitions/modules/calendar.js @@ -116,6 +116,7 @@ $.fn.calendar = function(parameters) { module.set.maxDate($module.data(metadata.maxDate)); } module.setting('type', module.get.type()); + module.setting('on', settings.on || ($input.length ? 'focus' : 'click')); }, popup: function () { if (settings.inline) { @@ -159,7 +160,7 @@ $.fn.calendar = function(parameters) { module.set.mode(settings.startMode); return settings.onShow.apply($container, arguments); }; - var on = settings.on || ($input.length ? 'focus' : 'click'); + var on = module.setting('on'); var options = $.extend({}, settings.popupOptions, { popup: $container, on: on, @@ -202,33 +203,38 @@ $.fn.calendar = function(parameters) { calendar: function () { var i, r, c, p, row, cell, pageGrid; - var mode = module.get.mode(); - var today = new Date(); - var date = module.get.date(); - var focusDate = module.get.focusDate(); - var display = focusDate || date || settings.initialDate || today; - display = module.helper.dateInRange(display); + var + mode = module.get.mode(), + today = new Date(), + date = module.get.date(), + focusDate = module.get.focusDate(), + display = module.helper.dateInRange(focusDate || date || settings.initialDate || today) + ; if (!focusDate) { focusDate = display; module.set.focusDate(focusDate, false, false); } - var isYear = mode === 'year'; - var isMonth = mode === 'month'; - var isDay = mode === 'day'; - var isHour = mode === 'hour'; - var isMinute = mode === 'minute'; - var isTimeOnly = settings.type === 'time'; + var + isYear = mode === 'year', + isMonth = mode === 'month', + isDay = mode === 'day', + isHour = mode === 'hour', + isMinute = mode === 'minute', + isTimeOnly = settings.type === 'time' + ; var multiMonth = Math.max(settings.multiMonth, 1); var monthOffset = !isDay ? 0 : module.get.monthOffset(); - var minute = display.getMinutes(); - var hour = display.getHours(); - var day = display.getDate(); - var startMonth = display.getMonth() + monthOffset; - var year = display.getFullYear(); + var + minute = display.getMinutes(), + hour = display.getHours(), + day = display.getDate(), + startMonth = display.getMonth() + monthOffset, + year = display.getFullYear() + ; var columns = isDay ? settings.showWeekNumbers ? 8 : 7 : isHour ? 4 : timeGap['column']; var rows = isDay || isHour ? 6 : timeGap['row']; @@ -254,17 +260,18 @@ $.fn.calendar = function(parameters) { rows = Math.ceil(requiredCells / 7); } - var yearChange = isYear ? 10 : isMonth ? 1 : 0; - var monthChange = isDay ? 1 : 0; - var dayChange = isHour || isMinute ? 1 : 0; - var prevNextDay = isHour || isMinute ? day : 1; - var prevDate = new Date(year - yearChange, month - monthChange, prevNextDay - dayChange, hour); - var nextDate = new Date(year + yearChange, month + monthChange, prevNextDay + dayChange, hour); - - var prevLast = isYear ? new Date(Math.ceil(year / 10) * 10 - 9, 0, 0) : - isMonth ? new Date(year, 0, 0) : isDay ? new Date(year, month, 0) : new Date(year, month, day, -1); - var nextFirst = isYear ? new Date(Math.ceil(year / 10) * 10 + 1, 0, 1) : - isMonth ? new Date(year + 1, 0, 1) : isDay ? new Date(year, month + 1, 1) : new Date(year, month, day + 1); + var + yearChange = isYear ? 10 : isMonth ? 1 : 0, + monthChange = isDay ? 1 : 0, + dayChange = isHour || isMinute ? 1 : 0, + prevNextDay = isHour || isMinute ? day : 1, + prevDate = new Date(year - yearChange, month - monthChange, prevNextDay - dayChange, hour), + nextDate = new Date(year + yearChange, month + monthChange, prevNextDay + dayChange, hour), + prevLast = isYear ? new Date(Math.ceil(year / 10) * 10 - 9, 0, 0) : + isMonth ? new Date(year, 0, 0) : isDay ? new Date(year, month, 0) : new Date(year, month, day, -1), + nextFirst = isYear ? new Date(Math.ceil(year / 10) * 10 + 1, 0, 1) : + isMonth ? new Date(year + 1, 0, 1) : isDay ? new Date(year, month + 1, 1) : new Date(year, month, day + 1) + ; var tempMode = mode; if (isDay && settings.showWeekNumbers){ @@ -440,7 +447,6 @@ $.fn.calendar = function(parameters) { $input.on('input' + eventNamespace, module.event.inputChange); $input.on('focus' + eventNamespace, module.event.inputFocus); $input.on('blur' + eventNamespace, module.event.inputBlur); - $input.on('click' + eventNamespace, module.event.inputClick); $input.on('keydown' + eventNamespace, module.event.keydown); } else { $container.on('keydown' + eventNamespace, module.event.keydown); @@ -569,9 +575,6 @@ $.fn.calendar = function(parameters) { var text = formatter.datetime(date, settings); $input.val(text); } - }, - inputClick: function () { - module.popup('show'); } }, @@ -796,10 +799,12 @@ $.fn.calendar = function(parameters) { var canceled = module.set.date(date) === false; if (!canceled && settings.closable) { module.popup('hide'); - //if this is a range calendar, show the end date calendar popup and focus the input + //if this is a range calendar, focus the container or input. This will open the popup from its event listeners. var endModule = module.get.calendarModule(settings.endCalendar); if (endModule) { - endModule.popup('show'); + if (endModule.setting('on') !== 'focus') { + endModule.popup('show'); + } endModule.focus(); } } @@ -809,7 +814,7 @@ $.fn.calendar = function(parameters) { module.set.mode(newMode); if (mode === 'hour' || (mode === 'day' && module.get.date())) { //the user has chosen enough to consider a valid date/time has been chosen - module.set.date(date); + module.set.date(date, true, false); } else { module.set.focusDate(date); } diff --git a/definitions/modules/dropdown.js b/definitions/modules/dropdown.js index a418a9b..8505d5d 100644 --- a/definitions/modules/dropdown.js +++ b/definitions/modules/dropdown.js @@ -117,7 +117,9 @@ $.fn.dropdown = function(parameters) { module.setup.layout(); if(settings.values) { + module.set.initialLoad(); module.change.values(settings.values); + module.remove.initialLoad(); } module.refreshData(); @@ -541,6 +543,7 @@ $.fn.dropdown = function(parameters) { } else if( module.can.click() ) { module.unbind.intent(); } + iconClicked = false; }, hideOthers: function() { @@ -1772,7 +1775,7 @@ $.fn.dropdown = function(parameters) { return $text.text(); }, query: function() { - return $.trim($search.val()); + return String($search.val()).trim(); }, searchWidth: function(value) { value = (value !== undefined) @@ -1915,8 +1918,8 @@ $.fn.dropdown = function(parameters) { return ($choice.data(metadata.text) !== undefined) ? $choice.data(metadata.text) : (preserveHTML) - ? $.trim($choice.html()) - : $.trim($choice.text()) + ? $choice.html().trim() + : $choice.text().trim() ; } }, @@ -1928,11 +1931,11 @@ $.fn.dropdown = function(parameters) { return ($choice.data(metadata.value) !== undefined) ? String( $choice.data(metadata.value) ) : (typeof choiceText === 'string') - ? $.trim( + ? String( settings.ignoreSearchCase ? choiceText.toLowerCase() : choiceText - ) + ).trim() : String(choiceText) ; }, diff --git a/definitions/modules/dropdown.less b/definitions/modules/dropdown.less index 24bd62f..34b2eb5 100644 --- a/definitions/modules/dropdown.less +++ b/definitions/modules/dropdown.less @@ -318,10 +318,9 @@ } /* Automatically float dropdown menu right on last menu item */ -.ui.menu .right.menu .dropdown:last-child .menu, -.ui.menu .right.dropdown.item .menu, -.ui.buttons > .ui.dropdown:last-child .menu { - left: auto; +.ui.menu .right.menu .dropdown:last-child .menu:not(.left), +.ui.menu .right.dropdown.item .menu:not(.left), +.ui.buttons > .ui.dropdown:last-child .menu:not(.left) { right: 0; } @@ -1097,7 +1096,7 @@ select.ui.dropdown { .ui.dropdown > .left.menu .menu, .ui.dropdown .menu .left.menu { - left: auto; + left: auto !important; right: 100%; margin: @leftSubMenuMargin !important; border-radius: @leftSubMenuBorderRadius !important; @@ -1318,12 +1317,12 @@ select.ui.dropdown { opacity: 1; } .ui.simple.dropdown > .menu > .item:active > .menu, - .ui.simple.dropdown:hover > .menu > .item:hover > .menu { + .ui.simple.dropdown .menu .item:hover > .menu { overflow: visible; width: auto; height: auto; top: 0 !important; - left: 100% !important; + left: 100%; opacity: 1; } & when (@variationDropdownDisabled) { diff --git a/definitions/modules/modal.less b/definitions/modules/modal.less index 65af5a0..f5684ce 100644 --- a/definitions/modules/modal.less +++ b/definitions/modules/modal.less @@ -175,7 +175,7 @@ border-top: @actionBorder; text-align: @actionAlign; } -.ui.modal .actions > .button { +.ui.modal .actions > .button:not(.fluid) { margin-left: @buttonDistance; } .ui.basic.modal > .actions { @@ -256,7 +256,7 @@ .ui.modal .image.content { flex-direction: column; } - .ui.modal .content > .image { + .ui.modal > .content > .image { display: block; max-width: 100%; margin: 0 auto !important; @@ -269,7 +269,7 @@ } /*rtl:ignore*/ - .ui.modal .content > .description { + .ui.modal > .content > .description { display: block; width: 100% !important; margin: 0 !important; diff --git a/definitions/modules/popup.js b/definitions/modules/popup.js index 81496c7..d6b70e1 100644 --- a/definitions/modules/popup.js +++ b/definitions/modules/popup.js @@ -510,9 +510,10 @@ $.fn.popup = function(parameters) { $popupOffsetParent = module.get.offsetParent($popup), targetElement = $target[0], isWindow = ($boundary[0] == window), - targetPosition = (settings.inline || (settings.popup && settings.movePopup)) - ? $target.position() - : $target.offset(), + targetOffset = $target.offset(), + parentOffset = settings.inline || (settings.popup && settings.movePopup) + ? $target.offsetParent().offset() + : { top: 0, left: 0 }, screenPosition = (isWindow) ? { top: 0, left: 0 } : $boundary.offset(), @@ -528,8 +529,8 @@ $.fn.popup = function(parameters) { element : $target[0], width : $target.outerWidth(), height : $target.outerHeight(), - top : targetPosition.top, - left : targetPosition.left, + top : targetOffset.top - parentOffset.top, + left : targetOffset.left - parentOffset.left, margin : {} }, // popup itself diff --git a/definitions/modules/progress.less b/definitions/modules/progress.less index a8dc7ea..e5300d3 100644 --- a/definitions/modules/progress.less +++ b/definitions/modules/progress.less @@ -185,40 +185,40 @@ } /* Single Digits */ - .ui.indicating.progress[data-percent="1"] .bar, - .ui.indicating.progress[data-percent="2"] .bar, - .ui.indicating.progress[data-percent="3"] .bar, - .ui.indicating.progress[data-percent="4"] .bar, - .ui.indicating.progress[data-percent="5"] .bar, - .ui.indicating.progress[data-percent="6"] .bar, - .ui.indicating.progress[data-percent="7"] .bar, - .ui.indicating.progress[data-percent="8"] .bar, - .ui.indicating.progress[data-percent="9"] .bar { + .ui.indicating.progress[data-percent="1"] .bar, .ui.indicating.progress[data-percent^="1."] .bar, + .ui.indicating.progress[data-percent="2"] .bar, .ui.indicating.progress[data-percent^="2."] .bar, + .ui.indicating.progress[data-percent="3"] .bar, .ui.indicating.progress[data-percent^="3."] .bar, + .ui.indicating.progress[data-percent="4"] .bar, .ui.indicating.progress[data-percent^="4."] .bar, + .ui.indicating.progress[data-percent="5"] .bar, .ui.indicating.progress[data-percent^="5."] .bar, + .ui.indicating.progress[data-percent="6"] .bar, .ui.indicating.progress[data-percent^="6."] .bar, + .ui.indicating.progress[data-percent="7"] .bar, .ui.indicating.progress[data-percent^="7."] .bar, + .ui.indicating.progress[data-percent="8"] .bar, .ui.indicating.progress[data-percent^="8."] .bar, + .ui.indicating.progress[data-percent="9"] .bar, .ui.indicating.progress[data-percent^="9."] .bar { background-color: @indicatingFirstColor; } - .ui.indicating.progress[data-percent="0"] .label, - .ui.indicating.progress[data-percent="1"] .label, - .ui.indicating.progress[data-percent="2"] .label, - .ui.indicating.progress[data-percent="3"] .label, - .ui.indicating.progress[data-percent="4"] .label, - .ui.indicating.progress[data-percent="5"] .label, - .ui.indicating.progress[data-percent="6"] .label, - .ui.indicating.progress[data-percent="7"] .label, - .ui.indicating.progress[data-percent="8"] .label, - .ui.indicating.progress[data-percent="9"] .label { + .ui.indicating.progress[data-percent="0"] .label, .ui.indicating.progress[data-percent^="0."] .label, + .ui.indicating.progress[data-percent="1"] .label, .ui.indicating.progress[data-percent^="1."] .label, + .ui.indicating.progress[data-percent="2"] .label, .ui.indicating.progress[data-percent^="2."] .label, + .ui.indicating.progress[data-percent="3"] .label, .ui.indicating.progress[data-percent^="3."] .label, + .ui.indicating.progress[data-percent="4"] .label, .ui.indicating.progress[data-percent^="4."] .label, + .ui.indicating.progress[data-percent="5"] .label, .ui.indicating.progress[data-percent^="5."] .label, + .ui.indicating.progress[data-percent="6"] .label, .ui.indicating.progress[data-percent^="6."] .label, + .ui.indicating.progress[data-percent="7"] .label, .ui.indicating.progress[data-percent^="7."] .label, + .ui.indicating.progress[data-percent="8"] .label, .ui.indicating.progress[data-percent^="8."] .label, + .ui.indicating.progress[data-percent="9"] .label, .ui.indicating.progress[data-percent^="9."] .label { color: @indicatingFirstLabelColor; } & when (@variationProgressInverted) { - .ui.inverted.indicating.progress[data-percent="0"] .label, - .ui.inverted.indicating.progress[data-percent="1"] .label, - .ui.inverted.indicating.progress[data-percent="2"] .label, - .ui.inverted.indicating.progress[data-percent="3"] .label, - .ui.inverted.indicating.progress[data-percent="4"] .label, - .ui.inverted.indicating.progress[data-percent="5"] .label, - .ui.inverted.indicating.progress[data-percent="6"] .label, - .ui.inverted.indicating.progress[data-percent="7"] .label, - .ui.inverted.indicating.progress[data-percent="8"] .label, - .ui.inverted.indicating.progress[data-percent="9"] .label { + .ui.inverted.indicating.progress[data-percent="0"] .label, .ui.inverted.indicating.progress[data-percent^="0."] .label, + .ui.inverted.indicating.progress[data-percent="1"] .label, .ui.inverted.indicating.progress[data-percent^="1."] .label, + .ui.inverted.indicating.progress[data-percent="2"] .label, .ui.inverted.indicating.progress[data-percent^="2."] .label, + .ui.inverted.indicating.progress[data-percent="3"] .label, .ui.inverted.indicating.progress[data-percent^="3."] .label, + .ui.inverted.indicating.progress[data-percent="4"] .label, .ui.inverted.indicating.progress[data-percent^="4."] .label, + .ui.inverted.indicating.progress[data-percent="5"] .label, .ui.inverted.indicating.progress[data-percent^="5."] .label, + .ui.inverted.indicating.progress[data-percent="6"] .label, .ui.inverted.indicating.progress[data-percent^="6."] .label, + .ui.inverted.indicating.progress[data-percent="7"] .label, .ui.inverted.indicating.progress[data-percent^="7."] .label, + .ui.inverted.indicating.progress[data-percent="8"] .label, .ui.inverted.indicating.progress[data-percent^="8."] .label, + .ui.inverted.indicating.progress[data-percent="9"] .label, .ui.inverted.indicating.progress[data-percent^="9."] .label { color: @invertedIndicatingFirstLabelColor; } } diff --git a/definitions/modules/search.js b/definitions/modules/search.js index 2ad78bd..db1a124 100644 --- a/definitions/modules/search.js +++ b/definitions/modules/search.js @@ -250,6 +250,25 @@ $.fn.search = function(parameters) { } } }, + ensureVisible: function ensureVisible($el) { + var elTop, elBottom, resultsScrollTop, resultsHeight; + + elTop = $el.position().top; + elBottom = elTop + $el.outerHeight(true); + + resultsScrollTop = $results.scrollTop(); + resultsHeight = $results.height() + parseInt($results.css('paddingTop'), 0) + + parseInt($results.css('paddingBottom'), 0); + + if (elTop < 0) { + $results.scrollTop(resultsScrollTop + elTop); + } + + else if (resultsHeight < elBottom) { + $results.scrollTop(resultsScrollTop + (elBottom - resultsHeight)); + } + }, handleKeyboard: function(event) { var // force selector refresh @@ -301,6 +320,7 @@ $.fn.search = function(parameters) { .closest($category) .addClass(className.active) ; + module.ensureVisible($result.eq(newIndex)); event.preventDefault(); } else if(keyCode == keys.downArrow) { @@ -319,6 +339,7 @@ $.fn.search = function(parameters) { .closest($category) .addClass(className.active) ; + module.ensureVisible($result.eq(newIndex)); event.preventDefault(); } } @@ -952,6 +973,12 @@ $.fn.search = function(parameters) { debug : settings.debug, verbose : settings.verbose, duration : settings.duration, + onShow : function() { + var $firstResult = $module.find(selector.result).eq(0); + if($firstResult.length > 0) { + module.ensureVisible($firstResult); + } + }, onComplete : function() { callback(); }, diff --git a/definitions/modules/search.less b/definitions/modules/search.less index 098e953..e099ea8 100644 --- a/definitions/modules/search.less +++ b/definitions/modules/search.less @@ -390,6 +390,121 @@ Variations *******************************/ +& when (@variationSearchScrolling), + (@variationSearchShort), + (@variationSearchLong) { + + /*------------------- + Scrolling + --------------------*/ + + .ui.scrolling.search > .results, + .ui.search.long > .results, + .ui.search.short > .results { + overflow-x: hidden; + overflow-y: auto; + backface-visibility: hidden; + -webkit-overflow-scrolling: touch; + } +} + + +& when (@variationSearchScrolling) { + @media only screen and (max-width : @largestMobileScreen) { + .ui.scrolling.search > .results { + max-height: @scrollingMobileMaxResultsHeight; + } + } + @media only screen and (min-width: @tabletBreakpoint) { + .ui.scrolling.search > .results { + max-height: @scrollingTabletMaxResultsHeight; + } + } + @media only screen and (min-width: @computerBreakpoint) { + .ui.scrolling.search > .results { + max-height: @scrollingComputerMaxResultsHeight; + } + } + @media only screen and (min-width: @widescreenMonitorBreakpoint) { + .ui.scrolling.search > .results { + max-height: @scrollingWidescreenMaxResultsHeight; + } + } +} + +@media only screen and (max-width : @largestMobileScreen) { + & when (@variationSearchShort) { + .ui.search.short > .results { + max-height: @scrollingMobileMaxResultsHeight; + } + .ui.search[class*="very short"] > .results { + max-height: @scrollingMobileMaxResultsHeight * 0.75; + } + } + & when (@variationSearchLong) { + .ui.search.long > .results { + max-height: @scrollingMobileMaxResultsHeight * 2; + } + .ui.search[class*="very long"] > .results { + max-height: @scrollingMobileMaxResultsHeight * 3; + } + } +} +@media only screen and (min-width: @tabletBreakpoint) { + & when (@variationSearchShort) { + .ui.search.short > .results { + max-height: @scrollingTabletMaxResultsHeight; + } + .ui.search[class*="very short"] > .results { + max-height: @scrollingTabletMaxResultsHeight * 0.75; + } + } + & when (@variationSearchLong) { + .ui.search.long > .results { + max-height: @scrollingTabletMaxResultsHeight * 2; + } + .ui.search[class*="very long"] > .results { + max-height: @scrollingTabletMaxResultsHeight * 3; + } + } +} +@media only screen and (min-width: @computerBreakpoint) { + & when (@variationSearchShort) { + .ui.search.short > .results { + max-height: @scrollingComputerMaxResultsHeight; + } + .ui.search[class*="very short"] > .results { + max-height: @scrollingComputerMaxResultsHeight * 0.75; + } + } + & when (@variationSearchLong) { + .ui.search.long > .results { + max-height: @scrollingComputerMaxResultsHeight * 2; + } + .ui.search[class*="very long"] > .results { + max-height: @scrollingComputerMaxResultsHeight * 3; + } + } +} +@media only screen and (min-width: @widescreenMonitorBreakpoint) { + & when (@variationSearchShort) { + .ui.search.short > .results { + max-height: @scrollingWidescreenMaxResultsHeight; + } + .ui.search[class*="very short"] > .results { + max-height: @scrollingWidescreenMaxResultsHeight * 0.75; + } + } + & when (@variationSearchLong) { + .ui.search.long > .results { + max-height: @scrollingWidescreenMaxResultsHeight * 2; + } + .ui.search[class*="very long"] > .results { + max-height: @scrollingWidescreenMaxResultsHeight * 3; + } + } +} + & when (@variationSearchAligned) { /*------------------- Left / Right diff --git a/definitions/modules/tab.js b/definitions/modules/tab.js index 252cf8c..eae3cfc 100644 --- a/definitions/modules/tab.js +++ b/definitions/modules/tab.js @@ -100,9 +100,9 @@ $.fn.tab = function(parameters) { initializedHistory = true; } - if(instance === undefined && module.determine.activeTab() == null) { + if(settings.autoTabActivation && instance === undefined && module.determine.activeTab() == null) { module.debug('No active tab detected, setting first tab active', module.get.initialPath()); - module.changeTab(module.get.initialPath()); + module.changeTab(settings.autoTabActivation === true ? module.get.initialPath() : settings.autoTabActivation); }; module.instantiate(); @@ -953,6 +953,7 @@ $.fn.tab.settings = { apiSettings : false, // settings for api call evaluateScripts : 'once', // whether inline scripts should be parsed (true/false/once). Once will not re-evaluate on cached content + autoTabActivation: true, // whether a non existing active tab will auto activate the first available tab onFirstLoad : function(tabPath, parameterArray, historyEvent) {}, // called first time loaded onLoad : function(tabPath, parameterArray, historyEvent) {}, // called on every load diff --git a/themes/default/assets/fonts/brand-icons.eot b/themes/default/assets/fonts/brand-icons.eot index baf4057..a1bc094 100644 Binary files a/themes/default/assets/fonts/brand-icons.eot and b/themes/default/assets/fonts/brand-icons.eot differ diff --git a/themes/default/assets/fonts/brand-icons.svg b/themes/default/assets/fonts/brand-icons.svg index 843c1c7..46ad237 100644 --- a/themes/default/assets/fonts/brand-icons.svg +++ b/themes/default/assets/fonts/brand-icons.svg @@ -1,12 +1,12 @@ -Created by FontForge 20190801 at Tue Dec 10 16:09:21 2019 +Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 By Robert Madole Copyright (c) Font Awesome @@ -23,7 +23,7 @@ Copyright (c) Font Awesome bbox="-0.200195 -66.9505 641.5 448.3" underline-thickness="25" underline-position="-50" - unicode-range="U+0020-F949" + unicode-range="U+0020-F957" /> +d="M481.92 313.52c6.46973 -12.7793 22.4697 -41.6494 21.9697 -85.0791c-0.0791016 -37.5908 -26.4893 -83.4844 -58.9492 -102.44c-14.957 -8.88379 -41.2148 -16.1318 -58.6104 -16.1797c-0.139648 0 -52.6504 -2.56055 -80.5098 16.8096 +c-5.85059 4.08008 -9.14062 8.94043 -9.14062 14c0 6.16016 4.82031 9 6.39062 11c9.7998 12.75 15.1094 28.1699 15.1094 38.5703c0 32.71 -11 59.2998 -33 83.0996c-1.16016 1.25 -42.9795 50.1807 -122.25 50.1807c-63.2393 0 -123.46 -32.6504 -149.46 -79.1406 +c24.04 111.98 123.58 195.66 242.44 195.66c96.3496 0 184.96 -46.1797 226.01 -126.48zM212.77 -27.6699c1.28027 -0.570312 29.0107 -20.5898 67.1309 -27.21c-6.53809 -0.628906 -17.1748 -1.13965 -23.7422 -1.13965c-87.0234 0 -187.626 63.9521 -224.559 142.75 +c-25.75 55.4697 -24.0801 105.96 -23 118.27c4.16992 34.2803 27.0801 59.7002 46.8408 74.7998c29.6299 22.6904 68.8193 35.6904 107.529 35.6904c7.0498 0 43.9199 -0.900391 77.6406 -18.5898c32.5596 -17.1006 47.3193 -37.5801 56.5596 -53.5107 +c1.54688 -2.70312 3.73828 -7.24609 4.88965 -10.1396c-4.21973 4.65039 -40.0596 44.2002 -99.0596 -1c-22.9014 -16.6006 -48.4238 -51.957 -56.9697 -78.9199c-14.1406 -40.4004 -12.8398 -88.5801 20.0996 -136c10.2158 -15.1748 31.1104 -35.334 46.6396 -45z +M463.49 70.6602c1.99316 -1.25879 3.6123 -4.19531 3.6123 -6.55273c0 -1.25195 -0.547852 -3.12305 -1.22266 -4.17773c-47.5703 -75.4297 -127.86 -108.87 -163 -108.87c-22.7002 0 -48.1299 6.95996 -71.7002 19.6104c-33 17.6699 -49.4893 38.7598 -56 47.6699 +c-46.3301 63.5303 -28.25 122.29 -13.3301 151.66c8.06445 15.8418 25.4287 38.2422 38.7607 50c-3.50684 -6.9668 -6.42773 -18.9512 -6.52051 -26.75c0 -80.9404 79.8506 -144 171.521 -144h0.341797c19.7266 0 50.7314 5.6084 69.208 12.5195 +c5.78809 2.16992 14.9316 6.25586 20.4102 9.12012c0.969727 0.539062 2.65723 0.975586 3.76562 0.975586c1.24316 0 3.10449 -0.540039 4.1543 -1.20508z" /> + + + + diff --git a/themes/default/assets/fonts/brand-icons.ttf b/themes/default/assets/fonts/brand-icons.ttf index 9916328..948a2a6 100644 Binary files a/themes/default/assets/fonts/brand-icons.ttf and b/themes/default/assets/fonts/brand-icons.ttf differ diff --git a/themes/default/assets/fonts/brand-icons.woff b/themes/default/assets/fonts/brand-icons.woff index f9e3bcd..2a89d52 100644 Binary files a/themes/default/assets/fonts/brand-icons.woff and b/themes/default/assets/fonts/brand-icons.woff differ diff --git a/themes/default/assets/fonts/brand-icons.woff2 b/themes/default/assets/fonts/brand-icons.woff2 index 51c07ae..141a90a 100644 Binary files a/themes/default/assets/fonts/brand-icons.woff2 and b/themes/default/assets/fonts/brand-icons.woff2 differ diff --git a/themes/default/assets/fonts/icons.eot b/themes/default/assets/fonts/icons.eot index 39716a7..d3b77c2 100644 Binary files a/themes/default/assets/fonts/icons.eot and b/themes/default/assets/fonts/icons.eot differ diff --git a/themes/default/assets/fonts/icons.svg b/themes/default/assets/fonts/icons.svg index cfd0e2f..7742838 100644 --- a/themes/default/assets/fonts/icons.svg +++ b/themes/default/assets/fonts/icons.svg @@ -1,12 +1,12 @@ -Created by FontForge 20190801 at Tue Dec 10 16:09:21 2019 +Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 By Robert Madole Copyright (c) Font Awesome @@ -23,7 +23,7 @@ Copyright (c) Font Awesome bbox="-0.983398 -64.9834 640.104 448.427" underline-thickness="25" underline-position="-50" - unicode-range="U+0020-F941" + unicode-range="U+0020-F976" /> +d="M256 440c137 0 248 -111 248 -248s-111 -248 -248 -248s-248 111 -248 248s111 248 248 248zM348.49 127c1.94043 2.4209 3.51465 6.90332 3.51465 10.0059c0 4.24512 -2.69043 9.84277 -6.00488 12.4941l-58 42.5v144c0 8.83203 -7.16797 16 -16 16h-32 +c-8.83203 0 -16 -7.16797 -16 -16v-155.55v-0.00488281c0 -10.6074 6.71973 -24.5957 15 -31.2256l67 -49.7197v0c2.41895 -1.93555 6.89746 -3.50586 9.99512 -3.50586c4.24512 0 9.84277 2.69043 12.4951 6.00586l20 25v0z" /> + + +d="M464 320c26.4961 0 48 -21.5039 48 -48v-224c0 -26.4961 -21.5039 -48 -48 -48h-416c-26.4961 0 -48 21.5039 -48 48v288c0 26.4961 21.5039 48 48 48h160l64 -64h192zM359.5 152v16c0 8.83203 -7.16797 16 -16 16h-64v64c0 8.83203 -7.16797 16 -16 16h-16 +c-8.83203 0 -16 -7.16797 -16 -16v-64h-64c-8.83203 0 -16 -7.16797 -16 -16v-16c0 -8.83203 7.16797 -16 16 -16h64v-64c0 -8.83203 7.16797 -16 16 -16h16c8.83203 0 16 7.16797 16 16v64h64c8.83203 0 16 7.16797 16 16z" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/default/assets/fonts/icons.ttf b/themes/default/assets/fonts/icons.ttf index ac4baa2..5b97903 100644 Binary files a/themes/default/assets/fonts/icons.ttf and b/themes/default/assets/fonts/icons.ttf differ diff --git a/themes/default/assets/fonts/icons.woff b/themes/default/assets/fonts/icons.woff index 23002f8..beec791 100644 Binary files a/themes/default/assets/fonts/icons.woff and b/themes/default/assets/fonts/icons.woff differ diff --git a/themes/default/assets/fonts/icons.woff2 b/themes/default/assets/fonts/icons.woff2 index b37f209..978a681 100644 Binary files a/themes/default/assets/fonts/icons.woff2 and b/themes/default/assets/fonts/icons.woff2 differ diff --git a/themes/default/assets/fonts/outline-icons.eot b/themes/default/assets/fonts/outline-icons.eot index 04e25cb..38cf251 100644 Binary files a/themes/default/assets/fonts/outline-icons.eot and b/themes/default/assets/fonts/outline-icons.eot differ diff --git a/themes/default/assets/fonts/outline-icons.svg b/themes/default/assets/fonts/outline-icons.svg index f1f7e6c..48634a9 100644 --- a/themes/default/assets/fonts/outline-icons.svg +++ b/themes/default/assets/fonts/outline-icons.svg @@ -1,12 +1,12 @@ -Created by FontForge 20190801 at Tue Dec 10 16:09:21 2019 +Created by FontForge 20190801 at Mon Mar 23 10:45:51 2020 By Robert Madole Copyright (c) Font Awesome diff --git a/themes/default/assets/fonts/outline-icons.ttf b/themes/default/assets/fonts/outline-icons.ttf index 9c6249c..abe99e2 100644 Binary files a/themes/default/assets/fonts/outline-icons.ttf and b/themes/default/assets/fonts/outline-icons.ttf differ diff --git a/themes/default/assets/fonts/outline-icons.woff b/themes/default/assets/fonts/outline-icons.woff index 2873e43..24de566 100644 Binary files a/themes/default/assets/fonts/outline-icons.woff and b/themes/default/assets/fonts/outline-icons.woff differ diff --git a/themes/default/assets/fonts/outline-icons.woff2 b/themes/default/assets/fonts/outline-icons.woff2 index a34bd65..7e0118e 100644 Binary files a/themes/default/assets/fonts/outline-icons.woff2 and b/themes/default/assets/fonts/outline-icons.woff2 differ diff --git a/themes/default/elements/button.variables b/themes/default/elements/button.variables index 76694bf..4853547 100644 --- a/themes/default/elements/button.variables +++ b/themes/default/elements/button.variables @@ -49,7 +49,7 @@ @iconDistance: @relative6px; @iconColor: ''; @iconTransition: opacity @defaultDuration @defaultEasing; -@iconVerticalAlign: ''; +@iconVerticalAlign: baseline; @iconMargin: 0 @iconDistance 0 -(@iconDistance / 2); @rightIconMargin: 0 -(@iconDistance / 2) 0 @iconDistance; diff --git a/themes/default/elements/divider.variables b/themes/default/elements/divider.variables index 78341c0..a9426fa 100644 --- a/themes/default/elements/divider.variables +++ b/themes/default/elements/divider.variables @@ -7,6 +7,7 @@ --------------------*/ @margin: 1rem 0; +@borderStyle: solid; @highlightWidth: 1px; @highlightColor: @whiteBorderColor; diff --git a/themes/default/elements/icon.overrides b/themes/default/elements/icon.overrides index 67c7582..72fc406 100644 --- a/themes/default/elements/icon.overrides +++ b/themes/default/elements/icon.overrides @@ -1,5 +1,5 @@ /* -* Font Awesome 5.12.0 by @fontawesome [https://fontawesome.com] +* Font Awesome 5.13.0 by @fontawesome [https://fontawesome.com] * License - https://fontawesome.com/license (Icons: CC BY 4.0 License, Fonts: SIL OFL 1.1 License, CSS: MIT License) */ @@ -147,6 +147,7 @@ i.icon.border.style:before { content: "\f853"; } i.icon.bowling.ball:before { content: "\f436"; } i.icon.box:before { content: "\f466"; } i.icon.box.open:before { content: "\f49e"; } +i.icon.box.tissue:before { content: "\f95b"; } i.icon.boxes:before { content: "\f468"; } i.icon.braille:before { content: "\f2a1"; } i.icon.brain:before { content: "\f5dc"; } @@ -305,6 +306,7 @@ i.icon.dice.three:before { content: "\f527"; } i.icon.dice.two:before { content: "\f528"; } i.icon.digital.tachograph:before { content: "\f566"; } i.icon.directions:before { content: "\f5eb"; } +i.icon.disease:before { content: "\f7fa"; } i.icon.divide:before { content: "\f529"; } i.icon.dizzy:before { content: "\f567"; } i.icon.dna:before { content: "\f471"; } @@ -356,6 +358,7 @@ i.icon.eye.slash:before { content: "\f070"; } i.icon.fan:before { content: "\f863"; } i.icon.fast.backward:before { content: "\f049"; } i.icon.fast.forward:before { content: "\f050"; } +i.icon.faucet:before { content: "\f905"; } i.icon.fax:before { content: "\f1ac"; } i.icon.feather:before { content: "\f52d"; } i.icon.feather.alternate:before { content: "\f56b"; } @@ -461,7 +464,9 @@ i.icon.hammer:before { content: "\f6e3"; } i.icon.hamsa:before { content: "\f665"; } i.icon.hand.holding:before { content: "\f4bd"; } i.icon.hand.holding.heart:before { content: "\f4be"; } +i.icon.hand.holding.medical:before { content: "\f95c"; } i.icon.hand.holding.usd:before { content: "\f4c0"; } +i.icon.hand.holding.water:before { content: "\f4c1"; } i.icon.hand.lizard:before { content: "\f258"; } i.icon.hand.middle.finger:before { content: "\f806"; } i.icon.hand.paper:before { content: "\f256"; } @@ -473,10 +478,14 @@ i.icon.hand.point.up:before { content: "\f0a6"; } i.icon.hand.pointer:before { content: "\f25a"; } i.icon.hand.rock:before { content: "\f255"; } i.icon.hand.scissors:before { content: "\f257"; } +i.icon.hand.sparkles:before { content: "\f95d"; } i.icon.hand.spock:before { content: "\f259"; } i.icon.hands:before { content: "\f4c2"; } i.icon.hands.helping:before { content: "\f4c4"; } +i.icon.hands.wash:before { content: "\f95e"; } i.icon.handshake:before { content: "\f2b5"; } +i.icon.handshake.alternate.slash:before { content: "\f95f"; } +i.icon.handshake.slash:before { content: "\f960"; } i.icon.hanukiah:before { content: "\f6e6"; } i.icon.hard.hat:before { content: "\f807"; } i.icon.hashtag:before { content: "\f292"; } @@ -484,6 +493,10 @@ i.icon.hat.cowboy:before { content: "\f8c0"; } i.icon.hat.cowboy.side:before { content: "\f8c1"; } i.icon.hat.wizard:before { content: "\f6e8"; } i.icon.hdd:before { content: "\f0a0"; } +i.icon.head.side.cough:before { content: "\f961"; } +i.icon.head.side.cough.slash:before { content: "\f962"; } +i.icon.head.side.mask:before { content: "\f963"; } +i.icon.head.side.virus:before { content: "\f964"; } i.icon.heading:before { content: "\f1dc"; } i.icon.headphones:before { content: "\f025"; } i.icon.headphones.alternate:before { content: "\f58f"; } @@ -504,6 +517,7 @@ i.icon.horse.head:before { content: "\f7ab"; } i.icon.hospital:before { content: "\f0f8"; } i.icon.hospital.alternate:before { content: "\f47d"; } i.icon.hospital.symbol:before { content: "\f47e"; } +i.icon.hospital.user:before { content: "\f80d"; } i.icon.hot.tub:before { content: "\f593"; } i.icon.hotdog:before { content: "\f80f"; } i.icon.hotel:before { content: "\f594"; } @@ -512,6 +526,7 @@ i.icon.hourglass.end:before { content: "\f253"; } i.icon.hourglass.half:before { content: "\f252"; } i.icon.hourglass.start:before { content: "\f251"; } i.icon.house.damage:before { content: "\f6f1"; } +i.icon.house.user:before { content: "\f965"; } i.icon.hryvnia:before { content: "\f6f2"; } i.icon.i.cursor:before { content: "\f246"; } i.icon.ice.cream:before { content: "\f810"; } @@ -545,6 +560,7 @@ i.icon.landmark:before { content: "\f66f"; } i.icon.language:before { content: "\f1ab"; } i.icon.laptop:before { content: "\f109"; } i.icon.laptop.code:before { content: "\f5fc"; } +i.icon.laptop.house:before { content: "\f966"; } i.icon.laptop.medical:before { content: "\f812"; } i.icon.laugh:before { content: "\f599"; } i.icon.laugh.beam:before { content: "\f59a"; } @@ -574,6 +590,8 @@ i.icon.long.arrow.alternate.right:before { content: "\f30b"; } i.icon.long.arrow.alternate.up:before { content: "\f30c"; } i.icon.low.vision:before { content: "\f2a8"; } i.icon.luggage.cart:before { content: "\f59d"; } +i.icon.lungs:before { content: "\f604"; } +i.icon.lungs.virus:before { content: "\f967"; } i.icon.magic:before { content: "\f0d0"; } i.icon.magnet:before { content: "\f076"; } i.icon.mail.bulk:before { content: "\f674"; } @@ -664,6 +682,7 @@ i.icon.pen.nib:before { content: "\f5ad"; } i.icon.pen.square:before { content: "\f14b"; } i.icon.pencil.alternate:before { content: "\f303"; } i.icon.pencil.ruler:before { content: "\f5ae"; } +i.icon.people.arrows:before { content: "\f968"; } i.icon.people.carry:before { content: "\f4ce"; } i.icon.pepper.hot:before { content: "\f816"; } i.icon.percent:before { content: "\f295"; } @@ -683,6 +702,7 @@ i.icon.place.of.worship:before { content: "\f67f"; } i.icon.plane:before { content: "\f072"; } i.icon.plane.arrival:before { content: "\f5af"; } i.icon.plane.departure:before { content: "\f5b0"; } +i.icon.plane.slash:before { content: "\f969"; } i.icon.play:before { content: "\f04b"; } i.icon.play.circle:before { content: "\f144"; } i.icon.plug:before { content: "\f1e6"; } @@ -706,6 +726,8 @@ i.icon.prescription.bottle.alternate:before { content: "\f486"; } i.icon.print:before { content: "\f02f"; } i.icon.procedures:before { content: "\f487"; } i.icon.project.diagram:before { content: "\f542"; } +i.icon.pump.medical:before { content: "\f96a"; } +i.icon.pump.soap:before { content: "\f96b"; } i.icon.puzzle.piece:before { content: "\f12e"; } i.icon.qrcode:before { content: "\f029"; } i.icon.question:before { content: "\f128"; } @@ -768,6 +790,7 @@ i.icon.share.alternate.square:before { content: "\f1e1"; } i.icon.share.square:before { content: "\f14d"; } i.icon.shekel.sign:before { content: "\f20b"; } i.icon.shield.alternate:before { content: "\f3ed"; } +i.icon.shield.virus:before { content: "\f96c"; } i.icon.ship:before { content: "\f21a"; } i.icon.shipping.fast:before { content: "\f48b"; } i.icon.shoe.prints:before { content: "\f54b"; } @@ -803,6 +826,7 @@ i.icon.snowboarding:before { content: "\f7ce"; } i.icon.snowflake:before { content: "\f2dc"; } i.icon.snowman:before { content: "\f7d0"; } i.icon.snowplow:before { content: "\f7d2"; } +i.icon.soap:before { content: "\f96e"; } i.icon.socks:before { content: "\f696"; } i.icon.solar.panel:before { content: "\f5ba"; } i.icon.sort:before { content: "\f0dc"; } @@ -844,8 +868,11 @@ i.icon.sticky.note:before { content: "\f249"; } i.icon.stop:before { content: "\f04d"; } i.icon.stop.circle:before { content: "\f28d"; } i.icon.stopwatch:before { content: "\f2f2"; } +i.icon.stopwatch.20:before { content: "\f96f"; } i.icon.store:before { content: "\f54e"; } i.icon.store.alternate:before { content: "\f54f"; } +i.icon.store.alternate.slash:before { content: "\f970"; } +i.icon.store.slash:before { content: "\f971"; } i.icon.stream:before { content: "\f550"; } i.icon.street.view:before { content: "\f21d"; } i.icon.strikethrough:before { content: "\f0cc"; } @@ -906,6 +933,7 @@ i.icon.toggle.off:before { content: "\f204"; } i.icon.toggle.on:before { content: "\f205"; } i.icon.toilet:before { content: "\f7d8"; } i.icon.toilet.paper:before { content: "\f71e"; } +i.icon.toilet.paper.slash:before { content: "\f972"; } i.icon.toolbox:before { content: "\f552"; } i.icon.tools:before { content: "\f7d9"; } i.icon.tooth:before { content: "\f5c9"; } @@ -981,6 +1009,9 @@ i.icon.vials:before { content: "\f493"; } i.icon.video:before { content: "\f03d"; } i.icon.video.slash:before { content: "\f4e2"; } i.icon.vihara:before { content: "\f6a7"; } +i.icon.virus:before { content: "\f974"; } +i.icon.virus.slash:before { content: "\f975"; } +i.icon.viruses:before { content: "\f976"; } i.icon.voicemail:before { content: "\f897"; } i.icon.volleyball.ball:before { content: "\f45f"; } i.icon.volume.down:before { content: "\f027"; } @@ -1599,6 +1630,7 @@ i.icon.zoom.out:before { content: "\f010"; } i.icon.cuttlefish:before { content: "\f38c"; font-family: @brandFontName; } i.icon.d.and.d:before { content: "\f38d"; font-family: @brandFontName; } i.icon.d.and.d.beyond:before { content: "\f6ca"; font-family: @brandFontName; } + i.icon.dailymotion:before { content: "\f952"; font-family: @brandFontName; } i.icon.dashcube:before { content: "\f210"; font-family: @brandFontName; } i.icon.delicious:before { content: "\f1a5"; font-family: @brandFontName; } i.icon.deploydog:before { content: "\f38e"; font-family: @brandFontName; } @@ -1705,6 +1737,7 @@ i.icon.zoom.out:before { content: "\f010"; } i.icon.ideal:before { content: "\f913"; font-family: @brandFontName; } i.icon.imdb:before { content: "\f2d8"; font-family: @brandFontName; } i.icon.instagram:before { content: "\f16d"; font-family: @brandFontName; } + i.icon.instagram.square:before { content: "\f955"; font-family: @brandFontName; } i.icon.intercom:before { content: "\f7af"; font-family: @brandFontName; } i.icon.internet.explorer:before { content: "\f26b"; font-family: @brandFontName; } i.icon.invision:before { content: "\f7b0"; font-family: @brandFontName; } @@ -1756,6 +1789,7 @@ i.icon.zoom.out:before { content: "\f010"; } i.icon.microsoft:before { content: "\f3ca"; font-family: @brandFontName; } i.icon.mix:before { content: "\f3cb"; font-family: @brandFontName; } i.icon.mixcloud:before { content: "\f289"; font-family: @brandFontName; } + i.icon.mixer:before { content: "\f956"; font-family: @brandFontName; } i.icon.mizuni:before { content: "\f3cc"; font-family: @brandFontName; } i.icon.modx:before { content: "\f285"; font-family: @brandFontName; } i.icon.monero:before { content: "\f3d0"; font-family: @brandFontName; } @@ -1832,6 +1866,7 @@ i.icon.zoom.out:before { content: "\f010"; } i.icon.sellsy:before { content: "\f213"; font-family: @brandFontName; } i.icon.servicestack:before { content: "\f3ec"; font-family: @brandFontName; } i.icon.shirtsinbulk:before { content: "\f214"; font-family: @brandFontName; } + i.icon.shopify:before { content: "\f957"; font-family: @brandFontName; } i.icon.shopware:before { content: "\f5b5"; font-family: @brandFontName; } i.icon.simplybuilt:before { content: "\f215"; font-family: @brandFontName; } i.icon.sistrix:before { content: "\f3ee"; font-family: @brandFontName; } diff --git a/themes/default/elements/step.variables b/themes/default/elements/step.variables index ef0de7d..83205d2 100644 --- a/themes/default/elements/step.variables +++ b/themes/default/elements/step.variables @@ -81,6 +81,9 @@ @verticalDivider: @divider; @verticalArrowTopOffset: 50%; @verticalArrowRightOffset: 0; +@verticalLeftArrowLeftOffset: 0; +@verticalLeftArrowRightOffset: 100%; +@verticalLeftArrowBorderWidth: @borderWidth 0 0 @borderWidth; @verticalArrowBorderWidth: 0 @borderWidth @borderWidth 0; @verticalArrowDisplay: none; diff --git a/themes/default/globals/variation.variables b/themes/default/globals/variation.variables index 3eb710a..1146e22 100644 --- a/themes/default/globals/variation.variables +++ b/themes/default/globals/variation.variables @@ -473,6 +473,9 @@ @variationSearchLoading: true; @variationSearchAligned: true; @variationSearchFluid: true; +@variationSearchShort: true; +@variationSearchLong: true; +@variationSearchScrolling: true; @variationSearchSizes: @variationAllSizes; /* Shape */ diff --git a/themes/default/modules/search.variables b/themes/default/modules/search.variables index 288c54f..d22803e 100644 --- a/themes/default/modules/search.variables +++ b/themes/default/modules/search.variables @@ -56,6 +56,18 @@ @resultTitleFontSize: @relativeMedium; @resultTitleColor: @darkTextColor; +/* Result Scrolling */ +@scrollingMobileMaxResults: 4; +@scrollingTabletMaxResults: 6; +@scrollingComputerMaxResults: 8; +@scrollingWidescreenMaxResults: 12; + +@scrollingResultHeight: (@resultVerticalPadding * 2) + @resultLineHeight; +@scrollingMobileMaxResultsHeight: (@scrollingResultHeight * @scrollingMobileMaxResults); +@scrollingTabletMaxResultsHeight: (@scrollingResultHeight * @scrollingTabletMaxResults); +@scrollingComputerMaxResultsHeight: (@scrollingResultHeight * @scrollingComputerMaxResults); +@scrollingWidescreenMaxResultsHeight: (@scrollingResultHeight * @scrollingWidescreenMaxResults); + /* Description */ @resultDescriptionFontSize: @relativeSmall; @resultDescriptionDistance: 0;