rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-04 16:24:22 +01:00
Code Issues Actions Packages Releases Activity
10,214 Commits 108 Branches 89 Tags 547 MiB
5589a82e80
Commit Graph

10214 Commits

This Branch
This Branch
All Branches
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
42c2918372 Fix up margins and unnest code 2014-10-25 18:13:35 -07:00
Mark Otto
a0e6bd96de grunt 2014-10-25 17:54:06 -07:00
Mark Otto
57b60e3a04 Merge pull request #14869 from lipis/glyphicon-eur 
Added alias for euro -> eur
 2014-10-25 17:50:08 -07:00
Mark Otto
018c1c0b6e Merge pull request #14871 from twbs/fix-#14810 
Move "Copy" button in `code`.
 2014-10-25 17:49:13 -07:00
Heinrich Fenkart
e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
Heinrich Fenkart
1403748907 Merge pull request #14873 from twbs/revert-14569-scrollspy-ignore-invisible-targets 
Revert "Scrollspy: ignore invisible list items"
 2014-10-26 01:56:08 +02:00
Heinrich Fenkart
c1f669e83b Revert "Scrollspy: ignore invisible list items" 2014-10-26 01:50:38 +02:00
XhmikosR
db550a9235 Run grunt. 2014-10-25 14:12:21 +03:00
XhmikosR
0ad97ab446 Update node dependencies. 2014-10-25 14:12:20 +03:00
Panayiotis Lipiridis
49bcdcb0a8 Added alias for euro -> eur 2014-10-25 01:15:04 +02:00
XhmikosR
0ba39d45b4 Move "Copy" button in code. 2014-10-25 01:48:02 +03:00
Mark Otto
a92aea5127 Merge pull request #14786 from andy-saint/links 
Added link hover decoration variable
 2014-10-24 13:28:46 -07:00
Mark Otto
80aca8c17e grunt 2014-10-24 13:27:28 -07:00
Mark Otto
79b38361ab 20px from bottom because the final frontier 2014-10-24 13:26:05 -07:00
Mark Otto
1979a311d4 Merge branch 'master' of github.com:twbs/bootstrap 2014-10-24 13:24:34 -07:00
Mark Otto
23e3995cec guhrunt 2014-10-24 13:24:28 -07:00
Mark Otto
e631b721ec Merge pull request #14848 from knownasilya/patch-1 
Make the docs' nav sidebar scrollable
 2014-10-24 13:24:14 -07:00
Mark Otto
dbd45f2f6c Merge pull request #14857 from twbs/fix-14856 
Fix #14856
 2014-10-24 12:09:44 -07:00
Jenn Dodd
e8643ed8b3 Remove .media-object from docs. 
Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
 2014-10-23 18:48:50 -04: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
Chris Rebert
3bea2a45ef Merge pull request #14847 from twbs/node-deps 
Update node dependencies.
 2014-10-23 13:53:35 -07:00
Chris Rebert
16a5f874d0 grunt update-shrinkwrap 
[skip sauce]
 2014-10-23 13:26:48 -07:00
XhmikosR
d59b235242 Update node dependencies. 2014-10-23 13:26:48 -07:00
XhmikosR
2df585ad6b Merge pull request #14860 from twbs/comment-typo 
Fix a small typo in comment.
 2014-10-23 09:19:03 +03:00
XhmikosR
f33ed634fc Docs: Use a 180x180 apple-touch-icon.png. 
Refs:
1c4fcf3214
345925f043

[ci skip]
 2014-10-23 09:17:27 +03:00
XhmikosR
41dbc53b9b Fix a small typo in comment. 
[ci skip]
 2014-10-23 09:11:12 +03:00
Heinrich Fenkart
51f1f58be8 grunt 2014-10-23 06:39:51 +02:00
Heinrich Fenkart
9814256736 Merge pull request #14852 from twbs/jquery-version-check 
Add jQuery version check to existing jQuery presence check
 2014-10-23 06:15:36 +02:00
Heinrich Fenkart
fe51148434 Merge pull request #14669 from vsn4ik/dropdown_event_target 
Use e.target instead :focus selector.
 2014-10-23 06:13:46 +02:00
Heinrich Fenkart
1604af041b Add jQuery version check to existing jQuery presence check 
Fixes #14809.
Closes #14825.
 2014-10-23 05:57:15 +02:00
Heinrich Fenkart
e0cea19cbc grunt 2014-10-23 05:23:29 +02:00
Chris Rebert
57e4b58782 Merge pull request #14859 from twbs/fix-14853 
Clarify order of tabs events
 2014-10-22 18:57:43 -07:00
Chris Rebert
5c18722453 Merge pull request #14858 from twbs/fix-14802 
Document .alert-dismissible .close restrictions
 2014-10-22 18:40:43 -07:00
Chris Rebert
b421dc9490 Clarify order of tabs events; fixes #14853 
[skip sauce]
 2014-10-22 18:38:18 -07:00
Chris Rebert
8d806b0ae5 Document .alert-dismissible .close restrictions; fixes #14802 
[skip sauce]
 2014-10-22 18:05:42 -07:00
Chris Rebert
58143b128b Fix #14856 
[skip sauce]
 2014-10-22 17:53:59 -07:00
Heinrich Fenkart
3c98dd35ba Fix IE8 unit test breakage introduced by #14767 2014-10-22 22:09:58 +02:00
Phil Hughes
ab8dbc214e Implement hide and hidden events for tabs 
Closes #14772.
 2014-10-22 21:42:35 +02:00
Heinrich Fenkart
40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart
95e0f48e3a Follow-up to e2cfbd5: Fix spaces in placement calculation 2014-10-22 21:38:34 +02:00
saranya.r
e2cfbd5f2d Fixes tooltip misplacements in scrollable viewports with auto positioning 
Fixes #14756.
Closes #14767.
 2014-10-22 21:35:44 +02:00
Heinrich Fenkart
2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
Patrick H. Lauke
e1d40f7633 Add aria-pressed to single toggle buttons 
also includes tiny fix/clarification to two existing unit tests for the
.active class, adding data-toggle=“button” explicitly to the tested
buttons

Closes #14819.
 2014-10-22 21:02:19 +02:00
Heinrich Fenkart
60bb69acd5 Merge pull request #14829 from lipis/blank-lines 
Added/removed blank lines in the docs for consitency
 2014-10-22 19:46:40 +02:00
Ilya Radchenko
fb70b13dc3 Allow to scroll the nav 
Basically it's impossible to use the navigation if it's expanded. This will allow it to be scrollable so that the menus are accessable.
 2014-10-22 11:56:12 -04:00
XhmikosR
b2385016ec Merge pull request #14794 from twbs/docs-libs 
Update customizer libraries
 2014-10-22 18:52:05 +03:00
Chris Rebert
3a7d2691be Merge pull request #14830 from lipis/sort 
Sorted various lines using atom/sort-lines
 2014-10-22 08:45:02 -07:00
Chris Rebert
fece552ce0 Merge pull request #14841 from twbs/role-button 
add role="button" to a couple more dummy-anchor btns
 2014-10-22 08:31:35 -07:00