From d78c4531580d80985a0b96f4fcc6281ec8ef542f Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 22 Oct 2013 09:43:37 -0500 Subject: [PATCH] alerts --- dist/css/ionic-ios7.css | 1 + dist/css/ionic-scoped.css | 1 + dist/css/ionic.css | 1 + scss/ionic/_alerts.scss | 3 ++- scss/ionic/_variables.scss | 5 ++++- test/alerts.html | 8 ++------ 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index b91aeef201..1f1faa08c4 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -1919,6 +1919,7 @@ a.button { top: -1px; } .alert { + margin: 10px; padding: 8px 35px 8px 14px; border: 1px solid #fbeed5; background-color: #fcf8e3; diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index d47307558e..18601f9244 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -2608,6 +2608,7 @@ position: relative; top: -1px; } .ionic .alert { + margin: 10px; padding: 8px 35px 8px 14px; border: 1px solid #fbeed5; background-color: #fcf8e3; diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 68c5c45aa5..691caf81f2 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -3140,6 +3140,7 @@ a.button { top: -1px; } .alert { + margin: 10px; padding: 8px 35px 8px 14px; border: 1px solid #fbeed5; background-color: #fcf8e3; diff --git a/scss/ionic/_alerts.scss b/scss/ionic/_alerts.scss index 50b6e63520..daa881aaa6 100644 --- a/scss/ionic/_alerts.scss +++ b/scss/ionic/_alerts.scss @@ -3,7 +3,8 @@ // -------------------------------------------------- .alert { - padding: 8px 35px 8px 14px; + margin: $alert-margin; + padding: $alert-padding; border: 1px solid $warning-border; background-color: $warning-bg; text-shadow: 0 1px 0 rgba(255,255,255,.5); diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss index ef8523f961..7672edc650 100644 --- a/scss/ionic/_variables.scss +++ b/scss/ionic/_variables.scss @@ -190,9 +190,12 @@ $range-slider-height: 20px; $range-slider-border-radius: 10px; -// Form States and Alerts +// Alerts // ------------------------------- +$alert-padding: 8px 35px 8px 14px; +$alert-margin: $content-padding; + $warning-text: #c09853; $warning-bg: #fcf8e3; $warning-border: darken(adjust-hue($warning-bg, -10), 3%); diff --git a/test/alerts.html b/test/alerts.html index 7cda0496a0..4858d4e6d4 100644 --- a/test/alerts.html +++ b/test/alerts.html @@ -5,8 +5,7 @@ - - + @@ -16,7 +15,7 @@

Alerts

-
+

Warning! Best check yo self, you're not looking too good. @@ -39,9 +38,6 @@

- - -