Skip to content

Commit 16dbdbd

Browse files
committed
Merge branch 'master' into v3.3.0
Conflicts: docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js
2 parents aa85e76 + 15d668d commit 16dbdbd

File tree

9 files changed

+67
-7
lines changed

9 files changed

+67
-7
lines changed

dist/css/bootstrap-theme.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/bootstrap-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/assets/js/raw-files.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/bootstrap-theme.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/bootstrap-theme.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/dist/css/bootstrap-theme.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

less/theme.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@
218218
text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);
219219
#gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));
220220
border-color: darken(@list-group-active-border, 7.5%);
221+
222+
.badge {
223+
text-shadow: none;
224+
}
221225
}
222226

223227

test-infra/npm-shrinkwrap.json

Lines changed: 48 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)