rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-22 14:52:17 +01:00
Code Issues Actions Packages Releases Activity
11,821 Commits 108 Branches 89 Tags
Commit Graph

2907 Commits

Author SHA1 Message Date
Mark Otto
82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
Mark Otto
f2adfeb62d Merge pull request #16405 from rlindner81/Fix16371 
Fixes Issue #16371 Carousel control is vertically off center
 2015-05-13 20:48:07 -07:00
Mark Otto
fdebec3957 Merge pull request #16462 from kkirsche/patch-12 
[Closes #16460] Fix .pagination-sm line height
 2015-05-13 20:38:48 -07:00
Kevin Kirsche
5907347382 [Closes #16460] Fix .pagination-sm line height 
[Closes #16460] Fix .pagination-sm line height by adding `@line-height-small` to `.pagingation-sm`.
 2015-05-13 16:30:40 -04:00
Kevin Kirsche
25dcaf4f23 [Closes #16447] Concat. license to bootstrap.less 
[Closes #16447] Concat. license to bootstrap.less
 2015-05-11 23:55:32 -04:00
Richard Lindner
d255ba3719 Fixes Issue #16371 Carousel control is vertically off center for small screens 2015-05-02 10:49:44 +02:00
Zac Echola
407e8dc9d8 Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons 2015-04-28 09:45:16 -05:00
XhmikosR
27ada0f5e2 dropdowns.less: Add space before IE8 workaround. 
This in turn works around an issue with clean-css (fixed in 3.2.6). So this basically is just a consistency change.
 2015-04-28 14:24:33 +03:00
Martin Bean
9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
Mark Otto
8cd3527f73 Remove inaccurate comment 2015-04-25 23:35:09 -07:00
Mark Otto
d34df63bde Merge pull request #16280 from arxene/issue-16270 
Fixes #16270.
 2015-04-25 22:17:01 -07:00
Mark Otto
1e64e720a4 Merge pull request #16333 from pine3ree/patch-2 
form-group size + form-control-feedback
 2015-04-25 21:45:31 -07:00
Mark Otto
2b1c06f5b1 Merge pull request #16351 from thomasphorton/gutterRounding 
Round results from gutter division to prevent decimal margins and padding
 2015-04-25 21:42:44 -07:00
Thomas P. Horton
ccb53aa983 Fix collapsing .img-thumbnail due to display: table-cell clashing with max-width 2015-04-24 21:21:39 -07:00
Thomas P. Horton
c319d610e2 Round results from gutter division to prevent decimal margins and padding 2015-04-23 20:06:54 -07:00
maks feltrin
d42fbb9830 form-group size + form-control-feedback 
automatically feedback icon sizing inside a larger|smaller form-group.
 2015-04-22 19:47:25 +02:00
Chris Rebert
e93802b821 Merge pull request #16258 from twbs/fix-16172 
Use CSS hack to fix IE8 .caret regression
 2015-04-21 21:44:08 -07:00
Chris Rebert
c256aca13c https://github.com/necolas/normalize.css/pull/379 was rejected 
Refs #15947
 2015-04-21 17:53:44 -07:00
Chris Rebert
e33801e654 Merge pull request #16279 from twbs/fix-16276 
Make .btn in .btn-toolbar float:left too
 2015-04-13 10:16:42 -07:00
Ray McMahan
b8a4bc1b93 Fixes #16270. 
Badges now appeared vertically centered next to text. Previously, badges appeared to be somewhat lower than tall text such as h1's next to it.
 2015-04-13 01:24:56 -05:00
Chris Rebert
ee385d5980 Merge pull request #16256 from twbs/fix-16247 
Add px unit to perspective property value
 2015-04-12 17:16:16 -07:00
Chris Rebert
150d454848 Merge pull request #16086 from twbs/fix-15925 
Reset text/font properties more thoroughly for tooltips+popovers
 2015-04-12 17:08:03 -07:00
Chris Rebert
04f60a7a81 Make .btn in .btn-toolbar float:left too; fixes #16276 
[skip sauce]
[skip validator]
 2015-04-12 13:13:59 -07:00
Chris Rebert
22178f9c3b rm defunct workaround for OS X Chrome <select> printing bug 
Chrome fixed the bug several versions ago
(see https://github.com/twbs/bootstrap/issues/11245#issuecomment-57494756 )
thus rendering this workaround unnecessary.

[skip sauce]
 2015-04-08 03:53:46 -07:00
Chris Rebert
5359cb8054 Reset text/font properties more thoroughly for tooltips+popovers; fixes #15925 
[skip sauce]
 2015-04-08 00:52:10 -07:00
Chris Rebert
1bc9fb626c hoist text-decoration reset up from .tooltip-inner to .tooltip 2015-04-08 00:50:38 -07:00
Chris Rebert
07a5d55f01 tooltip: line-height: 1.4 => @line-height-base 2015-04-08 00:50:38 -07:00
Chris Rebert
2b3a9cda4e Use CSS hack to fix IE8 .caret regression introduced by #15697; fixes #16172 
[skip sauce]
[skip validator]
 2015-04-07 22:04:40 -07:00
Chris Rebert
e9a747246a add px unit to perspective property value; fixes #16247 
[skip sauce]
[skip validator]
 2015-04-07 18:13:21 -07:00
Mark Otto
fe41ca34e5 Merge pull request #15978 from sqal/fix_pagination_border_on_hover 
[Fixes #15976] Fix pagination link cut off border on hover
 2015-04-05 00:03:32 -07:00
Mark Otto
4cae6634ca property order 2015-04-05 00:02:40 -07:00
Mark Otto
83d10bb5a7 Merge pull request #15945 from kkirsche/patch-9 
[Fixes #15944] Add Z-Index to avoid border overlapping
 2015-04-05 00:02:14 -07:00
Mark Otto
f93fba2bef Merge pull request #16234 from twbs/normalize_303 
Normalize v3.0.3
 2015-04-04 23:59:45 -07:00
Mark Otto
510f56f334 Merge branch 'master' into fix_15830 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2015-04-04 23:52:40 -07:00
Mark Otto
7735bfe388 Merge pull request #16224 from vsn4ik/fix_theme_disabled_btn 
Fix theme.css .btn[disabled] styles.
 2015-04-04 23:47:48 -07:00
Mark Otto
f2ee20f8d8 bring in normalize's v3.0.3 changes 2015-04-04 23:37:06 -07:00
vsn4ik
d6acfd3ef4 Fix theme.css .btn[disabled] styles. 2015-04-04 13:18:16 +03:00
Mark Otto
6d2599be92 Merge pull request #16176 from twbs/input_group_sizing 
Static form control sizing in input groups, again
 2015-04-04 01:35:13 -07:00
Zac Echola
e46c998316 Adds button styles to .list-group-item 
Includes buttons with anchor sytles and modifies buttons to match width
and text alignment.
 2015-04-02 14:07:53 -05:00
Mark Otto
27da9b290a Fixes #15536: Resize .control-label's font-size and account for border on static form control in form groups 2015-03-28 22:43:33 -07:00
Mark Otto
a2c69b8145 fixes #15830: properly reset border-radius on list items in collapsing panel groups 2015-03-28 21:37:40 -07:00
Mark Otto
e90d69c28c Merge pull request #15956 from twbs/input-group-sizes-glyphicon 
Input group sizes: Properly position `.form-control-feedback`
 2015-03-28 21:07:56 -07:00
Mark Otto
f025840eae Merge pull request #16159 from twbs/input_sizing 
Fixes #15074
 2015-03-28 20:52:14 -07:00
Mark Otto
b5fefefd49 Match all other responsive utilities and use important on the display: table 2015-03-28 20:34:06 -07:00
Mark Otto
57c8e3cd51 Merge branch 'master' into input_sizing 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
 2015-03-28 20:31:53 -07:00
Patrick H. Lauke
59bbb65e5f Merge pull request #16154 from patrickhlauke/focus-active-disambiguation 
Darker style focus/hover on active buttons
 2015-03-28 00:40:34 +00:00
Serhan Apaydın
85837639ee Make .bg-variant adjust :focus color in addition to :hover color 2015-03-26 11:45:17 +02:00
Chris Rebert
cf0f3218cb Merge pull request #16089 from max-b/jumbotron-font-size 
Jumbotron: Putting heading font size in variables to allow for easier overrides
 2015-03-25 22:39:55 -07:00
Serhan Apaydın
ba2d556455 Make .text-emphasis-variant adjust :focus color in addition to :hover color 
Closes #16047 by merging a tweaked version of it.
 2015-03-25 22:08:36 -07:00
Mark Otto
df8010b815 Fixes #15074: Manually handle input sizing in form groups instead of using mixins because nesting 2015-03-25 21:18:19 -07:00