root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
8,309 Commits 111 Branches 92 Tags 671 MiB
Commit Graph

3629 Commits

Author SHA1 Message Date
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
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
Ben Ogle edb221a20c Add tooltip `viewport` option, respect bounds of the viewport 2014-01-14 17:42:29 -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ć 4f58356e91 Rename docs/LICENSE-DOCS to docs/LICENSE 
It sounded weird.
 2014-01-14 13:47:18 +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
Mark Otto 831bbb8b45 Clarify that the focus docs styles are not in the repo, per https://github.com/twbs/bootstrap-sass/issues/497 2014-01-09 21:21:51 -08:00
Mark Otto ea20f44815 Merge branch 'master' into docs_derp 
Conflicts:
	docs/assets/css/docs.css
 2014-01-09 20:33:55 -08:00
Mark Otto 7f153974e1 Fixes #11990 and #12159: Make range inputs block level and 100% wide by default 2014-01-09 18:07:14 -08:00
Mark Otto 99b66c1f2c grunt dist 2014-01-09 18:06:46 -08:00
Mark Otto 04161a8c75 more derp 2014-01-09 18:05:04 -08:00
Chris Rebert fc62379e61 grunt dist 2014-01-09 11:11:13 -08:00
Chris Rebert 29547a2102 JSHint is on crack? 
Linting docs/grunt/bs-raw-files-generator.js ...ERROR
[L3:C5] W079: Redefinition of 'btoa'.
var btoa = require('btoa')
 2014-01-08 18:45:40 -08:00
Chris Rebert 8a10bd5231 grunt build-customizer 2014-01-08 18:39:45 -08:00
Chris Rebert 72ff8ff9fb grunt dist 2014-01-08 18:39:08 -08:00
Chris Rebert db829f8620 add support for '//===' for <h3>s in bs-lessdoc 2014-01-08 12:41:51 -08:00
Chris Rebert 39861714a8 Use JS & Jade to generate the customizer variables form HTML from variables.less; fixes #11095 
also updates variables file organization (courtesy @mdo)
 2014-01-08 12:41:51 -08:00
Chris Rebert 1736bcb05c Merge pull request #12150 from twbs/extract-from-gruntfile 
cleanup Gruntfile by extracting executable code
 2014-01-08 11:01:03 -08:00
XhmikosR d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR 016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR 9b71314fd8 Turn advanced optimizations off until it's fixed in clean-css. 2014-01-08 13:41:17 +02:00
XhmikosR f00bbdd994 Minify docs CSS too. 2014-01-08 13:41:17 +02:00
XhmikosR ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00
wangsai 7e16425acb no preboot 2014-01-08 16:22:50 +08:00
Chris Rebert d7a128c636 extract glyphicons.yml generator out of Gruntfile into separate module 2014-01-07 22:34:09 -08:00
Chris Rebert d1c29af591 extract raw-files.js generator out of Gruntfile into separate module 2014-01-07 22:16:52 -08:00
Chris Rebert c891be5e5f adjust filename to indicate that customize JS is minified 2014-01-07 19:10:31 -08:00
Chris Rebert ef7bf0abf8 grunt dist build-customizer 2014-01-07 19:05:29 -08:00
Chris Rebert c635d8f547 have customizer output Bootstrap Theme too; fixes #12003 2014-01-07 18:57:15 -08:00
Chris Rebert 07309edce5 make customizer compilation code more generic 2014-01-07 18:55:13 -08:00
Chris Rebert bf5017c01c fix #12143 2014-01-07 17:08:40 -08:00
Julian Thilo 8fd177bfa7 Fix #12073: Consistent order of variations 
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
 2014-01-07 22:24:45 +01:00
Julian Thilo 8d903fbd02 duh, missed one more file 
X-Ref: 7fcfe61f4d
 2014-01-07 01:27:49 +01:00
Julian Thilo 7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Mark Otto f389111e68 justify text 2014-01-06 09:26:08 -08:00
juniorconte 7722ab5566 notes from .input-block-level 2014-01-06 11:41:15 -02:00
Chris Rebert bbe5041cbf Merge pull request #12116 from twbs/pacify-csslint 
make CSSLint happier
 2014-01-05 23:44:17 -08:00
