mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Alexandr Kondrashov
2015-12-08 02:18:32 +03:00
parent c9725926b2 afbaf43505
commit 5f316e6dc3
225 changed files with 9256 additions and 11341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scss/_custom-forms.scss
+3 -3
View File
@@ -142,7 +142,7 @@
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;
@@ -199,7 +199,7 @@
color: #555;
user-select: none;
background-color: #fff;
border: .075rem solid #ddd;
border: $input-border-width solid #ddd;
border-radius: .25rem;
@include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05));
}
@@ -219,7 +219,7 @@
color: #555;
content: "Browse";
background-color: #eee;
border: .075rem solid #ddd;
border: $input-border-width solid #ddd;
border-radius: 0 .25rem .25rem 0;
}