javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-07 23:16:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

alerts

Browse Source
This commit is contained in:
Adam Bradley
2013-10-22 09:43:37 -05:00
parent bbb8abd224
commit d78c453158
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dist/css/ionic-ios7.css vendored
View File

@ -1919,6 +1919,7 @@ a.button {
top: -1px; } top: -1px; }
.alert { .alert {
margin: 10px;
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
background-color: #fcf8e3; background-color: #fcf8e3;

1
dist/css/ionic-scoped.css vendored
View File

@ -2608,6 +2608,7 @@
position: relative; position: relative;
top: -1px; } top: -1px; }
.ionic .alert { .ionic .alert {
margin: 10px;
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
background-color: #fcf8e3; background-color: #fcf8e3;

1
dist/css/ionic.css vendored
View File

@ -3140,6 +3140,7 @@ a.button {
top: -1px; } top: -1px; }
.alert { .alert {
margin: 10px;
padding: 8px 35px 8px 14px; padding: 8px 35px 8px 14px;
border: 1px solid #fbeed5; border: 1px solid #fbeed5;
background-color: #fcf8e3; background-color: #fcf8e3;

3
scss/ionic/_alerts.scss
View File

@ -3,7 +3,8 @@
// -------------------------------------------------- // --------------------------------------------------
.alert { .alert {
padding: 8px 35px 8px 14px; margin: $alert-margin;
padding: $alert-padding;
border: 1px solid $warning-border; border: 1px solid $warning-border;
background-color: $warning-bg; background-color: $warning-bg;
text-shadow: 0 1px 0 rgba(255,255,255,.5); text-shadow: 0 1px 0 rgba(255,255,255,.5);

5
scss/ionic/_variables.scss
View File

@ -190,9 +190,12 @@ $range-slider-height: 20px;
$range-slider-border-radius: 10px; $range-slider-border-radius: 10px;
// Form States and Alerts // Alerts
// ------------------------------- // -------------------------------
$alert-padding: 8px 35px 8px 14px;
$alert-margin: $content-padding;
$warning-text: #c09853; $warning-text: #c09853;
$warning-bg: #fcf8e3; $warning-bg: #fcf8e3;
$warning-border: darken(adjust-hue($warning-bg, -10), 3%); $warning-border: darken(adjust-hue($warning-bg, -10), 3%);

8
test/alerts.html
View File

@ -5,8 +5,7 @@
<!-- Sets initial viewport load and disables zooming --> <!-- Sets initial viewport load and disables zooming -->
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="../dist/ionicons.css" rel="stylesheet"> <link href="../dist/css/ionic.css" rel="stylesheet">
<link href="../dist/ionic.css" rel="stylesheet">
</head> </head>
<body> <body>
@ -16,7 +15,7 @@
<h1 class="title">Alerts</h1> <h1 class="title">Alerts</h1>
</header> </header>
<main class="content padding has-header"> <main class="content has-header">
<p class="alert"> <p class="alert">
<strong>Warning!</strong> Best check yo self, you're not looking too good. <strong>Warning!</strong> Best check yo self, you're not looking too good.
@ -40,8 +39,5 @@
</section> </section>
<script src="../dist/ionic.js"></script>
<script src="../dist/ionic-simple.js"></script>
</body> </body>
</html> </html>