From 4606bee4cb1e78750ee98eb5b2dac857e16e3049 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 23 Jul 2015 14:28:33 -0500 Subject: [PATCH] remove `alert` --- ionic/components/alert/alert.scss | 41 ---------------- ionic/components/alert/alert.ts | 24 --------- ionic/components/alert/extensions/ios.scss | 49 ------------------- .../components/alert/extensions/material.scss | 42 ---------------- ionic/components/alert/test/basic/index.ts | 17 ------- ionic/components/alert/test/basic/main.html | 8 --- ionic/components/modal/modal.scss | 2 +- ionic/components/popup/popup.scss | 28 +++-------- ionic/components/slides/slides.scss | 5 ++ ionic/components/view/view.scss | 3 ++ ionic/ionic.scss | 3 -- 11 files changed, 16 insertions(+), 206 deletions(-) delete mode 100644 ionic/components/alert/alert.scss delete mode 100644 ionic/components/alert/alert.ts delete mode 100644 ionic/components/alert/extensions/ios.scss delete mode 100644 ionic/components/alert/extensions/material.scss delete mode 100644 ionic/components/alert/test/basic/index.ts delete mode 100644 ionic/components/alert/test/basic/main.html diff --git a/ionic/components/alert/alert.scss b/ionic/components/alert/alert.scss deleted file mode 100644 index b2007cea6b..0000000000 --- a/ionic/components/alert/alert.scss +++ /dev/null @@ -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; -} diff --git a/ionic/components/alert/alert.ts b/ionic/components/alert/alert.ts deleted file mode 100644 index e75e7bce5e..0000000000 --- a/ionic/components/alert/alert.ts +++ /dev/null @@ -1,24 +0,0 @@ - -/* -@Component({ - selector: 'ion-alert' -}) -@NgView({ - template: ` -
-
-
-
- Do you like cookies? -
-
- Seriously, who does not like cookies. -
-
- -
-
-
` -}) -export class Alert {} -*/ diff --git a/ionic/components/alert/extensions/ios.scss b/ionic/components/alert/extensions/ios.scss deleted file mode 100644 index a18771bfd8..0000000000 --- a/ionic/components/alert/extensions/ios.scss +++ /dev/null @@ -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; - } - } - -} diff --git a/ionic/components/alert/extensions/material.scss b/ionic/components/alert/extensions/material.scss deleted file mode 100644 index d97ddeb93c..0000000000 --- a/ionic/components/alert/extensions/material.scss +++ /dev/null @@ -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; - } - } - -} diff --git a/ionic/components/alert/test/basic/index.ts b/ionic/components/alert/test/basic/index.ts deleted file mode 100644 index 94ccd80912..0000000000 --- a/ionic/components/alert/test/basic/index.ts +++ /dev/null @@ -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({ - - }); - } -} diff --git a/ionic/components/alert/test/basic/main.html b/ionic/components/alert/test/basic/main.html deleted file mode 100644 index 15bba22dca..0000000000 --- a/ionic/components/alert/test/basic/main.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/ionic/components/modal/modal.scss b/ionic/components/modal/modal.scss index 3738882a88..e780a8d570 100644 --- a/ionic/components/modal/modal.scss +++ b/ionic/components/modal/modal.scss @@ -1,6 +1,6 @@ // Modals -// -------------------------- +// -------------------------------------------------- $modal-bg-color: #fff !default; $modal-backdrop-bg-active: #000 !default; diff --git a/ionic/components/popup/popup.scss b/ionic/components/popup/popup.scss index 3ea253bad9..1d784cb2fa 100644 --- a/ionic/components/popup/popup.scss +++ b/ionic/components/popup/popup.scss @@ -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; - } -} diff --git a/ionic/components/slides/slides.scss b/ionic/components/slides/slides.scss index a0d9cc6fa8..ed20b91a86 100644 --- a/ionic/components/slides/slides.scss +++ b/ionic/components/slides/slides.scss @@ -1,5 +1,10 @@ + +// Slides +// -------------------------------------------------- + $z-index-slider-pager: 1 !default; + .slides { display: block; width: 100%; diff --git a/ionic/components/view/view.scss b/ionic/components/view/view.scss index fd0e03a9b7..042a49e86a 100644 --- a/ionic/components/view/view.scss +++ b/ionic/components/view/view.scss @@ -1,4 +1,7 @@ +// View +// -------------------------------------------------- + ion-view { display: flex; position: absolute; diff --git a/ionic/ionic.scss b/ionic/ionic.scss index afdfc37896..1f1290afe0 100755 --- a/ionic/ionic.scss +++ b/ionic/ionic.scss @@ -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",