Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 1 addition & 13 deletions core/src/components/alert/alert.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
}

.alert-tappable {
height: $alert-ios-tappable-height;
min-height: $alert-ios-tappable-height;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ticket notes that we should set height: auto, but I found that created some undesired diffs on radios/checkboxes with short text. I found that min-height gets us to the same desired result without the additional diffs for short text.

}


Expand All @@ -137,12 +137,6 @@
order: 0;

color: $alert-ios-radio-label-text-color;

text-overflow: ellipsis;

white-space: nowrap;

overflow: hidden;
}


Expand Down Expand Up @@ -196,12 +190,6 @@
flex: 1;

color: $alert-ios-checkbox-label-text-color;

text-overflow: ellipsis;

white-space: nowrap;

overflow: hidden;
}

// iOS Alert Checkbox Outer Circle: Unchecked
Expand Down
16 changes: 1 addition & 15 deletions core/src/components/alert/alert.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@
.alert-tappable {
position: relative;

height: $alert-md-tappable-height;

overflow: hidden;
min-height: $alert-md-tappable-height;
}


Expand All @@ -130,12 +128,6 @@
color: $alert-md-radio-label-text-color;

font-size: $alert-md-radio-label-font-size;

text-overflow: ellipsis;

white-space: nowrap;

overflow: hidden;
}

// Material Design Alert Radio Unchecked Circle
Expand Down Expand Up @@ -203,12 +195,6 @@
color: $alert-md-checkbox-label-text-color;

font-size: $alert-md-checkbox-label-font-size;

text-overflow: ellipsis;

white-space: nowrap;

overflow: hidden;
}


Expand Down
4 changes: 3 additions & 1 deletion core/src/components/alert/alert.scss
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@

width: 100%;
height: 100%;

min-height: inherit;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this the button inner may have visual diffs since the height is no longer fixed at 48px

}


Expand Down Expand Up @@ -184,7 +186,7 @@
text-align: start;
appearance: none;

contain: strict;
contain: content;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without this, each radio/checkbox will still be sized at 48px. This change allows the height of the element to increase as the text wraps.

}

.alert-button,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 4 additions & 16 deletions core/src/components/alert/test/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -246,17 +246,12 @@
type: 'radio',
label: 'Radio 4',
value: 'value4',
},
{
type: 'radio',
label: 'Radio 5',
value: 'value5',
disabled: true,
},
{
type: 'radio',
label: 'Radio 6 Radio 6 Radio 6 Radio 6 Radio 6 Radio 6 Radio 6 Radio 6 Radio 6 Radio 6 ',
value: 'value6',
label: 'Radio 5 Radio 5 Radio 5 Radio 5 Radio 5 Radio 5 Radio 5 Radio 5 Radio 5 Radio 5 ',
value: 'value5',
},
],
buttons: [
Expand Down Expand Up @@ -305,20 +300,13 @@
type: 'checkbox',
label: 'Checkbox 4',
value: 'value4',
},

{
type: 'checkbox',
label: 'Checkbox 5',
value: 'value5',
disabled: true,
},

{
type: 'checkbox',
label:
'Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6 Checkbox 6',
value: 'value6',
'Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5 Checkbox 5',
value: 'value5',
},
],
buttons: [
Expand Down