diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 2a35ea676d..de18e897b9 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -20,7 +20,7 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, +article, aside, canvas, details, embed, fieldset, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { @@ -1201,11 +1201,6 @@ a.list-item { form { margin: 0 0 1.42857; } -fieldset { - margin: 0; - padding: 0; - border: 0; } - legend { display: block; margin-bottom: 1.42857; @@ -1236,6 +1231,7 @@ textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .input-group { + display: block; overflow: hidden; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; @@ -1272,6 +1268,7 @@ textarea { .input-row .input-label { padding: 7px 10px 7px 3px; max-width: 200px; + color: black; font-weight: bold; flex: 1 0 100px; } .input-row [class^="icon-"], .input-row [class*=" icon-"] { diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index 1cf9d413fe..b40a461938 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -908,7 +908,7 @@ .ionic dl, .ionic dt, .ionic dd, .ionic ol, .ionic ul, .ionic li, .ionic fieldset, .ionic form, .ionic label, .ionic legend, .ionic table, .ionic caption, .ionic tbody, .ionic tfoot, .ionic thead, .ionic tr, .ionic th, .ionic td, - .ionic article, .ionic aside, .ionic canvas, .ionic details, .ionic embed, + .ionic article, .ionic aside, .ionic canvas, .ionic details, .ionic embed, .ionic fieldset, .ionic figure, .ionic figcaption, .ionic footer, .ionic header, .ionic hgroup, .ionic menu, .ionic nav, .ionic output, .ionic ruby, .ionic section, .ionic summary, .ionic time, .ionic mark, .ionic audio, .ionic video { @@ -1852,10 +1852,6 @@ line-height: 1.3; } .ionic form { margin: 0 0 1.42857; } - .ionic fieldset { - margin: 0; - padding: 0; - border: 0; } .ionic legend { display: block; margin-bottom: 1.42857; @@ -1883,6 +1879,7 @@ .ionic textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .ionic .input-group { + display: block; overflow: hidden; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; @@ -1915,6 +1912,7 @@ .ionic .input-row .input-label { padding: 7px 10px 7px 3px; max-width: 200px; + color: black; font-weight: bold; flex: 1 0 100px; } .ionic .input-row [class^="icon-"], .ionic .input-row [class*=" icon-"] { diff --git a/dist/css/ionic.css b/dist/css/ionic.css index c02f56e777..16756f44f1 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1084,7 +1084,7 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, +article, aside, canvas, details, embed, fieldset, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { @@ -2288,11 +2288,6 @@ a.list-item { form { margin: 0 0 1.42857; } -fieldset { - margin: 0; - padding: 0; - border: 0; } - legend { display: block; margin-bottom: 1.42857; @@ -2323,6 +2318,7 @@ textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } .input-group { + display: block; overflow: hidden; border-top: 1px solid #cccccc; border-bottom: 1px solid #cccccc; @@ -2359,6 +2355,7 @@ textarea { .input-row .input-label { padding: 7px 10px 7px 3px; max-width: 200px; + color: black; font-weight: bold; flex: 1 0 100px; } .input-row [class^="icon-"], .input-row [class*=" icon-"] { diff --git a/scss/ionic/_form.scss b/scss/ionic/_form.scss index a86478ced8..96f371b1df 100644 --- a/scss/ionic/_form.scss +++ b/scss/ionic/_form.scss @@ -7,12 +7,6 @@ form { margin: 0 0 $line-height-base; } -fieldset { - margin: 0; - padding: 0; - border: 0; -} - // Groups of fields with labels on top (legends) legend { display: block; @@ -52,6 +46,7 @@ textarea { // ------------------------------- .input-group { + display: block; overflow: hidden; border-top: $input-border-width solid $input-border-color; border-bottom: $input-border-width solid $input-border-color; @@ -90,6 +85,7 @@ textarea { .input-label { padding: 7px 10px 7px 3px; max-width: 200px; + color: $input-label-color; font-weight: bold; flex: 1 0 100px; } diff --git a/scss/ionic/_reset.scss b/scss/ionic/_reset.scss index b22a2cffd8..0627c37fba 100755 --- a/scss/ionic/_reset.scss +++ b/scss/ionic/_reset.scss @@ -20,7 +20,7 @@ b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, +article, aside, canvas, details, embed, fieldset, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video { diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss index 018f511448..d6d19e8b3d 100644 --- a/scss/ionic/_variables.scss +++ b/scss/ionic/_variables.scss @@ -123,6 +123,7 @@ $input-bg: $white !default; $input-bg-disabled: $gray-lighter !default; $input-color: $gray !default; +$input-label-color: $black !default; $input-border-color: #ccc !default; $input-border-width: 1px !default; $input-border-radius: 2px !default;