rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
10,986 Commits 108 Branches 89 Tags 552 MiB
1623280f59
Commit Graph

1015 Commits

Author SHA1 Message Date
Mark Otto
38217ee405 Merge branch 'pr/14801' 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-10-25 18:16:40 -07:00
Mark Otto
6e3c55a115 grunt 2014-10-25 18:13:50 -07:00
Mark Otto
a0e6bd96de grunt 2014-10-25 17:54:06 -07:00
Heinrich Fenkart
e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
XhmikosR
db550a9235 Run grunt. 2014-10-25 14:12:21 +03:00
Nicole Sullivan
919b4ccb15 Fixes #14799: Add vertical alignment of image in media component 
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
 2014-10-23 18:48:18 -04:00
Heinrich Fenkart
51f1f58be8 grunt 2014-10-23 06:39:51 +02:00
Heinrich Fenkart
e0cea19cbc grunt 2014-10-23 05:23:29 +02:00
Heinrich Fenkart
40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart
2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
Heinrich Fenkart
930c422f22 grunt 2014-10-22 04:28:16 +02:00
XhmikosR
9f82f27b9d Update less/print.less to the latest html5 bp version. 
Also, keep the html5 boilerplate link in the built CSS.
 2014-10-13 13:32:39 +03:00
fat
4bbe80658a fixes #13816 Modal dialog closes when dragging and releasing mouse button outside dialog 2014-10-09 20:01:51 -07:00
XhmikosR
0ca71396b5 Update normalize.css to v3.0.2. 2014-10-07 11:29:59 +03:00
Heinrich Fenkart
5bb08c50fa grunt 2014-10-03 08:17:49 +02:00
Mark Otto
f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto
76268c4b96 more grunt 2014-10-02 21:21:49 -07:00
Mark Otto
12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Mark Otto
121b204b14 grunt 2014-09-26 13:48:31 -07:00
Mark Otto
8e25695d09 Fixes #14687: Include video element in responsive embed 2014-09-26 13:45:28 -07:00
Heinrich Fenkart
0d04dcaebd grunt 2014-09-26 00:10:41 +02:00
Heinrich Fenkart
7ce6824748 grunt 2014-09-25 02:23:48 +02:00
Mark Otto
4969c2055d grunt 2014-09-22 14:27:13 -07:00
Heinrich Fenkart
36ebec5e76 grunt 2014-09-22 21:47:24 +02:00
Mark Otto
9ed65ab444 Fixes #14592: Add new variable for progress border radius 2014-09-18 19:09:51 -07:00
Mark Otto
75204aeafa grunt 2014-09-18 18:33:52 -07:00
Heinrich Fenkart
5a5cf224e1 grunt 2014-09-16 05:59:09 +02:00
Heinrich Fenkart
d0f76e416c grunt 2014-09-13 04:46:31 +02:00
Heinrich Fenkart
0a4c39dc40 Teh grunt 
https://www.youtube.com/watch?v=L-4VxEtWyRo
 2014-09-13 03:15:04 +02:00
Heinrich Fenkart
0cf94b82ee grunt 2014-09-13 02:42:18 +02:00
Heinrich Fenkart
cabace78da G R U N T 2014-09-11 23:43:27 +02:00
James Friend
4ba4b7c3cf added banner about generated file 2014-09-09 08:47:23 +08:00
Heinrich Fenkart
9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00
Heinrich Fenkart
9702579aeb run grunt 2014-09-09 00:12:33 +02:00
Heinrich Fenkart
c9602c29c3 grunt 2014-09-08 22:41:45 +02:00
Chris Rebert
1e6849dd58 clean whitespace 
Thanks to @collinanderson
Closes #14567
 2014-09-08 13:35:07 -07:00
