diff --git a/js/angular/directive/actionSheet.js b/js/angular/directive/actionSheet.js index 02443d56b4..d09a16d334 100644 --- a/js/angular/directive/actionSheet.js +++ b/js/angular/directive/actionSheet.js @@ -33,14 +33,12 @@ IonicModule template: '
' + '
' + '
' + - '
' + + '
' + '
' + - '' + + '' + + '' + '
' + - '
' + - '' + - '
' + - '
' + + '
' + '' + '
' + '
' + diff --git a/scss/_action-sheet.scss b/scss/_action-sheet.scss index 9287125f66..71097f0eec 100644 --- a/scss/_action-sheet.scss +++ b/scss/_action-sheet.scss @@ -14,7 +14,7 @@ background-color: rgba(0,0,0,0); &.active { - background-color: rgba(0,0,0,0.5); + background-color: rgba(0,0,0,0.4); } } @@ -31,8 +31,8 @@ } .action-sheet { - margin-left: 15px; - margin-right: 15px; + margin-left: $sheet-margin; + margin-right: $sheet-margin; width: auto; z-index: $z-index-action-sheet; overflow: hidden; @@ -42,43 +42,62 @@ padding: 1px; width: 100%; border-radius: 0; - + border-color: $sheet-options-borer-color; background-color: transparent; - color: $positive; + color: $sheet-options-text-color; font-size: 18px; + &:hover { + color: $sheet-options-text-color; + } &.destructive { color: $assertive; + &:hover { + color: $assertive; + } } } + + .button.active, .button.activated { + box-shadow: none; + border-color: $sheet-options-borer-color; + color: $sheet-options-text-color; + background: $sheet-options-bg-active-color; + } } .action-sheet-title { - padding: 10px; + padding: $sheet-margin; color: lighten($base-color, 40%); text-align: center; font-size: 12px; } .action-sheet-group { - margin-bottom: 5px; + margin-bottom: $sheet-margin; border-radius: $sheet-border-radius; background-color: #fff; + overflow: hidden; + .button { border-width: 1px 0px 0px 0px; - border-radius: 0; - - &.active { - background-color: transparent; - color: inherit; - } } .button:first-child:last-child { border-width: 0; } } +.action-sheet-options { + background: $sheet-options-bg-color; +} + +.action-sheet-cancel { + .button { + font-weight: 500; + } +} + .action-sheet-open { pointer-events: none; diff --git a/scss/_variables.scss b/scss/_variables.scss index 329e504d69..6b0c0e768c 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -603,12 +603,13 @@ $grid-responsive-lg-break: 1023px !default; // smaller than landscape tab // Action Sheets // ------------------------------- -$sheet-bg-color: rgba(255, 255, 255, 0.6) !default; -$sheet-opacity: 0.95 !default; +$sheet-margin: 8px !default; +$sheet-border-radius: 4px !default; -$sheet-border-radius: 3px 3px 3px 3px !default; -$sheet-border-radius-top: 3px 3px 0px 0px !default; -$sheet-border-radius-bottom: 0px 0px 3px 3px !default; +$sheet-options-bg-color: #f6f7f8 !default; +$sheet-options-bg-active-color: #ecedee !default; +$sheet-options-text-color: $positive !default; +$sheet-options-borer-color: #d1d3d6 !default; // Popups