javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 19:21:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove alert

Browse Source
This commit is contained in:
Adam Bradley
2015-07-23 14:28:33 -05:00
parent 7e047a7435
commit 4606bee4cb
11 changed files with 16 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ionic/components/alert/alert.scss
View File

@ -1,41 +0,0 @@
// Alert
// --------------------------------------------------
$alert-width: 40% !default;
$alert-min-width: 270px !default;
$alert-max-width: 460px !default;
$alert-content-margin: 24px !default;
.alert .overlay-container {
display: flex;
justify-content: center;
align-items: center;
}
.alert-container {
display: block;
width: $alert-width;
min-width: $alert-min-width;
max-width: $alert-max-width;
margin-bottom: 60px;
background: white;
}
.alert-header {
margin: $alert-content-margin;
font-size: 2rem;
font-weight: 400;
}
.alert-content {
margin: $alert-content-margin;
}
.alert-actions {
display: flex;
justify-content: flex-end;
}

24
ionic/components/alert/alert.ts
View File

@ -1,24 +0,0 @@
/*
@Component({
selector: 'ion-alert'
})
@NgView({
template: `
<div class="overlay-backdrop"></div>
<div class="overlay-container">
<div class="alert-container">
<div class="alert-header">
Do you like cookies?
</div>
<div class="alert-content">
Seriously, who does not like cookies.
</div>
<div class="alert-actions">
<button primary>OK</button>
</div>
</div>
</div>`
})
export class Alert {}
*/

49
ionic/components/alert/extensions/ios.scss
View File

@ -1,49 +0,0 @@
// Alert
// --------------------------------------------------
$alert-ios-min-height: 80px !default;
$alert-ios-content-margin: 15px !default;
$alert-ios-background-color: #e8e8e8 !default;
$alert-ios-border-color: #b5b5b5 !default;
$alert-ios-border-radius: 15px !default;
$alert-ios-button-color: #007aff !default;
$alert-ios-button-font-size: 2rem !default;
.alert[mode="ios"] {
.alert-container {
border-radius: $alert-ios-border-radius;
background: $alert-ios-background-color;
text-align: center;
}
.alert-header {
margin: $alert-ios-content-margin;
}
.alert-content {
position: relative;
margin: $alert-ios-content-margin 0 0;
padding: 0 $alert-ios-content-margin $alert-ios-content-margin;
min-height: $alert-ios-min-height;
@include hairline(bottom, $alert-ios-border-color);
}
.alert-actions {
min-height: 44px;
button,
[button] {
flex: 1;
border: 0;
background: transparent;
font-size: $alert-ios-button-font-size;
font-weight: 400;
color: $alert-ios-button-color;
}
}
}

42
ionic/components/alert/extensions/material.scss
View File

@ -1,42 +0,0 @@
// Material Design Alert
// --------------------------------------------------
$alert-material-content-margin: 24px !default;
$alert-material-background-color: #fff !default;
$alert-material-border-radius: 4px !default;
$alert-material-box-shadow: 0px 27px 24px 0 rgba(0, 0, 0, 0.2) !default;
.alert[mode="md"] {
.alert-container {
box-shadow: $alert-material-box-shadow;
border-radius: $alert-material-border-radius;
overflow: hidden;
}
.alert-header {
margin: $alert-material-content-margin;
font-size: 2rem;
font-weight: 400;
}
.alert-content {
position: relative;
margin: $alert-material-content-margin;
background: $alert-material-background-color;
}
.alert-actions {
min-height: 44px;
background: $alert-material-background-color;
margin: $alert-material-content-margin;
button,
[button] {
border: 0;
}
}
}

17
ionic/components/alert/test/basic/index.ts
View File

@ -1,17 +0,0 @@
import {App, Alert} from 'ionic/ionic';
@App({
templateUrl: 'main.html'
})
class IonicApp {
constructor(alert: Alert) {
this.alert = alert;
}
showAlert() {
this.alert.open({
});
}
}

8
ionic/components/alert/test/basic/main.html
View File

@ -1,8 +0,0 @@
<ion-view>
<button primary (click)="showAlert()">Alert</button>
<!--
<ion-alert>
</ion-alert>
-->
</ion-view>

2
ionic/components/modal/modal.scss
View File

@ -1,6 +1,6 @@
// Modals
// --------------------------
// --------------------------------------------------
$modal-bg-color: #fff !default;
$modal-backdrop-bg-active: #000 !default;

28
ionic/components/popup/popup.scss
View File

@ -1,6 +1,6 @@
// Modals
// --------------------------
// Popups
// --------------------------------------------------
$popup-width: 250px !default;
@ -18,12 +18,8 @@ $popup-button-min-height: 45px !default;
$popup-backdrop-color: #000 !default;
$popup-backdrop-active-opacity: 0.4 !default;
/**
* Popups
* --------------------------------------------------
*/
.popup-backdrop {
.popup-backdrop {
z-index: $z-index-popup-backdrop;
position: absolute;
top: 0;
@ -33,8 +29,7 @@ $popup-backdrop-active-opacity: 0.4 !default;
background-color: $popup-backdrop-color;
opacity: 0;
tranform: translateZ(0);
}
}
ion-popup {
position: absolute;
@ -74,17 +69,20 @@ ion-popup {
border-bottom: 1px solid #eee;
text-align: center;
}
h3.popup-title {
margin: 0;
padding: 0;
font-size: 15px;
}
.popup-sub-title {
margin: 5px 0 0 0;
padding: 0;
font-weight: normal;
font-size: 11px;
}
.popup-body {
padding: 10px;
overflow: auto;
@ -109,15 +107,3 @@ h3.popup-title {
}
}
}
.popup-open {
pointer-events: none;
&.modal-open .modal {
pointer-events: none;
}
.popup-backdrop, .popup {
pointer-events: auto;
}
}

5
ionic/components/slides/slides.scss
View File

@ -1,5 +1,10 @@
// Slides
// --------------------------------------------------
$z-index-slider-pager: 1 !default;
.slides {
display: block;
width: 100%;

3
ionic/components/view/view.scss
View File

@ -1,4 +1,7 @@
// View
// --------------------------------------------------
ion-view {
display: flex;
position: absolute;

3
ionic/ionic.scss
View File

@ -18,7 +18,6 @@
"components/toolbar/toolbar",
"components/toolbar/toolbar-buttons",
"components/action-menu/action-menu",
"components/alert/alert",
"components/aside/aside",
"components/badge/badge",
"components/button/button",
@ -50,7 +49,6 @@
@import
"components/toolbar/extensions/ios",
"components/action-menu/extensions/ios",
"components/alert/extensions/ios",
"components/button/extensions/ios",
"components/card/extensions/ios",
"components/checkbox/extensions/ios",
@ -74,7 +72,6 @@
"components/toolbar/extensions/material",
"components/app/extensions/material",
"components/action-menu/extensions/material",
"components/alert/extensions/material",
"components/button/extensions/material",
"components/card/extensions/material",
"components/checkbox/extensions/material",