From d95a6526188f60562f8f7024592f5bbb85162fe6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 1 May 2014 16:19:19 -0400 Subject: improve CSS --- .../stylesheets/application/bootstrapify.scss | 35 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-) (limited to 'app/assets/stylesheets/application/bootstrapify.scss') diff --git a/app/assets/stylesheets/application/bootstrapify.scss b/app/assets/stylesheets/application/bootstrapify.scss index 0416b1e..08421f9 100644 --- a/app/assets/stylesheets/application/bootstrapify.scss +++ b/app/assets/stylesheets/application/bootstrapify.scss @@ -1,10 +1,16 @@ @import "bootstrap"; +// Connect Bootstrap classes to reasonable defaults + .btn { @extend .btn-default; } -a[role="button"], button, input[type="submit"] { +button, +a[role="button"], +input[type="submit"], +input[type="reset"], +input[type="button"] { @extend .btn; } @@ -20,21 +26,21 @@ a[role="button"], button, input[type="submit"] { } } form { + // This list of types is taken from the 2014-04-29 draft of + // the HTML5 spec: + // http://www.w3.org/TR/2014/CR-html5-20140429/forms.html#attr-input-type input[type="text"], input[type="search"], input[type="tel"], input[type="url"], input[type="email"], input[type="password"], - input[type="datetime"], input[type="date"], - input[type="month"], - input[type="week"], input[type="time"], input[type="number"], input[type="range"], input[type="color"], - select, textarea{ + select, textarea { @extend .form-control; } label { @@ -64,3 +70,22 @@ header nav { @extend .panel-title; } } + +// Connect built-in Rails classes to the Bootstrap classes. + +form { + .field { + @extend .form-group; + } + .field_with_errors { + @extend .has-error; + display: inline; + } +} + +#error_explanation { + @extend .panel-danger; + @extend .container; + padding-left: 0; + padding-right: 0; +} -- cgit v1.2.3