Skip to content

Commit

Permalink
Merge branch 'refs/heads/develop' into dropdownDataObjectValues
Browse files Browse the repository at this point in the history
  • Loading branch information
lubber-de committed Jun 11, 2024
2 parents 72316b4 + c48cd9d commit 378a9f4
Show file tree
Hide file tree
Showing 45 changed files with 1,644 additions and 2,286 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These are supported funding model platforms

github: [y0hami, lubber-de]
github: [lubber-de]
14 changes: 14 additions & 0 deletions .github/workflows/depsreview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: 'Dependency Review'
on: [pull_request]

permissions:
contents: read

jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4
- name: 'Dependency Review'
uses: actions/dependency-review-action@v4
14 changes: 2 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ Fomantic includes an interactive installer to help setup your project.

| Environment | Install Command | Repository | Third-Party |
|-------------|---------------------------------------|------------------------------------------------------------------|-------------|
| CSS Only | `npm install fomantic-ui-css` | [Fomantic-UI-CSS](https://github.com/fomantic/Fomantic-UI-CSS) | |
| LESS | `npm install fomantic-ui-less` | [Fomantic-UI-LESS](https://github.com/fomantic/Fomantic-UI-LESS) | |
| CSS Only | `npm install fomantic-ui-css` | [Fomantic-UI-CSS](https://github.com/fomantic/Fomantic-UI-CSS) | |
| LESS | `npm install fomantic-ui-less` | [Fomantic-UI-LESS](https://github.com/fomantic/Fomantic-UI-LESS) | |
| SASS | `gem 'fomantic-ui-sass'` | [Fomantic-UI-SASS](https://github.com/fomantic/Fomantic-UI-SASS) ||

---
Expand All @@ -94,20 +94,10 @@ Before creating a pull request be sure to read the [Contributing Guide](CONTRIBU

## Sponsors

### Infrastructure hosted and powered by [DigitalOcean](https://www.digitalocean.com/?utm_medium=opensource&utm_source=fomantic)
[![DigitalOcean](https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PNG/DO_Logo_Horizontal_Blue.png)](https://www.digitalocean.com/?utm_medium=opensource&utm_source=fomantic)

Sign up now and get $100 in credit for 60 days! [Sign up here!](https://m.do.co/c/bece3e1afb7f)


### Cross-browser testing provided by [BrowserStack](https://www.browserstack.com)
[![BrowserStack](https://cdn.rawgit.com/fomantic/Fomantic-UI-Docs/35180e95/server/raw/images/browserstack.png)](https://www.browserstack.com)


### IDE's provided by [JetBrains](https://www.jetbrains.com?from=Fomantic-UI)
[![JetBrains](https://fomantic-ui.com/images/jetbrains.svg)](https://www.jetbrains.com?from=Fomantic-UI)

---

#### Credit
Semantic-UI was beautifully crafted by [@jlukic](https://github.com/jlukic)
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,26 @@
"@actions/core": "^1.6.0",
"@octokit/core": "^3.6.0",
"@octokit/rest": "^18.12.0",
"better-console": "^1.0.1",
"@fomantic/better-console": "^1.0.2",
"browserslist": "^4.21.4",
"del": "^6.1.1",
"extend": "^3.0.2",
"gulp": "^4.0.0",
"gulp": "^5.0.0",
"gulp-autoprefixer": "^8.0.0",
"gulp-chmod": "^2.0.0",
"gulp-chmod": "^3.0.0",
"gulp-clean-css": "^4.3.0",
"gulp-clone": "^2.0.1",
"gulp-concat": "^2.6.1",
"gulp-concat-css": "^3.1.0",
"gulp-concat-filenames": "^1.2.0",
"gulp-copy": "^4.0.0",
"gulp-dedupe": "^0.0.2",
"@fomantic/gulp-concat-css": "^3.2.1",
"@fomantic/gulp-concat-filenames": "^1.2.1",
"@fomantic/gulp-dedupe": "^0.0.3",
"gulp-flatten": "^0.4.0",
"gulp-git": "^2.9.0",
"gulp-header": "^2.0.5",
"gulp-if": "^2.0.2",
"@fomantic/gulp-git": "^2.11.1",
"@fomantic/gulp-header": "^2.1.1",
"gulp-if": "^3.0.0",
"gulp-json-editor": "^2.4.3",
"gulp-less": "^5.0.0",
"gulp-plumber": "^1.1.0",
"@fomantic/gulp-plumber": "^1.2.2",
"gulp-print": "^5.0.0",
"gulp-rename": "^1.4.0",
"gulp-replace": "^1.0.0",
Expand All @@ -68,6 +67,7 @@
"merge-stream": "^2.0.0",
"mkdirp": "^1.0.4",
"normalize-path": "^3.0.0",
"ordered-read-streams": "^1.0.1",
"replace-ext": "^1.0.0",
"require-dot-file": "^0.4.0",
"wrench-sui": "^0.0.3",
Expand Down
9 changes: 5 additions & 4 deletions src/definitions/behaviors/form.js
Original file line number Diff line number Diff line change
Expand Up @@ -1350,12 +1350,13 @@
var
identifier = field.identifier || fieldName,
$field = module.get.field(identifier),
$fieldGroup = $field.closest($group),
$dependsField = field.depends
? module.get.field(field.depends)
: false,
fieldValid = true,
fieldErrors = [],
isDisabled = $field.filter(':not(:disabled)').length === 0,
isDisabled = $field.filter(':not(:disabled)').length === 0 || $fieldGroup.hasClass(className.disabled) || $fieldGroup.parent().hasClass(className.disabled),
validationMessage = $field[0].validationMessage,
noNativeValidation = field.noNativeValidation || settings.noNativeValidation || $field.filter('[formnovalidate],[novalidate]').length > 0 || $module.filter('[novalidate]').length > 0,
errorLimit
Expand All @@ -1364,15 +1365,15 @@
module.debug('Using field name as identifier', identifier);
field.identifier = identifier;
}
if (validationMessage && !noNativeValidation) {
if (validationMessage && !noNativeValidation && !isDisabled) {
module.debug('Field is natively invalid', identifier);
fieldErrors.push(validationMessage);
fieldValid = false;
if (showErrors) {
$field.closest($group).addClass(className.error);
$fieldGroup.addClass(className.error);
}
} else if (showErrors) {
$field.closest($group).removeClass(className.error);
$fieldGroup.removeClass(className.error);
}
if (isDisabled) {
module.debug('Field is disabled. Skipping', identifier);
Expand Down
2 changes: 2 additions & 0 deletions src/definitions/collections/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -653,13 +653,15 @@
}

/* Placeholder */
.ui.form .@{state} .ui.dropdown > .default.text,
.ui.form .@{state} ::placeholder {
color: @formStates[@@state][inputPlaceholderColor];
}
.ui.form .@{state} :-ms-input-placeholder when (@supportIE) {
color: @formStates[@@state][inputPlaceholderColor] !important;
}

.ui.form .@{state} .ui.dropdown > input:focus ~ .default.text,
.ui.form .@{state} :focus::placeholder {
color: @formStates[@@state][inputPlaceholderFocusColor];
}
Expand Down
1 change: 1 addition & 0 deletions src/definitions/collections/message.less
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@

.ui.compact.message {
display: inline-block;
max-width: 100%;
}
.ui.compact.icon.message {
display: inline-flex;
Expand Down
111 changes: 63 additions & 48 deletions src/definitions/collections/table.less
Original file line number Diff line number Diff line change
Expand Up @@ -458,13 +458,21 @@
display: block;
overflow-y: scroll;
overscroll-behavior: @overscrollBehavior;
scrollbar-width: thin; /* Firefox */
& > tr {
display: table;
table-layout: fixed;
width: 100%;
}
}
& when (@useCustomScrollbars) {
@supports (-moz-appearance: none) {
.ui.scrolling.table > thead,
.ui.scrolling.table > tfoot,
.ui.scrolling.table > tbody {
scrollbar-width: thin;
}
}
}

/* Camouflage scrollbars, we need them only to gain the same width as tbody */
.ui.scrolling.table > thead {
Expand Down Expand Up @@ -492,61 +500,68 @@
background: inherit;
border-radius: @borderRadius;
}

/* Firefox & IE */
.ui.scrolling.table > thead,
.ui.scrolling.table > tfoot {
scrollbar-color: currentColor currentColor;
& when (@supportIE) {
scrollbar-face-color: currentColor;
scrollbar-shadow-color: currentColor;
scrollbar-track-color: currentColor;
scrollbar-arrow-color: currentColor;
}
}
& when (@supportIE) {
/* IE scrollbar color needs hex values */
@media all and (-ms-high-contrast: none) {
.ui.scrolling.table > thead {
color: @headerBackgroundHex;
}
& when (@useCustomScrollbars) {
@supports (-moz-appearance: none) {
.ui.scrolling.table > thead,
.ui.scrolling.table > tfoot {
color: @footerBackgroundHex;
scrollbar-color: currentColor currentColor;
}
& when (@variationTableInverted) {
.ui.inverted.scrolling.table > thead {
color: @invertedHeaderBackgroundHex;
}

& when (@supportIE) {
/* IE scrollbar color needs hex values */
@media all and (-ms-high-contrast: none) {
.ui.scrolling.table > thead,
.ui.scrolling.table > tfoot {
scrollbar-face-color: currentColor;
scrollbar-shadow-color: currentColor;
scrollbar-track-color: currentColor;
scrollbar-arrow-color: currentColor;
}
.ui.scrolling.table > thead {
color: @headerBackgroundHex;
}
.ui.inverted.scrolling.table > tfoot {
color: @invertedFooterBackgroundHex;
.ui.scrolling.table > tfoot {
color: @footerBackgroundHex;
}
& when (@variationTableInverted) {
.ui.inverted.scrolling.table > thead {
color: @invertedHeaderBackgroundHex;
}
.ui.inverted.scrolling.table > tfoot {
color: @invertedFooterBackgroundHex;
}
}
}
}
}
& when (@variationTableInverted) {
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-track {
background: @trackInvertedBackground;
}
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-thumb {
background: @thumbInvertedBackground;
}
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-thumb:window-inactive {
background: @thumbInvertedInactiveBackground;
}
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-thumb:hover {
background: @thumbInvertedHoverBackground;
}
.ui.inverted.scrolling.table > tbody {
& when (@variationTableInverted) {
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-track {
background: @trackInvertedBackground;
}
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-thumb {
background: @thumbInvertedBackground;
}
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-thumb:window-inactive {
background: @thumbInvertedInactiveBackground;
}
.ui.inverted.scrolling.table > tbody::-webkit-scrollbar-thumb:hover {
background: @thumbInvertedHoverBackground;
}
& when (@supportIE) {
/* IE11 */
scrollbar-face-color: @thumbInvertedBackgroundHex;
scrollbar-shadow-color: @thumbInvertedBackgroundHex;
scrollbar-track-color: @trackInvertedBackgroundHex;
scrollbar-arrow-color: @trackInvertedBackgroundHex;
.ui.inverted.scrolling.table > tbody {
/* IE11 */
scrollbar-face-color: @thumbInvertedBackgroundHex;
scrollbar-shadow-color: @thumbInvertedBackgroundHex;
scrollbar-track-color: @trackInvertedBackgroundHex;
scrollbar-arrow-color: @trackInvertedBackgroundHex;
}
}
@supports (-moz-appearance: none) {
.ui.inverted.scrolling.table > tbody {
/* firefox: first color thumb, second track */
scrollbar-color: @thumbInvertedBackground @trackInvertedBackground;
}
}

/* firefox: first color thumb, second track */
scrollbar-color: @thumbInvertedBackground @trackInvertedBackground;
}
}
& when (@variationTableResizable) {
Expand Down
4 changes: 3 additions & 1 deletion src/definitions/elements/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -1098,14 +1098,16 @@
.ui.ui.circular.buttons .button,
.ui.ui.ui.ui.circular.button {
border-radius: @circularBorderRadius;
min-width: @circularMinWidth;
}

.ui.circular.buttons .button > .icon,
.ui.circular.button > .icon {
width: @circularIconWidth;
vertical-align: baseline;
}

.ui.circular.buttons:not(.vertical) .button {
.ui.circular.buttons:not(.vertical):not(.spaced) .button {
margin-right: @circularGroupMargin;
}

Expand Down
29 changes: 17 additions & 12 deletions src/definitions/globals/site.less
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,21 @@ a:hover {
body ::-webkit-scrollbar-thumb:hover {
background: @thumbHoverBackground;
}
body .ui {
& when (@supportIE) {
& when (@supportIE) {
body .ui {
/* IE11 */
scrollbar-face-color: @thumbBackgroundHex;
scrollbar-shadow-color: @thumbBackgroundHex;
scrollbar-track-color: @trackBackgroundHex;
scrollbar-arrow-color: @trackBackgroundHex;
}

/* firefox: first color thumb, second track */
scrollbar-color: @thumbBackground @trackBackground;
scrollbar-width: thin;
}
@supports (-moz-appearance: none) {
body .ui {
/* firefox: first color thumb, second track */
scrollbar-color: @thumbBackground @trackBackground;
scrollbar-width: thin;
}
}

/* Inverted UI */
Expand All @@ -175,18 +178,20 @@ a:hover {
body .ui.inverted:not(.dimmer)::-webkit-scrollbar-thumb:hover {
background: @thumbInvertedHoverBackground;
}

body .ui.inverted:not(.dimmer) {
& when (@supportIE) {
& when (@supportIE) {
body .ui.inverted:not(.dimmer) {
/* IE11 */
scrollbar-face-color: @thumbInvertedBackgroundHex;
scrollbar-shadow-color: @thumbInvertedBackgroundHex;
scrollbar-track-color: @trackInvertedBackgroundHex;
scrollbar-arrow-color: @trackInvertedBackgroundHex;
}

/* firefox: first color thumb, second track */
scrollbar-color: @thumbInvertedBackground @trackInvertedBackground;
}
@supports (-moz-appearance: none) {
body .ui.inverted:not(.dimmer) {
/* firefox: first color thumb, second track */
scrollbar-color: @thumbInvertedBackground @trackInvertedBackground;
}
}
}

Expand Down
12 changes: 11 additions & 1 deletion src/definitions/modules/calendar.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,17 @@

destroy: function () {
module.verbose('Destroying previous calendar for', element);
$module.removeData(moduleNamespace);
$module.removeData([
metadata.date,
metadata.focusDate,
metadata.startDate,
metadata.endDate,
metadata.minDate,
metadata.maxDate,
metadata.mode,
metadata.monthOffset,
moduleNamespace,
]);
module.unbind.events();
module.disconnect.classObserver();
},
Expand Down
Loading

0 comments on commit 378a9f4

Please sign in to comment.