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

8442 Commits

Author SHA1 Message Date
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
Alan Hamlett
e38fd138ce fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height 2014-01-25 21:40:56 -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
Chris Rebert
b30cff4888 Add ref in Less to docs regarding box-sizing conflicts
Refs #12351
2014-01-23 20:51:23 -08:00
Chris Rebert
b9d1ae092f add ID to "Box sizing" section of Getting Started docs 2014-01-23 17:01:43 -08:00
Chris Rebert
31e8a48783 "bottom increment" => "decrement" in explanatory comment 2014-01-23 15:07:04 -08:00
Chris Rebert
aa8b1543be add WCAG color guideline to CONTRIBUTING.md 2014-01-23 14:01:59 -08:00
Chris Rebert
2f26eaea5b add WAI-ARIA guideline to CONTRIBUTING.md 2014-01-23 12:50:57 -08:00
Chris Rebert
7d015817ed fix typo and use the v3-specific StackOverflow tag 2014-01-23 11:18:56 -08:00
Chris Rebert
7a6bc67826 Merge pull request #12347 from twbs/ie-11-browserstack
enable IE11 in BrowserStack tests
2014-01-22 21:34:42 -08:00
Mark Otto
f748390cf5 Follow-up to #12250: remove remaining page margins for print 2014-01-22 21:51:23 -06:00
Mark Otto
08e83a62b7 Fix #11655: Fix broken disabled states for iOS form controls and buttons 2014-01-22 21:43:08 -06:00
Mark Otto
833c208bf5 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:20:06 -06:00
Mark Otto
1e1af8687d Merge pull request #12250 from twbs/rm-print-margins
remove default left-right print margins per upstream h5bp change
2014-01-22 19:18:24 -08:00
Mark Otto
b945491426 Merge branch 'master' of github.com:twbs/bootstrap 2014-01-22 21:15:25 -06:00
Mark Otto
7b24a3b99c Fixes #12344: Update docs to show workaround for using button element with justified button groups 2014-01-22 21:15:17 -06:00
Mark Otto
11a22fb615 Merge pull request #12345 from twbs/printer-wackiness-note
add note about printer viewport weirdness
2014-01-22 17:52:00 -08:00
Chris Rebert
6d08763136 add docs note to address #12078 2014-01-22 17:28:00 -08:00
Chris Rebert
9798b0bf0b enable IE11 in BrowserStack tests 2014-01-22 14:57:32 -08:00
Julian Thilo
494014babe No more lists. 2014-01-22 19:04:19 +01:00
Julian Thilo
57597c4761 Merge pull request #12340 from browserstack/update_bs_runner
Update browserstack-runner package
2014-01-22 08:46:41 -08:00
Julian Thilo
2022e15aa8 Gone, gone. 2014-01-22 17:00:09 +01:00
Rahul Nawani
6c7db9d56e update browserstack runner package 2014-01-22 21:15:55 +05:30