Mark Otto
6cec0399d0 grunt 2014-09-08 11:40:23 -07:00
Mark Otto
c12928abdb grunt 2014-09-08 11:04:47 -07:00
Mark Otto
c6d7d71549 Fixes #14557: Reset the bottom margin on .form-group:last-child in .navbar-form to prevent extra spacing 2014-09-08 10:57:50 -07:00
Mark Otto
f2783fbf83 Fixes #14319: Prevent jumbotron reflow by ensuring padding of .container isn't interferred with by .jumbotron side padding 2014-09-08 10:29:45 -07:00
Mark Otto
48a1308e5d grunt 2014-09-08 10:23:25 -07:00
XhmikosR
5b9fcea9f2 Run grunt. 2014-09-08 09:04:33 +03:00
Mark Otto
5b7a5f84d4 Fixes #14437: Round the corners of table rows in panels as well as the cells 2014-09-04 19:06:01 -07:00
Mark Otto
e37e06d73e Fixes #14443: Only transition what needs transitioning for thumbnails to avoid Safari/Chrome render bug 2014-09-01 12:48:19 -07:00
Mark Otto
fe19211e4d Finish reverting #14444 2014-08-27 23:34:46 -07:00
Mark Otto
0ec05da0ee Undo the collapse visibility changes since it breaks our collapse plugin 2014-08-27 23:31:34 -07:00
Mark Otto
aa25ce779d Fixes #14329: Fixed list-groups nested inside of collapsing panels, from @apexskier 2014-08-27 23:17:37 -07:00
Mark Otto
0a816e009f Fixes #14337: Round .jumbotron corners within .container and .container-fluid 2014-08-27 23:01:58 -07:00
Mark Otto
190452a36d typo 2014-08-27 22:40:46 -07:00
Mark Otto
f4eefd28d1 Merge branch 'master' into sr_friendly_hidden_content 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-08-27 22:38:46 -07:00
Mark Otto
1ebc7e62a8 grunt 2014-08-27 22:37:10 -07:00
Mark Otto
f5890adb17 grunt 2014-08-27 22:25:24 -07:00
James Friend
9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable 
Conflicts:
	Gruntfile.js
 2014-08-28 09:32:08 +08:00
James Friend
e7991a9a1e generate commonjs/npm entrypoint module via grunt task 2014-08-28 09:24:23 +08:00
Mark Otto
0140198699 grunt 2014-08-23 13:46:28 -07:00
Mark Otto
56bb92ac4f Fixes #14386: Reset font, text, and line-height properties in popovers 2014-08-23 13:42:45 -07:00
Mark Otto
4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto
9a39ee90b4 Fixes #13943 again: lighten links, and text, in navbar. Still not 100% compliant, but it's better. 2014-08-23 13:26:37 -07:00
Mark Otto
dfa2759a52 Fixes #14348: Add visibility styles to collapse and tab content to match .hidden 2014-08-23 12:25:27 -07:00
Mark Otto
6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert
e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
James Friend
689faaf16f added a separate npm-specific main file 2014-08-05 10:51:31 +08:00
Mark Otto
14e8ec2514 unfuck all that because lol dependencies 2014-08-04 10:14:11 -07:00
Mark Otto
6c87895eec fixes #14310: reset .active as well for button links 2014-08-04 10:01:20 -07:00
Heinrich Fenkart
b10b373c60 Follow-up to #13074: use spec syntax instead of deprecated mixins 2014-08-04 06:19:42 +02:00
Mark Otto
6424acf69a Fixes #14234: Reset the hack IE8-10 with another hack just for IE11 for temporal inputs and line-height 2014-08-02 21:16:32 -07:00
Mark Otto
9d0872b748 Fixes #14251: Remove the -webkit-overflow-scrolling to prevent Safari from screwing up widths 2014-08-02 19:05:46 -07:00
Mark Otto
67d39404a2 grunt 2014-08-02 18:41:00 -07:00
Mark Otto
c7970106a2 Merge pull request #13074 from haydenbleasel/master 
WebKit CSS3 carousel transforms for supported devices
 2014-08-02 18:40:21 -07:00
