rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
8,106 Commits 108 Branches 89 Tags 553 MiB
a521e982d5
Commit Graph

8106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Rebert
8dc1d00dd4 add a couple commas 2014-01-15 13:44:23 -08:00
Chris Rebert
208df78971 Merge pull request #12241 from twbs/jekyll-encoding 
Set Jekyll encoding and tweak Windows notes
 2014-01-15 13:43:12 -08:00
Mark Otto
14975e4ee9 indentation and page header changes 2014-01-15 13:24:34 -08:00
Julian Thilo
00239f6034 Set Jekyll encoding and tweak Windows notes 2014-01-15 22:18:35 +01: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
Chris Rebert
e2a18430f9 Merge pull request #12213 from twbs/browserstack 
tests: run BrowserStack in parallel with Sauce Labs
 2014-01-14 20:44:47 -08:00
Chris Rebert
c1a81f7bde Merge pull request #12229 from twbs/richer-results 
more detailed QUnit test results in Sauce
 2014-01-14 20:21:54 -08:00
Chris Rebert
b260d93c58 more detailed QUnit test results in Sauce 2014-01-14 20:21:15 -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
3a97697456 tests: run BrowserStack in parallel with Sauce Labs 
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-31922999
and internal twbs team discussion.
Effectively reverts the deletions from #11701.
 2014-01-14 14:13:52 -08:00
Chris Rebert
2a6b6f8537 Merge pull request #12224 from twbs/raw-files-banner 
add copyright notice to raw-files.js
 2014-01-14 13:28:50 -08:00
Chris Rebert
46b0874ef5 add copyright notice to raw-files.js 2014-01-14 13:27:50 -08:00
Julian Thilo
027af6deb4 Merge pull request #12220 from ZDroid/link 
Link the blog post instead of main blog page
 2014-01-14 06:03:35 -08:00
Zlatan Vasović
c11f78d7eb Link the blog post instead of main blog page 2014-01-14 14:40:27 +01:00
Chris Rebert
d1fd917b7a Merge pull request #12218 from ZDroid/docs.js 
Rename uglify.js to uglify.min.js for consistency
 2014-01-14 04:49:58 -08: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
Mark Otto
8c0cb806c6 Merge pull request #12215 from twbs/attribution-comments 
sort out attribution banners of docs assets
 2014-01-13 22:38:47 -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
df70e8d845 Merge pull request #12214 from twbs/slightly-newer-qunit 
upgrade to QUnit v1.0.0
 2014-01-13 19:28:23 -08:00
Chris Rebert
dde38280f7 upgrade to QUnit v1.0.0 2014-01-13 19:21:07 -08:00
Chris Rebert
bfe74f7b2f Revert accidental overzealousness from 16eccc43d9 
Let's not confuse the archaeologists & historians.
 2014-01-13 19:09:51 -08:00
Chris Rebert
b9216a292c update to Holder.js 5b79144fa 2014-01-13 17:50:17 -08:00