clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-24 03:57:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,450 Commits 116 Branches 89 Tags 625 MiB
25ec09f06a
Commit Graph

497 Commits

Author SHA1 Message Date
Zlatan Vasović
688ca328c9 Combine multiple .thumbnail > img styles 2013-10-30 10:00:28 +01:00
Mark Otto
c6e76d97ba Fixes #10341: don't change border color on contextual table classes 2013-10-28 21:19:48 -07:00
Mark Otto
67cab7fa05 Fixes #10516: Use auto positioning for dropdowns in justified nav to fix Firefox rendering 2013-10-28 20:51:39 -07:00
Zlatan Vasović
f9eec5b60a Add -moz-osx-font-smoothing 2013-10-28 09:59:24 +01:00
Mark Otto
4cfe307abe Fixes #11206: remove left padding on first inline list item 2013-10-26 14:13:34 +01:00
Zlatan Vasović
aff291e1ca Add .animation() mixin 2013-10-26 14:11:59 +02:00
Zlatan Vasović
20cba845c2 Add another newline to improve final code readability 
This divides banner from code.
 2013-10-26 10:57:09 +02:00
Mark Otto
eed53d7811 Fixes #10601: Use overflow-y: auto; for navbar collapse instead of visible to better enable scrolling on Android 4.x 2013-10-21 01:53:41 -07:00
Mark Otto
ee9be1a30f run grunt on last commit for gradient syntax change 2013-10-20 23:29:23 -07:00
Mark Otto
2eec3f919e Merge branch 'master' into pr/10656 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-20 22:55:45 -07:00
Mark Otto
6ecb5d6cf3 Merge branch 'master' of github.com:twbs/bootstrap 2013-10-20 22:43:03 -07:00
Mark Otto
d8fab5aa6e Fixes #10620: remove gradient on buttons for IE9 in theme.less due to bleed through with rounded corners 2013-10-20 22:41:57 -07:00
Mark Otto
76baacf2c9 Remove default z-index on navbar and only set on static and fixed variants 2013-10-20 21:12:09 -07:00
Mark Otto
e486bb4f39 Fixes #10433: Navbar z-index refactor 
* Resets the default navbar z-index to auto at a certain breakpoint
* Adds fixed navbar z-index var to fixed bottom navbar (previously only on fixed top navbar)
 2013-10-20 20:30:16 -07:00
Mark Otto
5aa4c5cb0c fixes #11139: add position: relative; to .modal-dialog so that z-index takes effect 2013-10-20 20:04:10 -07:00
Mark Otto
369f5ba760 Merge branch 'master' of https://github.com/jeonghwan-kim/bootstrap into jeonghwan-kim-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-20 19:55:56 -07:00
Mark Otto
dd34102cb6 Fixes #10522: Enable use of form validation class on .radio, .checkbox, .radio-inline, and .checkbox-inline 2013-10-20 19:54:22 -07:00
Mark Otto
23a85d6a7a fixes #11126: remove box-shadow from open dropdown toggle with .btn-link 2013-10-20 17:59:15 -07:00
Mark Otto
bc76be5dcf Merge branch 'master' into carousel_indicators_ie 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-20 17:45:07 -07:00
Mark Otto
f45c05a97a fixes #11151: remove unused h5bp class from print CSS 2013-10-20 17:40:19 -07:00
Mark Otto
291fd9828c run grunt dist 2013-10-20 16:48:42 -07:00
Mark Otto
6a93a6b88a Fixes #10903 and #10457: IE8-9 don't support events on elements without background-color, so we have to hack it 2013-10-20 16:46:38 -07:00
Max Edmands
693915d127 Active state overrides contextual list-item styles 2013-10-16 22:56:13 -07:00
Aaron Borden
0c2055ef38 Adding contextual styles to list-items 2013-10-16 19:02:04 -07:00
jeonghwan
976f6dfdad Fixes issue #11122 -- navbar-fixed-bottom border 
Enable border-top in .navbar-fixed-bottom
 2013-10-16 23:20:34 +09:00
