diff --git a/ionic/components/app/flex-order.scss b/ionic/components/app/flex-order.scss deleted file mode 100644 index 7965906ede..0000000000 --- a/ionic/components/app/flex-order.scss +++ /dev/null @@ -1,15 +0,0 @@ - -// Flex Order -// -------------------------------------------------- - - -// the rock that everything orders around -$flex-order-view-content: 0 !default; - - -$flex-order-toolbar-top: -10 !default; -$flex-order-toolbar-bottom: 10 !default; - - -$flex-order-tab-bar-top: -30 !default; -$flex-order-tab-bar-bottom: 30 !default; diff --git a/ionic/components/app/normalize.scss b/ionic/components/app/normalize.scss index 5846eb7574..1f22b3f1c7 100644 --- a/ionic/components/app/normalize.scss +++ b/ionic/components/app/normalize.scss @@ -1,15 +1,5 @@ /*! Ionic fork of normalize.css v3.0.2 | MIT License | github.com/necolas/normalize.css */ -// 1. Prevent iOS text size adjust after orientation change, without disabling -// user zoom. -html { - -ms-text-size-adjust: 100%; // 1 - -webkit-text-size-adjust: 100%; // 1 -} -* { - box-sizing: border-box; -} - // HTML5 display definitions // ========================================================================== @@ -29,13 +19,6 @@ audio:not([controls]) { height: 0; } -// Address `[hidden]` styling not present in IE 8/9/10. -// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. -[hidden], -template { - display: none !important; -} - // Text-level semantics // ========================================================================== @@ -103,36 +86,19 @@ samp { // 3. Address margins set differently in Firefox 4+, Safari, and Chrome. // -button, input, optgroup, -select, -textarea { +select { color: inherit; // 1 font: inherit; // 2 margin: 0; // 3 } -// Address `overflow` set to `hidden` in IE 8/9/10/11. -button { - overflow: visible; -} - -// Address inconsistent `text-transform` inheritance for `button` and `select`. -// All other form control elements do not inherit `text-transform` values. -// Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. -// Correct `select` style inheritance in Firefox. -button, -select { - text-transform: none; -} - // 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` // and `video` controls. // 2. Correct inability to style clickable `input` types in iOS. // 3. Improve usability and consistency of cursor style between image-type // `input` and others. -button, html input[type="button"], // 1 input[type="reset"], input[type="submit"] { @@ -178,11 +144,6 @@ input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } -// Remove default vertical scrollbar in IE 8/9/10/11. -textarea { - overflow: auto; -} - // Tables // ==========================================================================// diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index 0b03658e7d..91c76322d8 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -1,12 +1,60 @@ -html, -body { + +// Z-Index +// -------------------------------------------------- +// Grouped by elements which would be siblings + +$z-index-aside-overlay: 80 !default; +$z-index-aside-backdrop: 79 !default; +$z-index-overlay: 1000 !default; +$z-index-click-block: 9999 !default; + +$z-index-content-container: 5 !default; +$z-index-navbar-container: 10 !default; + +$z-index-content: 5 !default; +$z-index-toolbar: 10 !default; +$z-index-swipe-handle: 15 !default; + +$z-index-toolbar-border: 20 !default; +$z-index-list-border: 50 !default; + +$z-index-backdrop: 1; +$z-index-overlay-wrapper: 10; + + + +// Flex Order +// -------------------------------------------------- + +$flex-order-view-content: 0 !default; + +$flex-order-toolbar-top: -10 !default; +$flex-order-toolbar-bottom: 10 !default; + +$flex-order-tab-bar-top: -30 !default; +$flex-order-tab-bar-bottom: 30 !default; + + + +// App Structure +// -------------------------------------------------- + +* { + box-sizing: border-box; +} + +html { width: 100%; height: 100%; + -ms-text-size-adjust: 100%; // 1 + -webkit-text-size-adjust: 100%; // 1 } body { position: fixed; overflow: hidden; + width: 100%; + height: 100%; max-width: 100%; max-height: 100%; margin: 0; @@ -82,6 +130,8 @@ ion-pane { order: $flex-order-view-content; } +[hidden], +template, root-anchor { - display: none; + display: none !important; } diff --git a/ionic/components/app/z-index.scss b/ionic/components/app/z-index.scss deleted file mode 100644 index 85b464145f..0000000000 --- a/ionic/components/app/z-index.scss +++ /dev/null @@ -1,26 +0,0 @@ - -// Z-Index -// -------------------------------------------------- -// Grouped by elements which would be siblings - - -$z-index-aside-overlay: 80 !default; -$z-index-aside-backdrop: 79 !default; -$z-index-overlay: 1000 !default; -$z-index-click-block: 9999 !default; - - -$z-index-content-container: 5 !default; -$z-index-navbar-container: 10 !default; - - -$z-index-content: 5 !default; -$z-index-toolbar: 10 !default; -$z-index-swipe-handle: 15 !default; - - -$z-index-toolbar-border: 20 !default; -$z-index-list-border: 50 !default; - -$z-index-backdrop: 1; -$z-index-overlay-wrapper: 10; diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss index 7623de2dff..2f51c9e52d 100644 --- a/ionic/components/button/button.scss +++ b/ionic/components/button/button.scss @@ -33,13 +33,15 @@ button, transition: background-color, opacity 100ms linear; margin: $button-margin; + padding: $button-padding; + min-height: $button-height; line-height: 1; - @include appearance(none); - - vertical-align: top; // the better option for most scenarios - vertical-align: -webkit-baseline-middle; // the best for those that support it + border: 1px solid #ccc; + border: transparent; + border-radius: $button-border-radius; + font-size: $button-font-size; font-family: inherit; font-variant: inherit; font-style: inherit; @@ -48,17 +50,15 @@ button, text-overflow: ellipsis; overflow: hidden; + text-align: center; + text-transform: none; + + vertical-align: top; // the better option for most scenarios + vertical-align: -webkit-baseline-middle; // the best for those that support it + cursor: pointer; @include user-select-none(); - - border: 1px solid #ccc; - padding: $button-padding; - min-height: $button-height; - - text-align: center; - font-size: $button-font-size; - border: transparent; - border-radius: $button-border-radius; + @include appearance(none); background: $button-color; color: $button-text-color; diff --git a/ionic/components/form/form.scss b/ionic/components/form/form.scss index 439ab9ec62..50f218523d 100644 --- a/ionic/components/form/form.scss +++ b/ionic/components/form/form.scss @@ -61,8 +61,12 @@ textarea { } textarea { - height: auto; + margin: 0; padding: 0; + height: auto; + overflow: auto; + color: inherit; + font: inherit; } .platform-mobile textarea { diff --git a/ionic/ionic.core.scss b/ionic/ionic.core.scss index ad968bf58a..789a6acbe1 100644 --- a/ionic/ionic.core.scss +++ b/ionic/ionic.core.scss @@ -2,8 +2,6 @@ // Globals @import "util/mixins", - "components/app/z-index", - "components/app/flex-order", "components/app/normalize", "components/app/structure", "components/app/typography",