javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-04 21:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(): fix incorrect merges

Browse Source
This commit is contained in:
Brandy Smith
2025-03-18 18:08:51 -04:00
parent b8b5984150
commit 5cd85049e0
9 changed files with 1501 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/radio-group/radio-group.ios.scss
View File

@ -1,4 +1,4 @@
@import "../../themes/ionic.globals.ios"; @import "../../themes/native/native.globals.ios";
@import "./radio-group"; @import "./radio-group";
@import "../item/item.ios.vars"; @import "../item/item.ios.vars";

2
core/src/components/radio-group/radio-group.md.scss
View File

@ -1,4 +1,4 @@
@import "../../themes/ionic.globals.md"; @import "../../themes/native/native.globals.md";
@import "./radio-group"; @import "./radio-group";
@import "../item/item.md.vars"; @import "../item/item.md.vars";

2
core/src/components/radio-group/radio-group.scss
View File

@ -1,4 +1,4 @@
@import "../../themes/ionic.globals"; @import "../../themes/native/native.globals";
// Radio Group // Radio Group
// -------------------------------------------------- // --------------------------------------------------

4
core/src/components/select/select.common.scss
View File

@ -241,7 +241,7 @@ button {
* padding so it is always aligned with either the label * padding so it is always aligned with either the label
* or the start of the text select. * or the start of the text select.
*/ */
@include padding(5px, var(--padding-end), 0, var(--padding-start)); @include mixins.padding(5px, var(--padding-end), 0, var(--padding-start));
display: flex; display: flex;
@ -277,7 +277,7 @@ button {
* present on the select. Otherwise the helper text should * present on the select. Otherwise the helper text should
* be shown. * be shown.
*/ */
.select-bottom .error-text { .select-bottom .error-text {
display: none; display: none;
color: var(--highlight-color-invalid); color: var(--highlight-color-invalid);

2
core/src/components/select/select.vars.scss
View File

@ -1,2 +1,4 @@
@import "../../themes/native/native.globals";
/// @prop - Margin start of the select icon /// @prop - Margin start of the select icon
$select-icon-margin-start: 4px; $select-icon-margin-start: 4px;

10
core/src/components/toggle/toggle.native.scss
View File

@ -33,10 +33,10 @@
:host(.toggle-label-placement-fixed) .label-text-wrapper { :host(.toggle-label-placement-fixed) .label-text-wrapper {
/** /**
* The margin between the label and * The margin between the label and
* the input should be on the end * the input should be on the end
* when the label sits at the start. * when the label sits at the start.
*/ */
@include margin(null, $form-control-label-margin, null, 0); @include margin(null, $form-control-label-margin, null, 0);
} }
@ -60,6 +60,8 @@
*/ */
:host(.toggle-label-placement-stacked) .toggle-wrapper { :host(.toggle-label-placement-stacked) .toggle-wrapper {
flex-direction: column; flex-direction: column;
text-align: center;
} }
:host(.toggle-label-placement-stacked) .label-text-wrapper { :host(.toggle-label-placement-stacked) .label-text-wrapper {

2
core/src/components/toggle/toggle.vars.scss
View File

@ -1,3 +1,5 @@
@import "../../themes/native/native.globals";
/// @prop - Top margin of toggle's label when in an item /// @prop - Top margin of toggle's label when in an item
$toggle-item-label-margin-top: 10px; $toggle-item-label-margin-top: 10px;

2
core/src/utils/helpers.ts
View File

@ -44,7 +44,7 @@ const transitionEnd = (el: HTMLElement | null, expectedDuration = 0, callback: (
if (el) { if (el) {
el.addEventListener('webkitTransitionEnd', onTransitionEnd, opts); el.addEventListener('webkitTransitionEnd', onTransitionEnd, opts);
el.addEventListener('transitionend', onTransitionEnd, opts); el.addEventListener('transitionend', onTransitionEnd, opts);
animationTimeout = setTimeout(onTransitionEnd, expectedDuration + ANIMATION_FALLBACK_TIMEOUT) as unknown as number; animationTimeout = setTimeout(onTransitionEnd, expectedDuration + ANIMATION_FALLBACK_TIMEOUT);
unRegTrans = () => { unRegTrans = () => {
if (animationTimeout !== undefined) { if (animationTimeout !== undefined) {

1485
core/status.md Normal file
View File

File diff suppressed because it is too large Load Diff