0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Commit Graph

8259 Commits

Author SHA1 Message Date
Mark Otto
7ba2eede4e fix css url 2014-01-29 21:44:36 -08:00
Mark Otto
80ef14a11a Merge pull request #12423 from ZDroid/name
Rename pack.min.css to docs.min.css to match with docs.min.js
2014-01-29 21:44:01 -08:00
Mark Otto
d631e0b92d Fix #12422: Reset height on multiple select in input size mixin 2014-01-29 21:34:10 -08:00
Mark Otto
545c957f17 Fixes #12424: Account for Normalize change on figure element so that we don't potentially screw folks over 2014-01-29 21:23:23 -08:00
Zlatan Vasović
00f062fc7e Rename pack.min.css to docs.min.css to match with docs.min.js 2014-01-29 20:50:10 +01:00
Chris Rebert
9ec5905c07 Merge pull request #12415 from XhmikosR/master
Gruntfile.js: remove unused code.
2014-01-28 17:35:09 -08:00
Chris Rebert
37926839ff Merge pull request #12417 from ZDroid/cmt
Remove redundant jshint comment
2014-01-28 15:54:23 -08:00
Zlatan Vasović
f8bb6811bd Remove redundant jshint comment 2014-01-28 22:47:23 +01:00
XhmikosR
615f1ad4aa Gruntfile.js: remove unused code. 2014-01-28 21:07:56 +02:00
Mark Otto
01dabd3391 Merge pull request #12406 from twbs/normalize_v3
Upgrade to Normalize v3
2014-01-28 10:57:31 -08:00
Mark Otto
a9a4d81730 grunt 2014-01-28 10:08:40 -08:00
Mark Otto
493d143cbd v3 instead of rc1 2014-01-28 10:07:33 -08:00
Julian Thilo
3a62811bbd Update javascript.html 2014-01-28 00:01:10 +01:00
Julian Thilo
0a5cb2f908 Fix typo 2014-01-27 23:07:14 +01:00
Mark Otto
b7ac009a52 Remove #8350's reset for number inputs since Normalize fixes those upstream 2014-01-27 12:25:39 -08:00
Mark Otto
400720d00b Remove optgroup resets from #7611 since Normalize fixes those upstream 2014-01-27 12:24:35 -08:00
Mark Otto
6a0a139cda Upgrade to Normalize v3-rc1 in prep for v3 final 2014-01-27 12:08:55 -08:00
Mark Otto
45ea456468 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-27 09:42:33 -08:00
Mark Otto
e08e871f01 document id requirement in carousels per #12393 2014-01-27 09:24:51 -08:00
Julian Thilo
72a31db210 Merge pull request #12403 from Quy/master
Change positioning reference from left to right in affix's example.
2014-01-27 09:22:17 -08:00
Quy Ton
5c1852fb74 Change positioning reference from left to right in affix's example. 2014-01-27 09:17:57 -08:00
Chris Rebert
50ad304bb5 Merge pull request #12315 from twbs/use-shrinkwrap
Do npm caching based on npm-shrinkwrap.canonical.json
2014-01-26 20:46:14 -08:00
Mark Otto
16fd8cd01e Merge pull request #12398 from twbs/deprecate-box-shadow-mixin
mark .box-shadow() mixin as deprecated
2014-01-26 19:15:31 -08:00
Chris Rebert
1a36e4fa1e docs & comments: v3.1 => v3.1.0 2014-01-26 17:48:15 -08:00
Chris Rebert
602e5f8f11 mark .box-shadow() mixin as deprecated; fixes #12396 2014-01-26 17:44:01 -08:00
Chris Rebert
5a3f1a90ba fix #12261 2014-01-26 14:22:06 -08:00
Chris Rebert
3157a37775 Merge pull request #12387 from twbs/osx-chrome
re-enable OS X Chrome in Sauce tests
2014-01-25 18:33:23 -08:00
Chris Rebert
6717f642bb re-enable OS X Chrome in Sauce tests 2014-01-25 17:55:52 -08:00
Chris Rebert
77362a3b45 Merge pull request #12386 from twbs/update-iphone
update to iOS v7 in Sauce test config
2014-01-25 17:11:49 -08:00
Chris Rebert
d56def706a update to iOS v7 in Sauce test config 2014-01-25 17:02:02 -08:00
Chris Rebert
9ec1e8694b README: use Bootstrap v3-specific StackOverflow tag 2014-01-25 16:38:47 -08:00
Chris Rebert
87e5b16b17 disable IE11 in BrowserStack config due to frequent timeouts 2014-01-25 16:35:13 -08:00
Chris Rebert
86a5846ada Merge pull request #12378 from andrewdisley/patch-1
Fix #10348: Customizer dependencies
2014-01-25 16:30:02 -08:00
Chris Rebert
15921e5109 Merge pull request #12385 from hnrch02/update-load-grunt-tasks
Update load-grunt-tasks to v0.3.0
2014-01-25 16:27:05 -08:00
Heinrich Fenkart
72568ce588 Update load-grunt-tasks to v0.3.0 2014-01-25 21:03:44 +01:00
Chris Rebert
12a4263471 Merge pull request #12266 from twbs/linux
enable Linux Chrome & Linux Firefox in Sauce tests
2014-01-25 12:00:10 -08:00
Mark Otto
45b964c246 Merge pull request #12380 from twbs/translation-german
Add German translation
2014-01-25 11:10:20 -08:00
Julian Thilo
0cbfdd19bd Add link to German translation and reorder links 2014-01-25 16:08:15 +01:00
Andrew Disley
a1b0bb7a10 Fix #10348: Customizer dependencies 2014-01-25 12:35:46 +00:00
Mark Otto
6d090e243d Merge pull request #12366 from Quy/master
Change a word.
2014-01-24 22:36:05 -08:00
Julian Thilo
af1ba5cf74 Clarify nesting in grid example 2014-01-25 01:58:54 +01:00
Quy Ton
4b5991586d Change a word. 2014-01-24 11:24:50 -08:00
Chris Rebert
643e814e7b Merge pull request #12365 from Quy/master
Remove Twitter from tweet button
2014-01-24 10:43:06 -08:00
Quy Ton
da86f6fbbb Remove Twitter from tweet button 2014-01-24 10:37:12 -08:00
Mark Otto
4b2fe3f96f Merge branch 'master' of github.com:twbs/bootstrap 2014-01-24 11:56:04 -06:00
Mark Otto
64e8132426 Fix #12359: Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements 2014-01-24 11:55:59 -06:00
Chris Rebert
f1c1469b83 Merge pull request #12357 from twbs/border-box-note
add note in Less source about global `box-sizing: border-box;`
2014-01-23 20:57:45 -08:00
Mark Otto
829eefd6f7 Merge pull request #12356 from twbs/wcag-contributing
add WCAG color guideline to CONTRIBUTING.md
2014-01-23 20:55:39 -08:00
Mark Otto
bd6751e932 Merge pull request #12355 from twbs/aria-contributing
add WAI-ARIA guideline to CONTRIBUTING.md
2014-01-23 20:53:33 -08:00
Mark Otto
44fc629d44 Fix #12353: Scope table border reset in panels to first-child rows 2014-01-23 22:52:26 -06:00