Chris Rebert
b05a287eb6 run grunt 2013-10-14 20:47:56 -07:00
Rogério Yokomizo
e20b02ad0b extended hover state of linked versions of .thumbnail 2013-10-14 20:10:49 -03:00
Mark Otto
fa64846acf Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-14 13:45:57 -07:00
Mark Otto
7100711577 unnest the list-group-item link variation for #11085 and #11088 2013-10-14 13:45:32 -07:00
Chris Rebert
5c64ef393c fix .table-responsive media query; refs #11067 2013-10-14 10:58:12 -07:00
Mark Otto
be4e951b7d scope top padding of .form-control-static to be within horizontal forms only; fixes #10927 2013-10-13 20:02:24 -07:00
Mark Otto
44b32a3036 move .hidden to utilities; fixes #10997 2013-10-13 19:59:42 -07:00
Mark Otto
7bd955318a run grunt on that scaffolding change 2013-10-13 19:57:45 -07:00
Mark Otto
f946ff5d25 fix #10257 2013-10-13 19:57:14 -07:00
Mark Otto
bf73f1f9d3 Merge branch 'master' into restore_grid_mixins 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-13 18:59:40 -07:00
Mark Otto
6085973e25 drop .tabbable since it's unused and undocumented /cc #10102 2013-10-13 18:56:31 -07:00
Mark Otto
265fda7903 Merge branch 'master' into restore_grid_mixins 
Conflicts:
	dist/css/bootstrap.min.css
 2013-10-13 18:32:34 -07:00
Mark Otto
590975b407 remove undocumented and unsupported .pill-content and .pill-pane /cc #10102 2013-10-13 15:55:13 -07:00
Mark Otto
6c9ec3d87f run grunt dist on .small additions 2013-10-13 15:54:49 -07:00
Mark Otto
c814ad1833 Combine separate efforts for grid mixins into one, cleanup and reorganize 2013-10-11 22:00:37 -07:00
Mark Otto
352532cd63 Half fix for #9855: Don't fuck with margins for open modal dialog on account of Lion non-scrollbars and inconsistencies elsewhere 2013-10-07 14:39:11 -05:00
Mark Otto
1adbe2043a Fixes #10959: round the .lead values down to nearest pixel via floor() 2013-10-07 14:32:23 -05:00
Chris Rebert
c43462678c run grunt 2013-10-03 10:42:55 -07:00
Chris Rebert
a32b626f5c run up-to-date grunt 2013-10-01 11:01:08 -07:00
Mark Otto
b352061d1d run grunt 2013-10-01 11:37:47 -05:00
Chris Rebert
48f15faa5d run grunt dist 2013-09-23 22:43:48 -07:00
Chris Rebert
b80f58b336 run grunt dist 2013-09-23 22:34:36 -07:00
Mark Otto
000b445a04 Fixes #10755: Don't remove quotes around q element by default 2013-09-22 09:19:37 -05:00
Mark Otto
e148923f27 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-19 22:57:11 -05:00
Mark Otto
ef636bd62d Fixes #10694: Remove unnecessary content property from .caret 2013-09-19 22:56:17 -05:00
XhmikosR
45b6c6de46 Run grunt dist. 2013-09-18 08:14:39 +03:00
Mark Otto
63d1d09ebd run grunt 2013-09-16 21:43:55 -07:00
Chris Ziogas
ab3d0a27b3 Dropdown in panel header does not inherit its colors 
Fix for issue #10627
 2013-09-16 12:38:26 +03:00
