From d1fec4145e9abdc31f165efedb6bec8b06a94ba9 Mon Sep 17 00:00:00 2001 From: Yves Gatesoupe Date: Fri, 30 Sep 2016 11:15:28 +0200 Subject: [PATCH] fix(component): input group input group addon black border cleaned orange-css --- scss/_o-forms.scss | 27 +++++++++++++++++++++++---- scss/_orange-css.scss | 19 ------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/scss/_o-forms.scss b/scss/_o-forms.scss index 5733147e94..d9e59f71df 100644 --- a/scss/_o-forms.scss +++ b/scss/_o-forms.scss @@ -2,11 +2,16 @@ // Orange forms // -.input-group > .form-control { - border-color: #000; +.input-group { + & > .input-group-addon, + & > .form-control { + border-color: #000; + } - &:focus { - border-color: $brand-primary; + & > .form-control { + &:focus { + border-color: $brand-primary; + } } } @@ -156,3 +161,17 @@ } } } + +// Reposition feedback icon if input has visible label above +.has-feedback label { + ~ .form-control-feedback { + top: ($line-height-base + .5); // Height of the `label` and its margin + } +} + +.form-group { + input[type="radio"], + input[type="checkbox"] { + width: auto; + } +} diff --git a/scss/_orange-css.scss b/scss/_orange-css.scss index 2d43765b30..12f30bc52e 100644 --- a/scss/_orange-css.scss +++ b/scss/_orange-css.scss @@ -232,22 +232,3 @@ caption { .well { font-weight: bold; } - -// bits from bootstrap-orange2015.less - -// Reposition feedback icon if input has visible label above -.has-feedback label { - ~ .form-control-feedback { - top: ($line-height-base + .5); // Height of the `label` and its margin - } -} - -// -// Forms -// -.form-group { - input[type="radio"], - input[type="checkbox"] { - width: auto; - } -}