0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

3528 Commits

Author SHA1 Message Date
Mark Otto
b790ea9011 Merge pull request #12219 from ZDroid/rn
Rename docs/LICENSE-DOCS to docs/LICENSE
2014-01-18 14:49:00 -08:00
Mark Otto
032869a439 Merge pull request #12248 from twbs/bg-variant
refactoring: add & use .bg-variant() mixin
2014-01-18 14:47:29 -08:00
Julian Thilo
10a158ff93 Fix typos, sentences in getting-started.html 2014-01-18 23:46:32 +01:00
Mark Otto
2115ac525b Run grunt dist after adding 'a' requirement to the text emphasis classes 2014-01-18 14:40:48 -08:00
Mark Otto
b1721f42cc Merge branch 'master' of github.com:twbs/bootstrap 2014-01-18 14:09:17 -08:00
Mark Otto
c322612218 move migration docs to new separate page, leave callout on getting started page; fixes #12244 2014-01-18 14:09:09 -08:00
Julian Thilo
67594cb544 Fix holder.js links in examples
Replaces links to holder.js with links to the new docs.min.js.
The uncompressed holder.js file is now in docs/assets/js/vendor,
which is excluded from Jekyll builds. In turn, Holder is now
included in docs.min.js, which is smaller than holder.js,
so this should make everybody happy. :)
2014-01-18 22:58:05 +01:00
Mark Otto
a521e982d5 Merge pull request #12281 from XhmikosR/vendor
Move docs third-party libraries to a separate folder.
2014-01-18 11:42:34 -08:00
Mark Otto
7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -08:00
Julian Thilo
a56cf753ce Make spelling of Less uniform throughout the docs 2014-01-18 18:40:47 +01:00
Julian Thilo
092b1a47ef Fix typo in index.html 2014-01-18 18:15:37 +01:00
XhmikosR
4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Mark Otto
dcdf716eef copy 2014-01-17 19:04:14 -08:00
Chris Rebert
172de467eb present browser compatibility info in a table 2014-01-17 17:12:52 -08:00
Chris Rebert
d8c87ddc28 fix #12277
Thanks to @Quy for pointing these out.
2014-01-17 14:28:01 -08:00
Chris Rebert
c5bed1a850 Merge pull request #12275 from ZDroid/ncss
Replace Normalize with Normalize.css
2014-01-17 11:43:18 -08:00
Zlatan Vasović
93ab926dc7 Replace Normalize with Normalize.css 2014-01-17 20:22:32 +01:00
Chris Rebert
6af0013ac5 Revert "Add tooltip viewport option, respect bounds of the viewport"
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
2014-01-16 20:32:59 -08:00
Mark Otto
03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport
Conflicts:
	docs/javascript.html
2014-01-16 20:01:28 -08:00
Mark Otto
380019ccb2 Split box-sizing reset for faster rendering 2014-01-16 20:00:28 -08:00
Mark Otto
d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
fat
3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
patricker
47f786e6ea Update javascript.html
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been.  The correct tab of data would be displayed on load, but no tabs would be highlighted.  The tabs with fade example does not have this issue.  jsFiddle: http://jsfiddle.net/uXV56/
2014-01-16 11:41:34 -07:00
Chris Rebert
47ff60426d add Issues & Releases links back to footer 2014-01-15 17:29:54 -08:00
Chris Rebert
0ef8d1bad4 reassert #12231 & #12232 (merge went badly?) 2014-01-15 17:24:57 -08:00
Mark Otto
78e81a1de9 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs/assets/css/pack.min.css
2014-01-15 16:25:29 -08:00
Mark Otto
7e7264e224 fix ad placement 2014-01-15 16:25:04 -08:00
Julian Thilo
95f24dca9a Fix customizer's toggle buttons' margin 2014-01-16 01:19:00 +01:00
Julian Thilo
5ac8dca8ad Adapt about.html lead to latest changes 2014-01-16 01:08:00 +01:00
Julian Thilo
fa052c9659 Fix footer links 2014-01-16 00:58:13 +01:00
Mark Otto
fcb78bcef7 Merge pull request #12243 from twbs/cleanup-about
move Community & Translations docs sections from About to Getting Started
2014-01-15 15:54:35 -08:00
Chris Rebert
53bcb829bb move Community & Translations docs sections from About to Getting Started 2014-01-15 15:34:10 -08:00
Mark Otto
9bd5979013 Merge pull request #12242 from twbs/sass-contributing
add link to Sass CONTRIBUTING file in the About page
2014-01-15 15:27:07 -08:00
Julian Thilo
4c9433d13d Adhere to MailChimp's brand guidelines ;) 2014-01-16 00:22:05 +01:00
Julian Thilo
bb964b131c Remove popovers from components.html lead
because they're only really featured on javascript.html
Replacement: input groups
2014-01-16 00:17:04 +01:00
Chris Rebert
a624981ef3 add link to Sass CONTRIBUTING file in the About page 2014-01-15 15:04:38 -08:00
Chris Rebert
9039a5e90b remove inaccurate comment 2014-01-15 15:04:08 -08:00
Mark Otto
0335b8df52 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-15 15:01:50 -08:00
Mark Otto
6986bdb2a7 Fix page headers 2014-01-15 15:01:41 -08:00
Chris Rebert
91c6419d09 Getting Started: fix ID of heading so matches TOC 2014-01-15 14:26:29 -08:00
Mark Otto
14975e4ee9 indentation and page header changes 2014-01-15 13:24:34 -08:00
Mark Otto
a633fc042d Merge branch 'master' into docs_derp
Conflicts:
	docs/components.html
	docs/css.html
2014-01-15 13:08:35 -08:00
Mark Otto
1facbf6e7a Merge pull request #12232 from twbs/mixing-docs
clarify docs regarding non-mixable components
2014-01-14 21:47:24 -08:00
Mark Otto
96031c101d Merge pull request #12231 from twbs/callouts
callout severity tweaks
2014-01-14 21:46:46 -08:00
Mark Otto
b93ce03f19 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs/assets/js/customize.min.js
2014-01-14 21:45:10 -08:00
Mark Otto
413c8a6da5 Fixes #12210: badges in xs buttons 2014-01-14 21:44:38 -08:00
Chris Rebert
9ebd8d39a9 clarify docs regarding non-mixable components 2014-01-14 21:26:19 -08:00
Chris Rebert
488443c9ad downgrade .img-responsive cross-reference callout from warning to info 2014-01-14 21:03:49 -08:00
Chris Rebert
76e226b136 upgrade form-group + input-group callout from info to warning 2014-01-14 21:02:56 -08:00
Chris Rebert
811639c452 downgrade <label>-related callouts from danger to warning 2014-01-14 21:02:06 -08:00