Jake Buob
4d4976fdcc Make nav pills border-radius border-radius-base 2013-09-13 15:56:30 -04:00
Mark Otto
28e5572bf4 Fixes #10492: Account for responsive tables in panels 2013-09-11 23:11:18 -07:00
Mark Otto
d88e743b41 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-11 16:35:27 -07:00
Mark Otto
6e064894db remove unnecessary right and left properties on .modal-dialog 2013-09-11 14:56:02 -07:00
Mark Otto
2dc7ab4bbb fixes #10497: Fix Windows 8 and Windows Phone 8 behavior and apply it to the docs 2013-09-11 14:46:31 -07:00
Mark Otto
37933a9e08 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-11 12:31:21 -07:00
Mark Otto
5d1707a25c Remove old and unused .prettyprint styles in code.less (per #10566) 2013-09-11 11:09:50 -07:00
Chris Rebert
2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert
76d8757b0a rm period from licensing header so it's not mistaken as part of the URL 2013-09-10 19:01:40 -07:00
Chris Rebert
a9335e94e1 run grunt dist 2013-09-10 18:59:09 -07:00
Mark Otto
fff5e540f5 fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally 2013-09-08 20:03:52 -07:00
Mark Otto
afb6cf1d01 Match order of vars to order of components; darken some alert borders 2013-09-08 16:58:56 -07:00
Mark Otto
3f158175ce fixes #10521: Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables 2013-09-08 08:04:11 -07:00
Mark Otto
8bea86e2ef fixes #10024: Use negative margin to fix the border between button and input in input groups 2013-09-06 09:50:38 -07:00
Mark Otto
5c4c7eba54 Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-06 09:23:49 -07:00
Mark Otto
b51579241f account for last child bottom border; use 0 instead of none 2013-09-05 15:10:56 -07:00
Mark Otto
1c4bdb053b Fixes #10399: Add hover styles to text emphasis classes 2013-09-04 13:56:32 -07:00
Mark Otto
143403f3fd Fixes #10407: Add line-height to progress bar for proper text alignment within 2013-09-03 20:11:27 -07:00
Mark Otto
0a78e7907d fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width 2013-09-03 15:49:03 -07:00
Mark Otto
b45c3ea647 fixes #10164: Document .center-block mixin and update CSS to include it as a class as well 2013-09-01 11:21:14 +02:00
Mark Otto
d28abc4bf1 fixes #10115: Default carousel controls and Glyphicon controls should behave the same on small devices and up 2013-09-01 11:03:19 +02:00
Mark Otto
62477653e7 fixes #10111: different colors for dropdown link hover and active states 2013-09-01 11:00:40 +02:00
Mark Otto
560753da96 Merge branch 'master' into table-nesting 
Conflicts:
	dist/css/bootstrap.min.css
 2013-09-01 09:59:27 +02:00
Mark Otto
4b53ea52e9 fixes #10223: adds color to input addon 2013-09-01 09:53:41 +02:00
Mark Otto
794d784519 fixes #10153: restore headings-color variable 2013-09-01 09:49:28 +02:00
Chris Rebert
2ef147b16b fix #10252 by restricting Android Firefox reset to only .form-control & .btn 2013-08-28 15:37:34 -07:00
Chris Rebert
901da1b2b4 use direct-child selector more in table styles to better support nested tables; fixes #10231 2013-08-27 17:13:34 -07:00
Mark Otto
7796e645c9 Add margin to thumbnails for proper spacing 
Hadn't thought about this until fixes #10137, but it makes sense I
think to have margin on the bottom of thumbnails for spacing when
stacking (or using different grid tiers).
 2013-08-26 17:48:32 -07:00
Mark Otto
4d23aa4ef5 Address #9873 and fix #9774 
* Update styling of justified nav links to be more mobile friendly
(with all four rounded corners and some margin between items)
* Add note to docs to callout bogus WebKit rendering on component and
example
 2013-08-26 17:37:52 -07:00
Mark Otto
4c794aaaef grunt dist on glyphicons width change 2013-08-24 13:59:03 -07:00
Mark Otto
9733a998e2 fixes #9969: add support for output element 2013-08-24 00:14:09 -07:00
Mark Otto
fc0e7686fb Merge branch 'master' of https://github.com/charnog/bootstrap into charnog-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-23 23:40:12 -07:00
Mark Otto
adac269f95 grunt on previous ms scroll fix 2013-08-23 23:32:16 -07:00
Mark Otto
0a2ec5545b Merge branch 'master' of https://github.com/apexskier/bootstrap into apexskier-master 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-23 23:16:37 -07:00
Mark Otto
48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -07:00
Mark Otto
fab039f29b run grunt 2013-08-23 14:26:16 -07:00
Mark Otto
12a70cec88 Run grunt dist on theme for some reason 2013-08-23 14:23:13 -07:00
Mark Otto
2b37d2b533 Update and document use of small in headings 2013-08-23 14:22:51 -07:00
Mark Otto
a0d0864bd7 fixes #9877: improve active state on nav list items in theme 2013-08-23 10:44:13 -07:00
Mark Otto
5bbbdb399b fixes #9879: add hover state to theme buttons 2013-08-23 10:36:37 -07:00
Cameron Little
9bdc841acc Added -webkit-overflow-scrolling: touch to responsive tables 2013-08-23 08:55:02 -07:00
Jason Nutter
a40568a1e0 Fixing carousel control positioning 
The left control should be positioned from the left, while the right
control should be positioning from the right. Positioning both from the
left results in the right carousel control being incorrectly positioned
(most noticeable with a larger than normal font size).
 2013-08-21 15:51:24 -07:00
James Lawrence
2cb1626907 Fixes #9974 
Added th selector in .table-row-variant mixin
 2013-08-21 17:56:36 +01:00
Denis Gonchar
4284fc0a5e fix #9941 2013-08-21 15:57:48 +06:00
Mark Otto
3f87bf46e4 fixes #9855: account for modal overflow on body hiding scrollbar 2013-08-19 13:16:32 -07:00
Mark Otto
c15b259f43 run grunt dist for #9864 2013-08-19 10:43:58 -07:00
Mark Otto
16976cc494 Fixes secondary issue in #9798 2013-08-19 09:36:56 -07:00
Mark Otto
7bc845abfa Add default navbar z-index to fix #9844 
iOS doesn't pick up the z-indexing properly on the dropdowns unless you
specify one for the parent navbar.
 2013-08-19 09:31:16 -07:00
Mark Otto
01f7bc4d86 run grunt dist on #9847 2013-08-19 08:59:12 -07:00
Mark Otto
f497b5e1f5 move dropdown change from navbar to dropdowns to fix customizer compiling 2013-08-19 08:54:40 -07:00
Mark Otto
a9297c7ad2 save and recompile for that last commit 2013-08-19 08:51:25 -07:00
Mark Otto
285393fb77 Re-enable glyphicons in carousel controls and then remove redundant CSS from example 2013-08-19 00:58:29 -07:00
Mark Otto
d8128fca94 Change up label padding to equalize top and bottom 2013-08-19 00:36:39 -07:00
Mark Otto
14c4484ec4 Nuke margin for last child navbar text 2013-08-19 00:34:31 -07:00
Mark Otto
efa8b40ce8 Run grunt dist on responsive changes 2013-08-19 00:34:16 -07:00
Mark Otto
e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Mark Otto
e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Mark Otto
a9378a9267 Merge branch '3.0.0-wip' into bs3_homepage 
Conflicts:
	customize.html
	dist/css/bootstrap.min.css
 2013-08-18 20:15:45 -07:00
Mark Otto
a1db2d7a5e Merge branch '3.0.0-wip' into bs3_panel_base_class 
Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-08-18 20:11:04 -07:00
Mark Otto
e6ff75bcea Update var in theme 2013-08-18 19:57:25 -07:00
Mark Otto
bab51d27ac Refactor panels to have a base class for improved flexibility when customizing (and no overriding to start, too) 2013-08-18 19:40:57 -07:00
Mark Otto
d5cd040f57 improve dependencies for image thumbnails and thumbnail component 2013-08-18 19:24:10 -07:00
Mark Otto
cf09e6a6b5 better alignment of glyphicons vertically 2013-08-18 19:05:48 -07:00
Mark Otto
5bd2d7ed7e fixes #9815: proper alignment of navbar nav if first child 2013-08-18 18:49:07 -07:00
Mark Otto
c240460f0b Merge branch '3.0.0-wip' into glyphicons-LESS-fixes 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-18 15:47:29 -07:00
Mark Otto
7b4e2a9a4a Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-18 15:43:27 -07:00
Mark Otto
fe767a18d3 fixes #9798: update spacing on checkboxes and radios for horizontal 2013-08-18 15:41:24 -07:00
Chris Rebert
0501d83f8b regenerate CSS 2013-08-18 15:20:16 -07:00
Mark Otto
9b61b7a722 fixes #9803: label and input alignment in horizontal forms 2013-08-18 15:10:28 -07:00
Julian Thilo
546b2cc614 Fix some forgotten things for navbar-default 
New variable names were missing here and there.
 2013-08-18 23:30:40 +02:00
Julian Thilo
abca00870f Add a .navbar-default class for default colors 
* Extract color styles from .navbar { } and put them into
.navbar-default { }
* Change variable names
* Change the docs accordingly (i.e., add the .navbar-default class to
all default navbars)
* Change customizer accordingly
 2013-08-18 23:05:56 +02:00
Mark Otto
9b66e6b0f4 fixes #9790: nullify right padding in container-ed navbars when last element in collapse is a right aligned navbar nav 2013-08-18 11:17:28 -07:00
Mark Otto
26067d3d7d fixes #9768: unbold buttons 2013-08-18 11:11:31 -07:00
Mark Otto
ef4590dfb4 fixes #9786: enable tables in panels 2013-08-18 11:08:20 -07:00
Mark Otto
f8b65b41ab Merge branch '3.0.0-wip' into bs3_restore_glyphicons 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-18 10:28:32 -07:00
Mark Otto
73a1a4133c combine and simplify caret border widths 2013-08-18 10:08:18 -07:00
liuyl
ce410dc36e fixed caret 2013-08-18 20:13:48 +08:00
Mark Otto
e13ca6d384 Upgrade to latest glyphicons 2013-08-18 01:46:26 -07:00
Mark Otto
f2e35bf702 docs layout and alignment refinement 2013-08-18 01:23:45 -07:00
Mark Otto
1e0453f825 Restore glyphicons 2013-08-18 00:36:51 -07:00
Mark Otto
f891f91bac Reorder bootstrap.less to match docs oder 2013-08-17 21:18:00 -07:00
Mark Otto
9533a1339f Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 21:00:20 -07:00
Mark Otto
5539db5237 Navbar update 
Addresses a few different cases where the navbar has and doesn't have a
container, and accordingly adjusts the padding and margin of key
elements.
 2013-08-17 21:00:13 -07:00
Mark Otto
d713f8341c Update jumbotron 
* Defaults to no rounded corners and full width in the viewport
* When in a container, the jumbotron has extra padding and will have
rounded corners
* Updates default jumbotron example to show the full width default
display

Fixes #9759.
 2013-08-17 20:33:52 -07:00
fat
47fcb322eb Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 20:29:36 -07:00
fat
734b6acf13 add small fix for tooltip consistency + fix customizer syntax issue 2013-08-17 20:28:58 -07:00
Mark Otto
c56a749323 Finish first pass at and docment Bootstrap v2-ish theme 
* Adds new "theme" example
* Adds new theme.less file to provide all the overrides and additional
styles for the theme
* theme.less compiles, via Grunt, to two new files to `dist/css`,
bootstrap-theme.css and bootstrap-theme.min.css
 2013-08-17 18:59:50 -07:00
Mark Otto
ba20e512ce Merge branch '3.0.0-wip' into bs3_theme 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-17 17:31:58 -07:00
Mark Otto
e587219958 Fix navbar brand alignment by removing header padding when above 768px 2013-08-17 17:26:52 -07:00
fat
2dbf02b129 rebuild 2013-08-17 16:19:09 -07:00
fat
c0eabdda9f fixes #9543 2013-08-17 16:11:05 -07:00
Mark Otto
6636734388 Fixes #9752: clear floats in .panel-body 2013-08-17 15:46:42 -07:00
fat
a10ec62f63 fixes #9579 2013-08-17 15:05:59 -07:00
fat
2d875c8d5e Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-17 14:25:16 -07:00
fat
33f448f605 rebuild 2013-08-17 14:25:04 -07:00
Mark Otto
6ca32589b5 2px border on thead th elements for just a tad more separation 2013-08-17 14:15:33 -07:00
Mark Otto
0c70744ea2 fixes #9538: prevent Firefox rendering bug via some border-fu 2013-08-17 13:33:53 -07:00