Skip to content

Commit bfc1b2f

Browse files
committed
Merge branch 'develop' into outlineThemeable
# Conflicts: # src/definitions/modules/dropdown.less
2 parents 3b175d5 + dad8911 commit bfc1b2f

File tree

85 files changed

+1163
-572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1163
-572
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: Lint
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@v5
1212
- uses: actions/setup-node@v4
1313
- name: Install dependencies
1414
run: yarn
@@ -28,7 +28,7 @@ jobs:
2828
matrix:
2929
node-version: [18, 20, 22]
3030
steps:
31-
- uses: actions/checkout@v4
31+
- uses: actions/checkout@v5
3232
- name: Setup Node.js ${{ matrix.node-version }}
3333
uses: actions/setup-node@v4
3434
with:
@@ -47,7 +47,7 @@ jobs:
4747
contents: read
4848
security-events: write
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v5
5151
- uses: github/codeql-action/init@v3
5252
with:
5353
languages: 'javascript'

.github/workflows/depsreview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout Repository'
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
- name: 'Dependency Review'
1414
uses: actions/dependency-review-action@v4

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
outputs:
1414
shouldPublish: ${{ steps.nightly-version.outputs.shouldPublish }}
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717
with:
1818
ref: develop
1919
- uses: actions/setup-node@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
if: github.repository == 'fomantic/Fomantic-UI'
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
ref: master
1717
- uses: actions/setup-node@v4

.stylelintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ module.exports = {
1212
'at-rule-name-case': null,
1313
'at-rule-no-unknown': null,
1414
'block-no-empty': null,
15-
'color-function-notation': 'legacy',
1615
'color-hex-case': 'lower',
1716
'declaration-colon-newline-after': null, // handled by Prettier
1817
'font-family-no-missing-generic-family-keyword': null,

src/definitions/collections/form.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
margin: 0;
136136
outline: none;
137137
-webkit-appearance: none;
138-
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
138+
-webkit-tap-highlight-color: rgb(255 255 255 / 0);
139139
line-height: @inputLineHeight;
140140
padding: @inputPadding;
141141
font-size: @inputFontSize;
@@ -162,7 +162,7 @@
162162
.ui.form textarea {
163163
margin: 0;
164164
-webkit-appearance: none;
165-
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
165+
-webkit-tap-highlight-color: rgb(255 255 255 / 0);
166166
padding: @textAreaPadding;
167167
background: @textAreaBackground;
168168
border: @textAreaBorder;

src/definitions/elements/divider.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
letter-spacing: @letterSpacing;
3434
color: @color;
3535
user-select: none;
36-
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
36+
-webkit-tap-highlight-color: rgb(0 0 0 / 0);
3737
}
3838

3939
/* --------------

src/definitions/elements/input.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
max-width: 100%;
4646
flex: 1 1 auto;
4747
outline: none;
48-
-webkit-tap-highlight-color: rgba(255, 255, 255, 0);
48+
-webkit-tap-highlight-color: rgb(255 255 255 / 0);
4949
text-align: @textAlign;
5050
line-height: @lineHeight;
5151
font-family: @inputFont;

src/definitions/elements/label.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ a.ui.label {
471471
.ui.card .image > .ribbon.label {
472472
position: absolute;
473473
top: @ribbonImageTopDistance;
474+
z-index: 1;
474475
}
475476
.ui.card .image > .ui.ribbon.label,
476477
.ui.image > .ui.ribbon.label {

src/definitions/modules/dropdown.js

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,15 +1009,26 @@
10091009
let menuConfig = {};
10101010
menuConfig[fields.values] = values;
10111011
module.setup.menu(menuConfig);
1012-
$.each(values, function (index, item) {
1013-
if (item.selected === true) {
1014-
module.debug('Setting initial selection to', item[fields.value]);
1015-
module.set.selected(item[fields.value]);
1016-
if (!module.is.multiple()) {
1017-
return false;
1012+
let findSelected = function (values) {
1013+
let hasMultiple = true;
1014+
$.each(values, function (index, item) {
1015+
let itemType = item.type || 'item';
1016+
if (item.selected === true) {
1017+
module.debug('Setting initial selection to', item[fields.value]);
1018+
module.set.selected(item[fields.value]);
1019+
if (!module.is.multiple()) {
1020+
hasMultiple = false;
1021+
}
1022+
} else if (itemType.indexOf('menu') !== -1) {
1023+
hasMultiple = findSelected(item.values || []);
10181024
}
1019-
}
1020-
});
1025+
1026+
return hasMultiple;
1027+
});
1028+
1029+
return hasMultiple;
1030+
};
1031+
findSelected(values);
10211032

10221033
if (module.has.selectInput()) {
10231034
module.disconnect.selectObserver();

0 commit comments

Comments
 (0)