mirror of
				https://github.com/ionic-team/ionic-framework.git
				synced 2025-11-04 13:17:56 +08:00 
			
		
		
		
	refactor(): fix incorrect merges
This commit is contained in:
		@ -1,4 +1,4 @@
 | 
			
		||||
@import "../../themes/ionic.globals.ios";
 | 
			
		||||
@import "../../themes/native/native.globals.ios";
 | 
			
		||||
@import "./radio-group";
 | 
			
		||||
@import "../item/item.ios.vars";
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
@import "../../themes/ionic.globals.md";
 | 
			
		||||
@import "../../themes/native/native.globals.md";
 | 
			
		||||
@import "./radio-group";
 | 
			
		||||
@import "../item/item.md.vars";
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,4 +1,4 @@
 | 
			
		||||
@import "../../themes/ionic.globals";
 | 
			
		||||
@import "../../themes/native/native.globals";
 | 
			
		||||
 | 
			
		||||
// Radio Group
 | 
			
		||||
// --------------------------------------------------
 | 
			
		||||
 | 
			
		||||
@ -241,7 +241,7 @@ button {
 | 
			
		||||
   * padding so it is always aligned with either the label
 | 
			
		||||
   * 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;
 | 
			
		||||
 | 
			
		||||
@ -277,7 +277,7 @@ button {
 | 
			
		||||
 * present on the select. Otherwise the helper text should
 | 
			
		||||
 * be shown.
 | 
			
		||||
 */
 | 
			
		||||
 .select-bottom .error-text {
 | 
			
		||||
.select-bottom .error-text {
 | 
			
		||||
  display: none;
 | 
			
		||||
 | 
			
		||||
  color: var(--highlight-color-invalid);
 | 
			
		||||
 | 
			
		||||
@ -1,2 +1,4 @@
 | 
			
		||||
@import "../../themes/native/native.globals";
 | 
			
		||||
 | 
			
		||||
/// @prop - Margin start of the select icon
 | 
			
		||||
$select-icon-margin-start: 4px;
 | 
			
		||||
 | 
			
		||||
@ -33,10 +33,10 @@
 | 
			
		||||
 | 
			
		||||
:host(.toggle-label-placement-fixed) .label-text-wrapper {
 | 
			
		||||
  /**
 | 
			
		||||
     * The margin between the label and
 | 
			
		||||
     * the input should be on the end
 | 
			
		||||
     * when the label sits at the start.
 | 
			
		||||
     */
 | 
			
		||||
   * The margin between the label and
 | 
			
		||||
   * the input should be on the end
 | 
			
		||||
   * when the label sits at the start.
 | 
			
		||||
   */
 | 
			
		||||
  @include margin(null, $form-control-label-margin, null, 0);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -60,6 +60,8 @@
 | 
			
		||||
*/
 | 
			
		||||
:host(.toggle-label-placement-stacked) .toggle-wrapper {
 | 
			
		||||
  flex-direction: column;
 | 
			
		||||
 | 
			
		||||
  text-align: center;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
:host(.toggle-label-placement-stacked) .label-text-wrapper {
 | 
			
		||||
 | 
			
		||||
@ -1,3 +1,5 @@
 | 
			
		||||
@import "../../themes/native/native.globals";
 | 
			
		||||
 | 
			
		||||
/// @prop - Top margin of toggle's label when in an item
 | 
			
		||||
$toggle-item-label-margin-top: 10px;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -44,7 +44,7 @@ const transitionEnd = (el: HTMLElement | null, expectedDuration = 0, callback: (
 | 
			
		||||
  if (el) {
 | 
			
		||||
    el.addEventListener('webkitTransitionEnd', 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 = () => {
 | 
			
		||||
      if (animationTimeout !== undefined) {
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										1485
									
								
								core/status.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1485
									
								
								core/status.md
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user