Mark Otto a5e29a8f34 link 2014-01-05 23:43:13 -08:00
Mark Otto 745bec59cf Move homepage examples to data file 2014-01-05 23:37:14 -08:00
Mark Otto 9421f0af82 Merge branch 'master' into docs_derp 
Conflicts:
	docs/_layouts/default.html
	docs/_layouts/home.html
 2014-01-05 23:23:55 -08:00
Mark Otto 5b7f508c60 Merge pull request #12107 from twbs/same-footer-links 
harmonize footer links on homepage & docs pages
 2014-01-05 23:21:11 -08:00
Mark Otto 3e54be9ae6 Merge branch 'master' into docs_derp 
Conflicts:
	docs/components.html
 2014-01-05 23:19:34 -08:00
wangsai ed8ef84597 fix the paragraph outside of '.bs-docs-section' 2014-01-06 14:39:09 +08:00
Chris Rebert 9fa2c95d78 make CSSLint happier; refs #12094 2014-01-05 21:29:26 -08:00
Mark Otto 0593a20638 grammarghhhhhhhhhhhh 2014-01-05 20:54:31 -08:00
Mark Otto 12dacee313 copy 2014-01-05 20:53:40 -08:00
Quy Ton c613143638 Delete reference to a non-existent class 2014-01-05 20:08:37 -08:00
Mark Otto 78e6036c68 Merge branch 'master' into docs_derp 2014-01-05 17:50:07 -08:00
Mark Otto ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Mark Otto 990303ab54 Merge pull request #12110 from twbs/one-control-per-input-group 
document single .form-control per .input-group limitation
 2014-01-05 15:57:33 -08:00
Chris Rebert 6684005f63 document single .form-control per .input-group limitation; fixes #12109 2014-01-05 14:44:48 -08:00
Chris Rebert 5fc434c5f1 harmonize footer links on homepage & docs pages 2014-01-05 13:45:56 -08:00
Mark Otto 1d0bf580c9 Use mix of medium and small grid clases on dashboard example 2014-01-05 13:26:15 -08:00
Chris Rebert ae255447f2 add .container(-fluid) to remaining navbar examples for consistency/accuracy 
follow-up to 93a4d6cc5e
 2014-01-05 12:55:03 -08:00
Chris Rebert 41257fe794 Merge pull request #12104 from ghoullier/master 
Replace getElementsByTag with querySelector in IE10 Mobile viewport JS snippet
 2014-01-05 11:47:00 -08:00
Gregory HOULLIER a53cf55be2 Replace getElementsByTag by querySelector for IE10 Mobile plateform. 2014-01-05 20:15:48 +01:00
Quy Ton 3e92ab0149 Fix typos 2014-01-05 08:38:32 -08:00
Quy Ton 82ed81fddf Fix typo 2014-01-04 21:35:06 -08:00
Quy Ton a617c805f2 Fix anchor links 2014-01-04 09:28:56 -08:00
Quy Ton 11f56bbb7b Use relative URLs 2014-01-04 09:10:02 -08:00
Chris Rebert 84c33a822d Replace lingering page.url instance with site.baseurl 
Refs #12083 & #12037
 2014-01-03 16:19:20 -08:00
Mark Otto 0b75e2d738 Merge branch 'master' into docs_derp 2014-01-03 13:18:12 -08:00
Chris Rebert 007d61cfad flip order so sentence reads better 2014-01-03 12:29:45 -08:00
Chris Rebert 56b5f5b353 de-emphasize /docs/assets and docs HTML now that they're outside of the root dir 2014-01-03 12:21:38 -08:00
Quy Ton 63df2ced6e Update source code download structure 2014-01-03 11:42:27 -08:00
Quy Ton a53779d020 Refer to popovers instead of tooltips. 2014-01-03 10:55:06 -08:00
Mark Otto 9f44f17057 updates to homepage 2014-01-02 10:54:10 -08:00