diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 424d2be692..9e66b263df 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -182,7 +182,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. @@ -349,22 +349,15 @@ body, .ionic-body { -webkit-user-drag: none; -webkit-user-select: none; } -.view-full { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; } - .content:before, .content:after { - content: "\00a0"; - /* No-break space character */ display: block; overflow: hidden; - height: 0; } + height: 0; + content: "\00a0"; + /* No-break space character */ } -/* Hack to force all relatively and absolutely positioned elements still render while scrolling +/* Force all relatively and absolutely positioned elements still render while scrolling Note: This is a bug for "-webkit-overflow-scrolling: touch" (via ratchet) */ .content > * { -webkit-transform: translateZ(0px); @@ -372,9 +365,9 @@ body, .ionic-body { .content { position: absolute; + overflow: auto; width: 100%; height: 100%; - overflow: auto; -webkit-overflow-scrolling: touch; } .has-header { @@ -392,24 +385,11 @@ body, .ionic-body { right: 0; bottom: 0; left: 0; + z-index: 1; width: 100%; height: 100%; - z-index: 1; background-color: #fff; } -.page, .full-section { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - overflow: auto; - width: 100%; - height: 100%; - background-color: #fff; - -webkit-overflow-scrolling: touch; } - p { margin: 0 0 10px; } @@ -1741,7 +1721,7 @@ input[type="file"] { line-height: 34px; } select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } select[multiple], @@ -1813,7 +1793,7 @@ input[type="checkbox"][readonly] { 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" */ @@ -1828,7 +1808,7 @@ input[type="checkbox"][readonly] { right: 0; left: 20px; -webkit-transform: none; - transition-delay: 0.05s, 0s; } + transition-delay: .05s, 0s; } .item-radio { padding: 0; } @@ -2113,7 +2093,7 @@ input[type="range"] { .button.button-icon:active, .button.button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .button.block, .button.button-full { margin-top: 10px; margin-bottom: 10px; } @@ -2457,9 +2437,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"; } @@ -2472,9 +2452,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/ionic-scoped.css b/dist/css/ionic-scoped.css index 541aaa483d..5c007de34d 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -129,7 +129,7 @@ /** * Remove most spacing between table cells. */ - /* Hack to force all relatively and absolutely positioned elements still render while scrolling + /* Force all relatively and absolutely positioned elements still render while scrolling Note: This is a bug for "-webkit-overflow-scrolling: touch" (via ratchet) */ /** * Tabs @@ -210,7 +210,7 @@ transform: rotate(360deg); } } } .ionic .ion { - font-family: "Ionicons" !important; + font-family: 'Ionicons' !important; speak: none !important; font-style: normal !important; font-weight: normal !important; @@ -1192,7 +1192,7 @@ .ionic fieldset { margin: 0 2px; padding: 0.35em 0.625em 0.75em; - border: 1px solid silver; } + border: 1px solid #c0c0c0; } .ionic legend { padding: 0; /* 2 */ @@ -1289,27 +1289,21 @@ -webkit-tap-highlight-color: transparent; -webkit-user-drag: none; -webkit-user-select: none; } - .ionic .view-full { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; } .ionic .content:before, .ionic .content:after { - content: "\00a0"; - /* No-break space character */ display: block; overflow: hidden; - height: 0; } + height: 0; + content: "\00a0"; + /* No-break space character */ } .ionic .content > * { -webkit-transform: translateZ(0px); transform: translateZ(0px); } .ionic .content { position: absolute; + overflow: auto; width: 100%; height: 100%; - overflow: auto; -webkit-overflow-scrolling: touch; } .ionic .has-header { top: 44px; } @@ -1323,22 +1317,10 @@ right: 0; bottom: 0; left: 0; + z-index: 1; width: 100%; height: 100%; - z-index: 1; background-color: #fff; } - .ionic .page, .ionic .full-section { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - overflow: auto; - width: 100%; - height: 100%; - background-color: #fff; - -webkit-overflow-scrolling: touch; } .ionic p { margin: 0 0 10px; } .ionic .lead { @@ -2556,7 +2538,7 @@ .ionic input[type="file"] { line-height: 34px; } .ionic select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } .ionic select[multiple], .ionic select[size] { @@ -2605,7 +2587,7 @@ border-radius: 50%; background: white; content: ' '; - transition: background-color 0.1s ease-in-out; } + transition: background-color .1s ease-in-out; } .ionic .checkbox input:after { position: absolute; top: 34%; @@ -2618,7 +2600,7 @@ 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); } .ionic .checkbox input:checked:before { @@ -2970,7 +2952,7 @@ .ionic .button.button-icon:active, .ionic .button.button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .ionic .button.block, .ionic .button.button-full { margin-top: 10px; margin-bottom: 10px; } @@ -3220,9 +3202,9 @@ 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; } .ionic .ion-loading:before { content: "\e144"; } .ionic .ion-refreshing { @@ -3234,9 +3216,9 @@ 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; } .ionic .ion-refreshing:before { content: "\e144"; } .ionic .hidden, diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 02e5970bc4..d3ca1f4d45 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -7,7 +7,7 @@ font-style: normal; } .ion { - font-family: "Ionicons" !important; + font-family: 'Ionicons' !important; speak: none !important; font-style: normal !important; font-weight: normal !important; @@ -1521,7 +1521,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. @@ -1688,22 +1688,15 @@ body, .ionic-body { -webkit-user-drag: none; -webkit-user-select: none; } -.view-full { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; } - .content:before, .content:after { - content: "\00a0"; - /* No-break space character */ display: block; overflow: hidden; - height: 0; } + height: 0; + content: "\00a0"; + /* No-break space character */ } -/* Hack to force all relatively and absolutely positioned elements still render while scrolling +/* Force all relatively and absolutely positioned elements still render while scrolling Note: This is a bug for "-webkit-overflow-scrolling: touch" (via ratchet) */ .content > * { -webkit-transform: translateZ(0px); @@ -1711,9 +1704,9 @@ body, .ionic-body { .content { position: absolute; + overflow: auto; width: 100%; height: 100%; - overflow: auto; -webkit-overflow-scrolling: touch; } .has-header { @@ -1731,24 +1724,11 @@ body, .ionic-body { right: 0; bottom: 0; left: 0; + z-index: 1; width: 100%; height: 100%; - z-index: 1; background-color: #fff; } -.page, .full-section { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - overflow: auto; - width: 100%; - height: 100%; - background-color: #fff; - -webkit-overflow-scrolling: touch; } - p { margin: 0 0 10px; } @@ -3144,7 +3124,7 @@ input[type="file"] { line-height: 34px; } select { - border: 1px solid #cccccc; + border: 1px solid #ccc; background-color: white; } select[multiple], @@ -3199,7 +3179,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 { @@ -3214,7 +3194,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); } @@ -3594,7 +3574,7 @@ input[type="range"] { .button.button-icon:active, .button.button-icon.active { background: none; box-shadow: none; - text-shadow: 0px 0px 10px white; } + text-shadow: 0px 0px 10px #fff; } .button.block, .button.button-full { margin-top: 10px; margin-bottom: 10px; } @@ -4116,9 +4096,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"; } @@ -4131,9 +4111,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/scss/ionic/_scaffolding.scss b/scss/ionic/_scaffolding.scss index 304646bc75..fb2c4568c7 100644 --- a/scss/ionic/_scaffolding.scss +++ b/scss/ionic/_scaffolding.scss @@ -44,38 +44,26 @@ body, .ionic-body { -webkit-user-select: none; } -.view { -} - -.view-full { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; -} - .content:before, .content:after { - // Uncollapse content margin if child elements DO have an margin - content: "\00a0"; /* No-break space character */ display: block; overflow: hidden; height: 0; + // Uncollapse content margin if child elements DO have an margin + content: "\00a0"; /* No-break space character */ } -/* Hack to force all relatively and absolutely positioned elements still render while scrolling +/* Force all relatively and absolutely positioned elements still render while scrolling Note: This is a bug for "-webkit-overflow-scrolling: touch" (via ratchet) */ .content > * { -webkit-transform: translateZ(0px); transform: translateZ(0px); } - .content { position: absolute; + overflow: auto; width: 100%; height: 100%; - overflow: auto; -webkit-overflow-scrolling: touch; } @@ -100,22 +88,9 @@ body, .ionic-body { right: 0; bottom: 0; left: 0; + z-index: 1; width: 100%; height: 100%; - z-index: 1; background-color: #fff; } -.page, .full-section { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1; - overflow: auto; - width: 100%; - height: 100%; - background-color: #fff; - -webkit-overflow-scrolling: touch; -}