Mark Otto
b9e6848dc8 Fixes #14253: Add borders for tables that follow bodies in panels 2014-08-02 13:55:02 -07:00
Mark Otto
feed9aed5b Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers 2014-08-02 13:05:11 -07:00
XhmikosR
de1d8c36ad Run grunt. 2014-08-01 19:49:54 +03:00
Mark Otto
98d693ba7b Fixes #14142: Adding horizontal padding to captions in tables in panels. 2014-07-23 21:03:46 -07:00
Mark Otto
078aafe7fd Fixes #14221: Make .form-control-static work in inline forms as well 2014-07-23 20:54:07 -07:00
Mark Otto
6dde491ddf Fixes #14168: bold nested kbd elements 2014-07-23 20:49:47 -07:00
Mark Otto
5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
XhmikosR
8d435cbb3c Run grunt. 2014-07-22 08:25:41 +03:00
Chris Rebert
49519e9816 grunt dist 2014-07-21 00:35:41 -07:00
Mark Otto
8c586a8e3e Fixes #14074: Make open dropdown nav links in navbar use gradients 2014-07-12 17:59:02 -07:00
Mark Otto
fe0ef38898 Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time. 2014-07-12 15:55:15 -07:00
Mark Otto
2962f845a5 grunt 2014-07-12 15:47:42 -07:00
Mark Otto
3e8cddf867 Fixes #13974, #14123: Remove translate3d repaint performance enhancement for text rendering and position wonkiness 2014-07-12 15:22:41 -07:00
Mark Otto
bd292ca3b8 Fixes #14107: Lighten placeholder text 2014-07-12 15:13:18 -07:00
XhmikosR
94472ee74a Run grunt. 2014-07-10 10:03:24 +03:00
XhmikosR
643effe382 Run grunt. 2014-07-09 10:24:39 +03:00
Mark Otto
a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto
117ca8167a Merge branch 'master' of github.com:twbs/bootstrap 2014-07-06 23:45:36 -07:00
Mark Otto
225819ae66 Merge pull request #14029 from BBosman/touch-action 
Add touch-action: manipulate to .btn
 2014-07-06 23:43:43 -07:00
Mark Otto
8e2348e9ed Fixes #13746: Add docs section for brand image 2014-07-06 18:39:37 -07:00
Mark Otto
9be2bbb5ef Fixes #14053: Don't show radio/checkbox in justified button groups 2014-07-06 16:48:41 -07:00
Mark Otto
e2029e122c Fixes #13997: Move min-height for radio/checkbox to their inner label 2014-07-06 15:09:20 -07:00
Mark Otto
354d423668 grunt 2014-07-06 15:08:37 -07:00
Chris Rebert
a34e52de4d Merge pull request #14015 from twbs/possible-14013-fix 
Possible fix for #14013
 2014-07-06 00:36:52 -07:00
Mark Otto
043b40636c grunt 2014-07-05 20:17:57 -07:00
Mark Otto
9677c95d83 Fixes #13967: Don't reset the cite element's font-style 2014-07-05 20:02:02 -07:00
Mark Otto
f22e7d857a Fixes #13953: Remove the progress bar min-width styles for low percentages to avoid jumping progress 2014-07-05 20:01:18 -07:00
Mark Otto
0378a6be2a Fixes #13943: Lighten the navbar inverse link color more since our text contrast change in v3.2.0 2014-07-05 19:59:50 -07:00
Mark Otto
3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Bas Bosman
4975978083 Remove superfluous cursor:pointer 2014-07-03 13:17:14 +02:00
Bas Bosman
47521fd7d0 Add touch-action: manipulate to buttons 2014-07-03 12:53:23 +02:00
Mark Otto
3537481c97 Fixes #12738 again: use max-device-width instead of max-width for .navbar-collapse height in landscape devices 2014-07-03 00:55:32 -07:00
Mark Otto
fcf9470a20 typo 2014-07-02 23:35:37 -07:00
Mark Otto
96b545c6b5 Fixes #13989: Don't extend the input sizes; manually chain the selectors 2014-07-02 23:14:23 -07:00
Mark Otto
b4958aba69 merge in and resolve conflicts 2014-07-02 22:54:56 -07:00
Chris Rebert
1ce5e9f3ae possible fix for #14013 2014-07-02 10:09:28 -07:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
XhmikosR
fec94e1695 Update "grunt-autoprefixer". 2014-06-27 07:38:46 +03:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto
4045740c54 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-06-25 16:57:22 -07:00
Mark Otto
e40df7cfac fixes #13912: make radios/checkboxes work with inline forms again 2014-06-25 16:56:36 -07:00
XhmikosR
4abb095783 Run grunt. 
Revert a991cd572c.
 2014-06-25 02:07:17 +03:00
