Skip to content

Commit

Permalink
fix(labels): Fix .input-label's width for androids w/out full flex bo…
Browse files Browse the repository at this point in the history
…x support, #998
  • Loading branch information
adamdbradley committed Apr 2, 2014
1 parent 87d3a25 commit 096a01c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions scss/_form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,10 @@ textarea {

.input-label {
@include flex(1, 0, 100px);
display: table;
padding: 7px 10px 7px 3px;
max-width: 200px;
width: 35%;
color: $input-label-color;
font-weight: bold;
font-size: $font-size-base;
Expand Down
12 changes: 6 additions & 6 deletions test/html/input-text.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
<link href="../../dist/css/ionic.css" rel="stylesheet">
<script src="../../dist/js/ionic.bundle.js"></script>
<script>
angular.module('ionicApp', ['ionic'])
angular.module('ionicApp', ['ionic']);
</script>
</head>
<body class="ionic-pseudo" ng-app="ionicApp">
<body ng-app="ionicApp">

<header class="bar bar-header bar-dark">
<h1 class="title">Text Inputs</h1>
</header>

<ion-content has-header="true">
<ion-content class="has-header">

<h3>Default Text Input, Not Inset, No Content Padding</h3>
<div class="list">
Expand Down Expand Up @@ -239,7 +239,7 @@ <h3>Default Text Input, list-inset, No Parent Content Padding</h3>
<h3>Stacked Label On Top Of Text Input, No Parent Content Padding</h3>
<div class="list">
<label class="item item-input item-stacked-label">
<i class="icon ion-email"></i>
<i class="icon ion-email"></i>
<span class="input-label">Email</span>
<input type="text" placeholder="your@email.com">
</label>
Expand All @@ -250,7 +250,7 @@ <h3>Stacked Label On Top Of Text Input, No Parent Content Padding</h3>
<h3>Stacked Label On Top Of Text Input, With Parent Content Padding</h3>
<div class="list">
<label class="item item-input item-stacked-label">
<i class="icon ion-cloud"></i>
<i class="icon ion-cloud"></i>
<span class="input-label">SaaS</span>
<input type="text" placeholder="Codiqa">
</label>
Expand All @@ -259,7 +259,7 @@ <h3>Stacked Label On Top Of Text Input, With Parent Content Padding</h3>
<h3>Stacked Label On Top Of Text Input, list-inset, With Parent Content Padding</h3>
<div class="list list-inset">
<label class="item item-input item-stacked-label">
<i class="icon ion-headphone"></i>
<i class="icon ion-headphone"></i>
<span class="input-label">Favorite Music</span>
<input type="text" placeholder="Bee Gees">
</label>
Expand Down

0 comments on commit 096a01c

Please sign in to comment.