diff options
| author | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
| commit | 31956be6ef6d1b1a2537c3441e69120ef3c99a2b (patch) | |
| tree | a118376f0f415826265828377904778f8e788b44 /docs/assets/css/_src/docs.css | |
| parent | 510f4fe50ad30499adf1d19dd65ef694c414aacd (diff) | |
| parent | be18f50fd0e36e35342a100216b01fe00692d0db (diff) | |
| download | bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.tar.xz bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap-rtl.css
dist/css/bootstrap.css.map
dist/js/bootstrap.min.js
docs/dist/css/bootstrap.css.map
docs/dist/js/bootstrap.min.js
Diffstat (limited to 'docs/assets/css/_src/docs.css')
| -rw-r--r-- | docs/assets/css/_src/docs.css | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/assets/css/_src/docs.css b/docs/assets/css/_src/docs.css index bbc3ff669..3be2431c4 100644 --- a/docs/assets/css/_src/docs.css +++ b/docs/assets/css/_src/docs.css @@ -1111,6 +1111,8 @@ h1[id] { padding: 0; margin-top: 0; margin-bottom: 0; + word-break: normal; + word-wrap: nowrap; white-space: nowrap; background-color: transparent; border: 0; |