Commit Graph

8526 Commits

Author SHA1 Message Date
Chris Rebert
8556fa44a3 switch browserName from "googlechrome" to "chrome" per @Jonahss in #12647 2014-02-24 13:11:17 -08:00
XhmikosR
af83e569c3 Update grunt-contrib-connect. 2014-02-23 10:56:27 +02:00
Mark Otto
66a229bdbf Fixes #12822: Scope panel collapse styles to immediate panel bodies only 2014-02-22 22:46:03 -08:00
Mark Otto
a083f0deb7 Fixes #12808: Correct grid column values listed in Grid Options 2014-02-22 14:19:00 -08:00
Mark Otto
5791a48db3 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-22 14:16:53 -08:00
Mark Otto
7b60470e9b Fixes #12801: Add padding to the bottom of .form-control-static to match height of standard form controls 2014-02-22 14:16:11 -08:00
Chris Rebert
68f812e308 Merge pull request #12818 from hebbet/patch-1
Remove second tbody from Supported browsers
2014-02-22 12:54:17 -08:00
hebbet
983265b08a Remove second tbody from Supported browsers
Removed the second tbody from "Internet Explorer 8 and 9" Table
2014-02-22 21:49:58 +01:00
Mark Otto
7e551ecaf7 Update modals to use more consistent padding—modal body and footer now match modal header 2014-02-22 12:38:56 -08:00
Mark Otto
4ccf088a24 Merge branch 'master' into pr/12813
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
2014-02-22 12:20:53 -08:00
Mark Otto
b99be29f32 Fixes #12756: Ensure horizontal dls are cleared by moving the clearfix out of the media query 2014-02-22 12:13:11 -08:00
Supergibbs
49094844ac Correctly set .btn-link colors in a .navbar and .navbar-inverse #12694 2014-02-21 20:51:06 -08:00
jonahss
7a80b801d7 updated qunit test reporting so sauce labs can report failing tests 2014-02-21 18:54:50 -08:00
Mark Otto
4b622c60c1 grunt 2014-02-21 17:42:25 -08:00
Mark Otto
b01f995ad7 Merge pull request #12459 from rubenstolk/hotfix/mixins/scale
Make both .scale(X) and .scale(X, Y) both work
2014-02-21 17:36:47 -08:00
Mark Otto
c7b07a5644 Merge pull request #12742 from ZDroid/table-responsive-mixin
Make .table-responsive usable as mixin
2014-02-21 17:34:27 -08:00
Mark Otto
f3e172a81f Merge pull request #12803 from PHLAK/master
Removed unnecessary top margin from .modal-footer
2014-02-21 17:23:01 -08:00
Mark Otto
e7a337a8f1 Merge pull request #12809 from Borkason/patch-1
Clarify the use of .has-feedback
2014-02-21 17:18:50 -08:00
Mark Otto
70b875ceb3 Merge pull request #12761 from hnrch02/no-event-aliases
Remove event aliases from JavaScript
2014-02-21 15:14:22 -08:00
Mark Otto
449dd83ec3 Fixes #12735: Fix sidebar hover state in Dashboard example 2014-02-21 15:06:21 -08:00
Mark Otto
f542fcc627 Fixes #12810: Document .container-fluid in the CSS overview docs 2014-02-21 15:03:16 -08:00
Mark Otto
5517f9907e Fixes #12744: Document ability to remove animation on modals 2014-02-21 14:52:15 -08:00
Daniel Niccoli
72565b69c2 Clarify the use of .has-feedback 2014-02-21 16:32:24 +01:00
Chris Kankiewicz
4dde96b674 Removed unnecessary top margin from .modal-footer 2014-02-20 14:27:19 -07:00
Chris Rebert
0c98895604 Merge pull request #12792 from twbs/translation-docs
change translation docs in light of #11342 & its many dupes
2014-02-19 12:41:46 -08:00
Chris Rebert
8af1673ab7 change translation docs in light of #11342 & its many dupes 2014-02-19 11:27:16 -08:00
XhmikosR
25d047ded4 Merge pull request #12058 from ZDroid/uti
Remove semicolons from JS tests
2014-02-18 13:21:05 +02:00
Chris Rebert
dd9e9ce123 Merge pull request #12772 from ZDroid/tests-index
Improve `js/tests/index.html`
2014-02-18 01:53:17 -08:00
Zlatan Vasović
a4dac463e0 Improve js/tests/index.html
- Improve comments.
- Remove `transition.js` script load as `transition.js` unit test doesn't exist.
2014-02-18 10:43:24 +01:00
Chris Rebert
27de737521 Merge pull request #12760 from ZDroid/grunt-jshintrc
Improve grunt/.jshintrc
2014-02-18 00:57:45 -08:00
XhmikosR
db32afe6cf Update grunt-contrib-cssmin. 2014-02-18 07:40:02 +02:00
Zlatan Vasović
a06e15dd36 Remove semicolons from JS tests 2014-02-17 20:56:46 +01:00
Mark Otto
00b3b8b0b8 Merge pull request #12749 from twbs/pointer-events-note
Document caveats of `pointer-events: none` usage in btn.disabled
2014-02-16 20:37:50 -08:00
Chris Rebert
ca02f49013 Safari rounding problem still present as of v7.0.1 for OS X 2014-02-16 12:26:09 -08:00
Chris Rebert
8eeab63e7e Merge pull request #12720 from twbs/reident-test-files
Reindent test files
2014-02-16 12:13:04 -08:00
Heinrich Fenkart
8a78bc065f Remove event aliases from JavaScript
Makes life for people with custom jQuery builds excluding event aliases much easier.
2014-02-16 21:00:04 +01:00
Zlatan Vasović
dd60fcb467 Improve grunt/.jshintrc 2014-02-16 19:57:39 +01:00
XhmikosR
5566c935f2 Merge pull request #12513 from ZDroid/jshint
Remove `curly: false` from `.jshintrc`
2014-02-16 20:45:00 +02:00
Zlatan Vasović
69cb7be07f Remove curly: false from .jshintrc 2014-02-16 19:30:02 +01:00
Chris Rebert
dabb5041a4 Document caveats of pointer-events: none usage in btn.disabled
Refs #10049
Source for compatibility info: http://caniuse.com/#feat=pointer-events
2014-02-14 17:14:52 -08:00
Zlatan Vasović
dfa5edca2c Make .table-responsive usable as mixin 2014-02-14 19:48:17 +01:00
XhmikosR
65ffe69bdf Fix customizer.js indentation warnings. 2014-02-14 11:02:03 +02:00
XhmikosR
895b0006b9 Re-indent test files. 2014-02-14 11:02:03 +02:00
Chris Rebert
accc95ccd6 regenerate npm-shrinkwrap.canonical.json 2014-02-13 17:57:24 -08:00
Chris Rebert
cdb381bb75 bump grunt-exec to v0.4.5 & add missing tilde to version spec 2014-02-13 13:55:36 -08:00
Zlatan Vasović
7100e3a37e Add build-raw-files log; fixes #12603
Fixes #12672
2014-02-13 11:26:55 -08:00
Chris Rebert
1b4a3dbbec Merge pull request #12719 from twbs/update-less
Update less.js to v1.6.3.
2014-02-13 11:15:14 -08:00
Chris Rebert
9300284638 Merge pull request #12718 from twbs/dependencies
Update dependencies.
2014-02-13 11:13:31 -08:00
XhmikosR
2d18944d98 Update dependencies. 2014-02-13 11:12:05 -08:00
XhmikosR
ff2c506d2b Update less.js to v1.6.3. 2014-02-13 20:54:21 +02:00