2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

3487 Commits

Author SHA1 Message Date
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
Chris Rebert 2ba15c3750 upgrade tooltip/popover-in-groups callout from info to warning 2014-01-14 21:01:09 -08:00
Chris Rebert 5ead87d519 revert unnecessary customizations of Blob.js & FileSaver.js
Per https://github.com/eligrey/Blob.js/pull/20
& https://github.com/eligrey/FileSaver.js/pull/63
The library author has deemed the existing /*! @source URL */ comments to be
sufficient attribution, and these already survive minification.

Refs ea591748ed
2014-01-14 20:46:25 -08:00
Mark Otto cae63200d8 Merge branch 'master' into docs_derp
Conflicts:
	docs/_includes/old-bs-docs.html
2014-01-14 15:53:06 -08:00
Mark Otto edd0b97be5 Don't copy-pasta all the Sass docs because fuck keeping that up to date. Instead, point to https://github.com/twbs/bootstrap-sass/blob/master/README.md. 2014-01-14 15:52:40 -08:00
Chris Rebert 8fb75ee9e7 add missing semicolon 2014-01-14 14:25:25 -08:00
Chris Rebert 46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Zlatan Vasović c11f78d7eb Link the blog post instead of main blog page 2014-01-14 14:40:27 +01:00
Zlatan Vasović c335104957 Rename uglify.js to uglify.min.js for consistency 2014-01-14 13:41:21 +01:00
Mark Otto c4b41ceae3 header masthead changes 2014-01-13 22:59:09 -08:00
Mark Otto b776749507 make page headers like masthead 2014-01-13 22:54:22 -08:00
Mark Otto eca81939cc Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Chris Rebert ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Chris Rebert aff64cffce avoid redundant banner in minified docs CSS 2014-01-13 21:31:40 -08:00
Chris Rebert 2d038186e3 add a title/description to customizer.js's attribution comment 2014-01-13 21:08:04 -08:00
Chris Rebert b9216a292c update to Holder.js 5b79144fa 2014-01-13 17:50:17 -08:00
Chris Rebert d62d7b0733 document subheading syntax 2014-01-13 02:37:55 -08:00
Mark Otto b17dca240e Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Chris Rebert 80bed836e0 grunt dist build-customizer 2014-01-12 14:53:21 -08:00
XhmikosR f972331a10 update to FileSaver.js version 2013-12-27 / 0055d054ac
Refs #12196
2014-01-12 14:47:54 -08:00
Chris Rebert 4b5e73b842 add Blob.js separate from filesaver.js
Blob.js version 2013-12-27 / 0055d054acbca43eff44fc25c891055440685d9c
Refs #12196
2014-01-12 14:41:30 -08:00
XhmikosR ef22ab5aed update less.js to v1.6.1 & use accurate filename; refs #12196 2014-01-12 14:32:58 -08:00
XhmikosR 77ff3871fd update holder.js to v2.3; refs #12196 2014-01-12 14:23:41 -08:00
Mark Otto 4b1ff7fa49 Formatting and docs changes 2014-01-12 00:04:24 -08:00
Mark Otto 36aa3afb4f Improve spacing and alignment of sections and their headings 2014-01-11 23:15:37 -08:00
Mark Otto 613a95d838 brand guidelines cleanup 2014-01-11 19:42:10 -08:00
Mark Otto 79c18da452 homepage improvements 2014-01-11 19:35:40 -08:00
Mark Otto bacfd65cb2 Merge branch 'master' into docs_derp
Conflicts:
	docs/getting-started.html
2014-01-11 19:13:10 -08:00
Chris Rebert 80c9c14ab9 rm lingering reference to Recess in the docs
Refs c0200426ee
2014-01-11 17:15:08 -08:00
Mark Otto e2908975ad Merge branch 'master' of github.com:twbs/bootstrap 2014-01-11 14:49:03 -08:00
Mark Otto 1127cd6287 grunt dist 2014-01-11 14:48:47 -08:00
Mark Otto e68d3b961e Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets
Conflicts:
	package.json
2014-01-11 14:48:04 -08:00
Mark Otto 8e41961f9e Merge pull request #12193 from ZDroid/migration
Update docs per `.container-fluid` addition
2014-01-11 13:08:24 -08:00
Zlatan Vasović 62fe50df73 Update docs per .container-fluid addition
- Remove `.container-fluid` from "removed classes".
- Container isn't fluid by default (`.container`) and `.row` isn't percentage-based, so update docs.
2014-01-11 22:04:33 +01:00
Mark Otto 8a04ed44a1 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-10 18:57:01 -08:00
Mark Otto 3a8e99e91e Fixes #12171: Ensure panel groups have a bottom margin since we nuke it on child panels 2014-01-10 18:56:44 -08:00
Chris Rebert b192d29981 refer to correct component 2014-01-10 18:56:39 -08:00
Mark Otto 17f2ef46aa docs mention for #12188 2014-01-10 18:47:51 -08:00
Chris Rebert e8cabf332a use height adjectives for greater clarity 2014-01-10 15:33:04 -08:00
Chris Rebert 46f5bbcf33 document #11675 2014-01-10 14:41:23 -08:00