Merge branch 'master' into v3.3.0

Conflicts: docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js
wjcccc · Oct 29, 2014 · 16dbdbd · 16dbdbd
2 parents aa85e76 + 15d668d
commit 16dbdbd
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 7 deletions.
diff --git a/dist/css/bootstrap-theme.css b/dist/css/bootstrap-theme.css
diff --git a/dist/css/bootstrap-theme.css.map b/dist/css/bootstrap-theme.css.map
diff --git a/dist/css/bootstrap-theme.min.css b/dist/css/bootstrap-theme.min.css
diff --git a/docs/assets/js/raw-files.min.js b/docs/assets/js/raw-files.min.js
diff --git a/docs/dist/css/bootstrap-theme.css b/docs/dist/css/bootstrap-theme.css
diff --git a/docs/dist/css/bootstrap-theme.css.map b/docs/dist/css/bootstrap-theme.css.map
diff --git a/docs/dist/css/bootstrap-theme.min.css b/docs/dist/css/bootstrap-theme.min.css
diff --git a/less/theme.less b/less/theme.less
@@ -218,6 +218,10 @@
   text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
   #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
   border-color: darken(@list-group-active-border, 7.5%);
+
+  .badge {
+    text-shadow: none;
+  }
 }
 
 

diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json