mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-18 19:21:34 +08:00
normalize/structure css cleanup
This commit is contained in:
@ -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;
|
|
41
ionic/components/app/normalize.scss
vendored
41
ionic/components/app/normalize.scss
vendored
@ -1,15 +1,5 @@
|
|||||||
/*! Ionic fork of normalize.css v3.0.2 | MIT License | github.com/necolas/normalize.css */
|
/*! 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
|
// HTML5 display definitions
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@ -29,13 +19,6 @@ audio:not([controls]) {
|
|||||||
height: 0;
|
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
|
// Text-level semantics
|
||||||
// ==========================================================================
|
// ==========================================================================
|
||||||
@ -103,36 +86,19 @@ samp {
|
|||||||
// 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
|
// 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
|
||||||
//
|
//
|
||||||
|
|
||||||
button,
|
|
||||||
input,
|
input,
|
||||||
optgroup,
|
optgroup,
|
||||||
select,
|
select {
|
||||||
textarea {
|
|
||||||
color: inherit; // 1
|
color: inherit; // 1
|
||||||
font: inherit; // 2
|
font: inherit; // 2
|
||||||
margin: 0; // 3
|
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`
|
// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
|
||||||
// and `video` controls.
|
// and `video` controls.
|
||||||
// 2. Correct inability to style clickable `input` types in iOS.
|
// 2. Correct inability to style clickable `input` types in iOS.
|
||||||
// 3. Improve usability and consistency of cursor style between image-type
|
// 3. Improve usability and consistency of cursor style between image-type
|
||||||
// `input` and others.
|
// `input` and others.
|
||||||
button,
|
|
||||||
html input[type="button"], // 1
|
html input[type="button"], // 1
|
||||||
input[type="reset"],
|
input[type="reset"],
|
||||||
input[type="submit"] {
|
input[type="submit"] {
|
||||||
@ -178,11 +144,6 @@ input[type="search"]::-webkit-search-decoration {
|
|||||||
-webkit-appearance: none;
|
-webkit-appearance: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove default vertical scrollbar in IE 8/9/10/11.
|
|
||||||
textarea {
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Tables
|
// Tables
|
||||||
// ==========================================================================//
|
// ==========================================================================//
|
||||||
|
@ -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%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
-ms-text-size-adjust: 100%; // 1
|
||||||
|
-webkit-text-size-adjust: 100%; // 1
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
@ -82,6 +130,8 @@ ion-pane {
|
|||||||
order: $flex-order-view-content;
|
order: $flex-order-view-content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[hidden],
|
||||||
|
template,
|
||||||
root-anchor {
|
root-anchor {
|
||||||
display: none;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
@ -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;
|
|
@ -33,13 +33,15 @@ button,
|
|||||||
transition: background-color, opacity 100ms linear;
|
transition: background-color, opacity 100ms linear;
|
||||||
|
|
||||||
margin: $button-margin;
|
margin: $button-margin;
|
||||||
|
padding: $button-padding;
|
||||||
|
min-height: $button-height;
|
||||||
line-height: 1;
|
line-height: 1;
|
||||||
|
|
||||||
@include appearance(none);
|
border: 1px solid #ccc;
|
||||||
|
border: transparent;
|
||||||
vertical-align: top; // the better option for most scenarios
|
border-radius: $button-border-radius;
|
||||||
vertical-align: -webkit-baseline-middle; // the best for those that support it
|
|
||||||
|
|
||||||
|
font-size: $button-font-size;
|
||||||
font-family: inherit;
|
font-family: inherit;
|
||||||
font-variant: inherit;
|
font-variant: inherit;
|
||||||
font-style: inherit;
|
font-style: inherit;
|
||||||
@ -48,17 +50,15 @@ button,
|
|||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
overflow: hidden;
|
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;
|
cursor: pointer;
|
||||||
@include user-select-none();
|
@include user-select-none();
|
||||||
|
@include appearance(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;
|
|
||||||
|
|
||||||
background: $button-color;
|
background: $button-color;
|
||||||
color: $button-text-color;
|
color: $button-text-color;
|
||||||
|
@ -61,8 +61,12 @@ textarea {
|
|||||||
}
|
}
|
||||||
|
|
||||||
textarea {
|
textarea {
|
||||||
height: auto;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
height: auto;
|
||||||
|
overflow: auto;
|
||||||
|
color: inherit;
|
||||||
|
font: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
.platform-mobile textarea {
|
.platform-mobile textarea {
|
||||||
|
@ -2,8 +2,6 @@
|
|||||||
// Globals
|
// Globals
|
||||||
@import
|
@import
|
||||||
"util/mixins",
|
"util/mixins",
|
||||||
"components/app/z-index",
|
|
||||||
"components/app/flex-order",
|
|
||||||
"components/app/normalize",
|
"components/app/normalize",
|
||||||
"components/app/structure",
|
"components/app/structure",
|
||||||
"components/app/typography",
|
"components/app/typography",
|
||||||
|
Reference in New Issue
Block a user