javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/driftyco/ionic

Browse Source 
Conflicts:
	dist/css/ionic-ios7.css
This commit is contained in:
Max Lynch
2013-10-13 22:10:09 -05:00
parent 80f616cb43 84eb9dfa22
commit 2f2cf12471
7 changed files with 2606 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dist/css/ionic.css vendored
View File

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