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

start form updates

Browse Source
This commit is contained in:
Adam Bradley
2013-10-13 22:05:20 -05:00
parent 9f2103dc94
commit 84eb9dfa22
5 changed files with 1960 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

15
dist/css/ionic.css vendored
View File

@ -1,4 +1,3 @@
@charset "UTF-8";
@font-face { @font-face {
font-family: 'ionicons'; font-family: 'ionicons';
src: url("fonts/ionicons.eot"); src: url("fonts/ionicons.eot");
@ -2308,21 +2307,17 @@ textarea {
.input-group { .input-group {
overflow: hidden; overflow: hidden;
/* border-top: 1px solid #cccccc;
border-top: $input-border-width solid $input-border-color; border-bottom: 1px solid #cccccc;
border-bottom: $input-border-width solid $input-border-color; background-color: white; }
background-color: $input-bg;
*/ }
.padded > .input-group, .padded > .input-group,
.input-group.inset { .input-group.inset {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
/* border-right: 1px solid #cccccc;
border-right: $input-border-width solid $input-border-color; border-left: 1px solid #cccccc; }
border-left: $input-border-width solid $input-border-color;
*/ }
.input-group .input-wrapper + .input-wrapper { .input-group .input-wrapper + .input-wrapper {
border-top: 1px solid #cccccc; } border-top: 1px solid #cccccc; }

4
scss/ionic/_form.scss
View File

@ -49,19 +49,15 @@ textarea {
.input-group { .input-group {
overflow: hidden; overflow: hidden;
/*
border-top: $input-border-width solid $input-border-color; border-top: $input-border-width solid $input-border-color;
border-bottom: $input-border-width solid $input-border-color; border-bottom: $input-border-width solid $input-border-color;
background-color: $input-bg; background-color: $input-bg;
*/
} }
.padded > .input-group, .padded > .input-group,
.input-group.inset { .input-group.inset {
@include border-radius($input-border-radius); @include border-radius($input-border-radius);
/*
border-right: $input-border-width solid $input-border-color; border-right: $input-border-width solid $input-border-color;
border-left: $input-border-width solid $input-border-color; border-left: $input-border-width solid $input-border-color;
*/
} }
.input-group .input-wrapper + .input-wrapper { .input-group .input-wrapper + .input-wrapper {

11
test/index.html
View File

@ -2,11 +2,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Ionic Tests</title> <title>Ionic Tests</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<!-- Sets initial viewport load and disables zooming --> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <link href="../dist/css/ionic.css" rel="stylesheet">
<link href="../dist/ionicons.css" rel="stylesheet">
<link href="../dist/ionic.css" rel="stylesheet">
</head> </head>
<body> <body>
@ -52,8 +50,7 @@
} }
</script> </script>
<script src="../dist/ionic.js"></script> <script src="../dist/js/ionic.js"></script>
<script src="../dist/ionic-simple.js"></script>
</body> </body>
</html> </html>

6
test/input-text.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>
@ -261,8 +260,5 @@
</section> </section>
<script src="../dist/ionic.js"></script>
<script src="../dist/ionic-simple.js"></script>
</body> </body>
</html> </html>