From: Alexandr Kondrashov <thekondrashov@gmail.com>
Date: Mon, 7 Dec 2015 23:18:32 +0000 (+0300)
Subject: Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
X-Git-Tag: v4.0.0-alpha.3~301^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into patch-1
---

5f316e6dc34f57bfbd0ebf922fe5a01cc6bb38c4
diff --cc scss/_custom-forms.scss
index ebca1e1ec2,16527eb262..ae5fc3d934
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@@ -135,14 -135,10 +135,14 @@@
    padding: .375rem 1.75rem .375rem .75rem;
    padding-right: .75rem \9;
    vertical-align: middle;
 +<<<<<<< HEAD
 +	background: #fff url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0IDUiPjxwYXRoIGZpbGw9IiMzMzMiIGQ9Ik0yIDBMMCAyaDR6bTAgNUwwIDNoNHoiLz48L3N2Zz4=) no-repeat right .75rem center;
 +=======
    background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center;
    background-image: none \9;
 +>>>>>>> twbs/v4-dev
    background-size: 8px 10px;
-   border: 1px solid $input-border;
+   border: $input-border-width solid $input-border-color;
    // Use vendor prefixes as `appearance` isn't part of the CSS spec.
    -moz-appearance: none;
    -webkit-appearance: none;