diff options
| author | Thomas Park <thomas@thomaspark.co> | 2015-07-02 15:42:29 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.co> | 2015-07-02 15:42:29 -0400 |
| commit | e9350501245de8f33b16a58ef41ed54ac196e769 (patch) | |
| tree | 92f7e7bad0804180202d4e9f150f120f65ee3507 /paper | |
| parent | d2246acacb1c9ae45a70ab36f3ca980cded0c75b (diff) | |
| parent | 8dbfa444a3d3fa6a8468c302ac6c053a2ce55213 (diff) | |
Merge pull request #482 from marnusw/paperAddon
Paper: Reset input-addon feedback styles.
Diffstat (limited to 'paper')
| -rw-r--r-- | paper/_bootswatch.scss | 9 | ||||
| -rw-r--r-- | paper/bootswatch.less | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/paper/_bootswatch.scss b/paper/_bootswatch.scss index a70a97c1..e9256ded 100644 --- a/paper/_bootswatch.scss +++ b/paper/_bootswatch.scss @@ -374,6 +374,15 @@ input[type="checkbox"], } } +// Remove the Bootstrap feedback styles for input addons +.input-group-addon { + .has-warning &, .has-error &, .has-success & { + color: $input-color; + border-color: $input-group-addon-border-color; + background-color: $input-group-addon-bg; + } +} + // Navs ======================================================================= .nav-tabs { diff --git a/paper/bootswatch.less b/paper/bootswatch.less index f35bb2d1..b7ddcf63 100644 --- a/paper/bootswatch.less +++ b/paper/bootswatch.less @@ -374,6 +374,15 @@ input[type="checkbox"], } } +// Remove the Bootstrap feedback styles for input addons +.input-group-addon { + .has-warning &, .has-error &, .has-success & { + color: @input-color; + border-color: @input-group-addon-border-color; + background-color: @input-group-addon-bg; + } +} + // Navs ======================================================================= .nav-tabs { |