From 992d8b62278cf8e2e5f95d9e9339168b40d5612a Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 7 Nov 2013 13:09:42 -0600 Subject: [PATCH] actionsheet css touch up --- dist/css/ionic.css | 48 +++++++++++++++++----------------- dist/css/themes/ionic-ios7.css | 5 ++-- scss/_action-sheet.scss | 28 +++++++++----------- 3 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 7698e9b6ab..4a9c8750c4 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -2013,7 +2013,7 @@ sub { fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid silver; } + border: 1px solid #c0c0c0; } /** * 1. Correct `color` not being inherited in IE 8/9. @@ -2372,34 +2372,34 @@ a.subdued‎ { padding-right: 0; } .action-sheet { - position: fixed; - z-index: 10; - width: calc(100% - 30px); - bottom: 0; - left: 15px; -webkit-transform: translate3d(0, 100%, 0); transform: translate3d(0, 100%, 0); - overflow: hidden; } + position: fixed; + bottom: 0; + left: 15px; + z-index: 10; + overflow: hidden; + width: calc(100% - 30px); } .action-sheet .button { display: block; - width: 100%; padding: 10px; + width: 100%; border-radius: none; background-color: transparent; - font-size: 18px; - color: #4a87ee; } + color: #4a87ee; + font-size: 18px; } .action-sheet .button.destructive { color: #ef4e3a; } .action-sheet-title { - font-size: 12px; padding: 10px; - text-align: center; } + text-align: center; + font-size: 12px; } .action-sheet-group { + margin-bottom: 10px; border-radius: 3px; - background-color: rgba(255, 255, 255, 0.95); - margin-bottom: 10px; } + background-color: rgba(255, 255, 255, 0.95); } .bar { -webkit-user-select: none; @@ -3809,7 +3809,7 @@ input[type="file"] { line-height: 34px; } select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } select[multiple], @@ -3864,7 +3864,7 @@ input[type="checkbox"][readonly] { border-radius: 50%; background: white; content: ' '; - transition: background-color 0.1s ease-in-out; } + transition: background-color .1s ease-in-out; } /* the checkmark within the box */ .checkbox input:after { @@ -3879,7 +3879,7 @@ input[type="checkbox"][readonly] { border-right: 0; content: ' '; opacity: 0; - transition: opacity 0.05s ease-in-out; + transition: opacity .05s ease-in-out; -webkit-transform: rotate(-45deg); transform: rotate(-45deg); } @@ -4292,7 +4292,7 @@ input[type="range"] { .button-icon:active, .button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .padding > .button.block:first-child { margin-top: 0; } @@ -4633,9 +4633,9 @@ a.button { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .ion-loading:before { content: "\e144"; } @@ -4648,9 +4648,9 @@ a.button { line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - -webkit-animation: spin 0.75s linear infinite; - -moz-animation: spin 0.75s linear infinite; - animation: spin 0.75s linear infinite; } + -webkit-animation: spin .75s linear infinite; + -moz-animation: spin .75s linear infinite; + animation: spin .75s linear infinite; } .ion-refreshing:before { content: "\e144"; } diff --git a/dist/css/themes/ionic-ios7.css b/dist/css/themes/ionic-ios7.css index 53b57eba7c..680f21850c 100644 --- a/dist/css/themes/ionic-ios7.css +++ b/dist/css/themes/ionic-ios7.css @@ -1,4 +1,3 @@ -@charset "UTF-8"; /** * Nav controllers and header bar animations */ @@ -119,7 +118,7 @@ right: 20px; transition: 0.2s ease; transition-property: left, right; - transition-delay: 0s, 0.05s; } + transition-delay: 0s, .05s; } .toggle :checked + .track { /* When the toggle is "on" */ @@ -134,4 +133,4 @@ right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } diff --git a/scss/_action-sheet.scss b/scss/_action-sheet.scss index 1b50351f4f..7a1e3cae3b 100644 --- a/scss/_action-sheet.scss +++ b/scss/_action-sheet.scss @@ -1,28 +1,26 @@ + +// Action Sheets +// -------------------------------------------------- + .action-sheet { - position: fixed; - - z-index: $zindex-modal; - - width: calc(100% - 30px); + @include translate3d(0, 100%, 0); + position: fixed; bottom: 0; - left: 15px; - - -webkit-transform: translate3d(0, 100%, 0); - transform: translate3d(0, 100%, 0); - + left: 15px; + z-index: $zindex-modal; overflow: hidden; - + width: calc(100% - 30px); .button { display: block; - width: 100%; padding: 10px; + width: 100%; border-radius: none; background-color: transparent; - font-size: 18px; color: $brand-primary; + font-size: 18px; &.destructive { color: $brand-danger; @@ -31,13 +29,13 @@ } .action-sheet-title { - font-size: 12px; padding: 10px; text-align: center; + font-size: 12px; } .action-sheet-group { + margin-bottom: 10px; border-radius: $sheet-border-radius; background-color: rgba($sheet-bg-color, $sheet-opacity); - margin-bottom: 10px; }