Chris Rebert
a991cd572c grunt dist; closes #13914 2014-06-24 15:06:47 -07:00
XhmikosR
15c63fa137 Run grunt. 2014-06-24 19:01:40 +03:00
Chris Rebert
c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Mark Otto
df7cfe8652 Fixes #13903: Restore side padding on .btn-block 2014-06-23 10:38:45 -07:00
Mark Otto
e98fc373e3 Fixes #13872 more: add overrides for lg and sm input modifiers 2014-06-20 13:24:14 -07:00
Mark Otto
1e53dcd137 Fixes #13872: Always apply padding to .form-control-static for that vertical alignment 2014-06-19 18:33:41 -07:00
Mark Otto
8bd4163ad4 fixes #13881: restore existing striped progress bar behavior with theme styles 2014-06-19 18:14:56 -07:00
Mark Otto
a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
XhmikosR
abe7afd87a Run grunt. 2014-06-19 12:58:34 +03:00
Mark Otto
162a27f67a grunt 2014-06-18 23:50:16 -07:00
Mark Otto
99f176e7ec rewrite striped and active to deprecate the parent selectors, change the docs 2014-06-18 22:35:05 -07:00
Mark Otto
d222c21f84 grunt 2014-06-18 22:24:56 -07:00
Mark Otto
74982cf101 grunt 2014-06-18 22:23:31 -07:00
Mark Otto
74a264fb98 fixes #13021: add .form-group-sm/-lg 2014-06-18 18:19:17 -07:00
Mark Otto
46e8a5817d fixes #10073: add width: 100%; for ie10 and below to size svg.img-responsive correctly 2014-06-18 17:34:09 -07:00
Mark Otto
fdf174e498 grunt dist 2014-06-18 15:46:38 -07:00
XhmikosR
6d45f733e5 Run grunt. 2014-06-18 13:16:32 +03:00
Chris Rebert
f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Chris Rebert
8bee6549ad grunt dist 2014-06-17 18:23:14 -07:00
Mark Otto
b1a9168b15 grunt dist 2014-06-11 18:13:50 -07:00
Mark Otto
f09d6b7a98 grunt 2014-06-10 23:15:09 -07:00
Mark Otto
5c1357b3e9 grunt 2014-06-10 22:58:21 -07:00
Mark Otto
7bcd78847f grunt 2014-06-10 22:51:17 -07:00
Mark Otto
57bd8f943b grunt 2014-06-10 22:47:25 -07:00
Mark Otto
dcbe484a09 New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table. 2014-06-10 21:20:34 -07:00
Mark Otto
631e04b6fc Fixes #13548: Use position: absolute; to fix checkbox and radio line-height problems that were introduced after #13003 2014-06-10 20:50:58 -07:00
Mark Otto
c0e82accad grunt 2014-06-10 20:17:22 -07:00
Mark Otto
9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Mark Otto
4aca4cf866 grunt for table change 2014-06-10 00:26:20 -07:00
Mark Otto
e06970948b Fixes #13616: Add custom gutter support to containers 2014-06-10 00:24:23 -07:00
Mark Otto
9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto
8d9ef8f0a1 Addresses part of #13643: Correct webkit-linear-gradient syntax in horizontal gradients 2014-06-08 23:02:16 -07:00
Mark Otto
85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto
5dbfdd47c5 fixes #13375 2014-06-08 14:08:06 -07:00
Mark Otto
d1872b4c98 Merge branch 'master' into pr/13736 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2014-06-08 13:57:44 -07:00
Mark Otto
5cd72ce230 grunt 2014-06-08 13:55:40 -07:00
Mark Otto
34891de173 grunt 2014-06-08 11:19:35 -07:00
Mark Otto
1e3b93804f grunt 2014-06-08 11:18:59 -07:00
Mark Otto
7231efabde Merge pull request #13745 from twbs/fix-13281 
set not-allowed cursor on disabled radio+checkbox labels
 2014-06-08 11:05:39 -07:00