Merge branch 'glyphicons_font' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less

diff --cc Makefile
index 6687947423df6337b039c7ab4c6a479b1da253e9,26297ad99cdd15c18532037160576b32201f995e..3acd16e62b1072cd0a642003e2d40ab837fcb6d6
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -17,9 -19,10 +17,9 @@@ build
        @jshint js/tests/unit/*.js --config js/.jshintrc
        @echo "Running JSHint on javascript...             ${CHECK} Done"
        @recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
 -      @recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
        @echo "Compiling LESS with Recess...               ${CHECK} Done"
        @node docs/build
-       @cp img/* docs/assets/img/
+       @cp fonts/* docs/assets/fonts/
        @cp js/*.js docs/assets/js/
        @cp js/tests/vendor/jquery.js docs/assets/js/
        @echo "Compiling documentation...                  ${CHECK} Done"
@@@ -60,12 -63,14 +60,12 @@@ clean
  #
  
  bootstrap:
-       mkdir -p bootstrap/img
+       mkdir -p bootstrap/fonts
        mkdir -p bootstrap/css
        mkdir -p bootstrap/js
-       cp img/* bootstrap/img/
+       cp fonts/* bootstrap/fonts/
        recess --compile ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.css
        recess --compress ${BOOTSTRAP_LESS} > bootstrap/css/bootstrap.min.css
 -      recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
 -      recess --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
        cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > bootstrap/js/bootstrap.js
        uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
        echo "/*!\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js

diff --cc docs/assets/css/bootstrap.css
index 1241ac6874560d63bd6e0ad4b170e764c19522b5,2600fc4d49441fefc8d30525248181bbff8f1ea6..7320e6da42ba00e16d3a3d39bc9e6568eff6a466
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -968,72 -1193,28 +968,72 @@@ textarea::-webkit-input-placeholder 
    margin-left: 10px;
  }
  
 -.input-mini {
 -  width: 60px;
 -}
 -
 -.input-small {
 -  width: 90px;
 -}
 -
 -.input-medium {
 -  width: 150px;
 -}
 -
 -.input-large {
 -  width: 210px;
 -}
 -
 -.input-xlarge {
 -  width: 270px;
 -}
 -
 -.input-xxlarge {
 -  width: 530px;
 +select.input-large,
 +textarea.input-large,
 +input[type="text"].input-large,
 +input[type="password"].input-large,
 +input[type="datetime"].input-large,
 +input[type="datetime-local"].input-large,
 +input[type="date"].input-large,
 +input[type="month"].input-large,
 +input[type="time"].input-large,
 +input[type="week"].input-large,
 +input[type="number"].input-large,
 +input[type="email"].input-large,
 +input[type="url"].input-large,
 +input[type="search"].input-large,
 +input[type="tel"].input-large,
 +input[type="color"].input-large,
 +.uneditable-input.input-large {
 +  padding: 11px 19px;
 +  padding-right: 14px;
 +  padding-left: 14px;
 +  font-size: 17.5px;
 +  border-radius: 6px;
 +}
 +
 +select.input-small,
 +textarea.input-small,
 +input[type="text"].input-small,
 +input[type="password"].input-small,
 +input[type="datetime"].input-small,
 +input[type="datetime-local"].input-small,
 +input[type="date"].input-small,
 +input[type="month"].input-small,
 +input[type="time"].input-small,
 +input[type="week"].input-small,
 +input[type="number"].input-small,
 +input[type="email"].input-small,
 +input[type="url"].input-small,
 +input[type="search"].input-small,
 +input[type="tel"].input-small,
 +input[type="color"].input-small,
 +.uneditable-input.input-small {
 +  padding: 2px 10px;
 +  font-size: 11.9px;
 +  border-radius: 3px;
 +}
 +
 +select.input-mini,
 +textarea.input-mini,
 +input[type="text"].input-mini,
 +input[type="password"].input-mini,
 +input[type="datetime"].input-mini,
 +input[type="datetime-local"].input-mini,
 +input[type="date"].input-mini,
 +input[type="month"].input-mini,
 +input[type="time"].input-mini,
 +input[type="week"].input-mini,
 +input[type="number"].input-mini,
 +input[type="email"].input-mini,
 +input[type="url"].input-mini,
 +input[type="search"].input-mini,
 +input[type="tel"].input-mini,
 +input[type="color"].input-mini,
 +.uneditable-input.input-mini {
-   padding: 1px 6px;
++  padding: 0 6px;
 +  font-size: 10.5px;
 +  border-radius: 3px;
  }
  
  input[class*="span"],
@@@ -2897,31 -3217,36 +2958,30 @@@ button.close 
  .btn-large {
    padding: 11px 19px;
    font-size: 17.5px;
 -  -webkit-border-radius: 6px;
 -     -moz-border-radius: 6px;
 -          border-radius: 6px;
 +  border-radius: 6px;
  }
  
- .btn-large [class^="icon-"],
- .btn-large [class*=" icon-"] {
-   margin-top: 2px;
- }
- 
  .btn-small {
    padding: 2px 10px;
    font-size: 11.9px;
 -  -webkit-border-radius: 3px;
 -     -moz-border-radius: 3px;
 -          border-radius: 3px;
 +  border-radius: 3px;
  }
  
- .btn-small [class^="icon-"],
- .btn-small [class*=" icon-"] {
-   margin-top: 0;
- }
- 
  .btn-mini {
-   padding: 1px 6px;
+   padding: 0 6px;
    font-size: 10.5px;
 -  -webkit-border-radius: 3px;
 -     -moz-border-radius: 3px;
 -          border-radius: 3px;
 +  border-radius: 3px;
  }
  
+ .btn [class^="glyphicon-"]::before {
+   vertical-align: -2px;
+ }
+ 
+ .btn-small [class^="glyphicon-"]::before,
+ .btn-mini [class^="glyphicon-"]::before {
+   vertical-align: -1px;
+ }
+ 
  .btn-block {
    display: block;
    width: 100%;

diff --cc docs/assets/css/docs.css
index 335d05a02c1bfcaa416b6119181baabfaa4460c6,eaa28915d10255a348b928bd1a9d9c3059e14199..c3fbf0c2c686f1e0bde6f23d830ff1b205f89998
--- 1/docs/assets/css/docs.css
--- 2/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@@ -754,20 -750,59 +758,21 @@@ form.bs-docs-example 
  .bs-docs-sidenav {
    width: 228px;
    margin: 30px 0 0;
 -  padding: 0;
 -  background-color: #fff;
 -  -webkit-border-radius: 6px;
 -     -moz-border-radius: 6px;
 -          border-radius: 6px;
 -  -webkit-box-shadow: 0 1px 4px rgba(0,0,0,.065);
 -     -moz-box-shadow: 0 1px 4px rgba(0,0,0,.065);
 -          box-shadow: 0 1px 4px rgba(0,0,0,.065);
 -}
 -.bs-docs-sidenav > li > a {
 -  display: block;
 -  width: 190px \9;
 -  margin: 0 0 -1px;
 -  padding: 8px 14px;
 -  border: 1px solid #e5e5e5;
 -}
 -.bs-docs-sidenav > li:first-child > a {
 -  -webkit-border-radius: 6px 6px 0 0;
 -     -moz-border-radius: 6px 6px 0 0;
 -          border-radius: 6px 6px 0 0;
 -}
 -.bs-docs-sidenav > li:last-child > a {
 -  -webkit-border-radius: 0 0 6px 6px;
 -     -moz-border-radius: 0 0 6px 6px;
 -          border-radius: 0 0 6px 6px;
 -}
 -.bs-docs-sidenav > .active > a {
 -  position: relative;
 -  z-index: 2;
 -  padding: 9px 15px;
 -  border: 0;
 -  text-shadow: 0 1px 0 rgba(0,0,0,.15);
 -  -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
 -     -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
 -          box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
  }
  /* Chevrons */
