diff options
| author | Mark Otto <[email protected]> | 2014-07-12 16:15:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-12 16:15:45 -0700 |
| commit | 5cfde0d3a5819374e5f750b4fcfedfccc5c19889 (patch) | |
| tree | 54414858a401502baad20cc62a62db5f3f2ee242 /less/variables.less | |
| parent | f1e77198d4ecbc49013e0f011b381459d47d6315 (diff) | |
| parent | fe0ef388982399d8925ec7aa8a70c4b4df3aa7e6 (diff) | |
| download | bootstrap-5cfde0d3a5819374e5f750b4fcfedfccc5c19889.tar.xz bootstrap-5cfde0d3a5819374e5f750b4fcfedfccc5c19889.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/javascript/dropdowns.md
less/utilities.less
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/variables.less b/less/variables.less index 5a414b063..a12f37085 100644 --- a/less/variables.less +++ b/less/variables.less @@ -190,7 +190,7 @@ @input-box-shadow-focus: rgba(102,175,233,.6); //** Placeholder text color -@input-color-placeholder: @gray-light; +@input-color-placeholder: #999; //** Default `.form-control` height @input-height-base: ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + .2); |