- .bs-docs-sidenav .icon-chevron-right {
+ .bs-docs-sidenav .glyphicon-chevron-right {
    float: right;
-   margin-top: 2px;
+   margin-top: -2px;
    margin-right: -6px;
    opacity: .25;
+   color: #000;
  }
- .bs-docs-sidenav a:hover .icon-chevron-right {
 -.bs-docs-sidenav > li > a:hover {
 -  background-color: #f5f5f5;
 -}
+ .bs-docs-sidenav a:hover .glyphicon-chevron-right {
    opacity: .5;
  }
- .bs-docs-sidenav .active .icon-chevron-right,
- .bs-docs-sidenav .active a:hover .icon-chevron-right {
-   background-image: url(../img/glyphicons-halflings-white.png);
+ .bs-docs-sidenav .active .glyphicon-chevron-right,
+ .bs-docs-sidenav .active a:hover .glyphicon-chevron-right {
+   color: #fff;
    opacity: 1;
  }
  .bs-docs-sidenav.affix {

diff --cc docs/base-css.html
Simple merge

diff --cc docs/templates/pages/base-css.mustache
Simple merge

diff --cc less/bootstrap.less
Simple merge

diff --cc less/buttons.less
index 85eee44b0e3e4ffabc439a8a39ad8cfca33c54d1,45bd07604663624f667ff38f58c331a28e2b9fdf..e93d4d603a61b48c22b155c1a35773c373892fd5
--- 1/less/buttons.less
--- 2/less/buttons.less
+++ b/less/buttons.less
@@@ -70,23 -74,15 +69,15 @@@
  .btn-large {
    padding: @paddingLarge;
    font-size: @fontSizeLarge;
 -  .border-radius(@borderRadiusLarge);
 +  border-radius: @borderRadiusLarge;
  }
- .btn-large [class^="icon-"],
- .btn-large [class*=" icon-"] {
-   margin-top: 2px;
- }
  
  // Small
  .btn-small {
    padding: @paddingSmall;
    font-size: @fontSizeSmall;
 -  .border-radius(@borderRadiusSmall);
 +  border-radius: @borderRadiusSmall;
  }
- .btn-small [class^="icon-"],
- .btn-small [class*=" icon-"] {
-   margin-top: 0;
- }
  
  // Mini
  .btn-mini {

diff --cc less/variables.less
Simple merge