clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-26 21:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,532 Commits 116 Branches 89 Tags 631 MiB
b22f064c2e
Commit Graph

542 Commits

Author SHA1 Message Date
Mark Otto
c7c9929c12 Fixes #11770: Move component-animations.less to the utility section of import list to match Customizer 2013-12-15 12:31:40 -08:00
Mark Otto
a7029edc61 Restyle the blockquote to not thin text or change line-height 2013-12-15 11:29:58 -08:00
Mark Otto
168469f545 Fixes #11588: Scope font-size to only p elements in a .jumbotron and remove the supersized line-height from the base class 2013-12-14 21:50:47 -08:00
Mark Otto
072ccd4dda Fixes #11572: Add contextual background-color classes to match text classes; move both sets of classes to Helper Classes section of the CSS docs 2013-12-14 21:40:16 -08:00
Mark Otto
432b9f9cde Fixes #11561: Add float: left; to .form-control within input groups to prevent IE9 from screwing up placeholder text and select menu arrows 2013-12-14 20:04:12 -08:00
Mark Otto
46c3d27468 Merge branch 'master' into pr/11435 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:56:56 -08:00
Mark Otto
4c64c1eecd Merge branch 'master' into pr/11302 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-14 16:46:40 -08:00
Mark Otto
323a40cc53 Merge branch 'master' into pr/11162 
Conflicts:
	less/modals.less
 2013-12-14 16:29:47 -08:00
Mark Otto
544b8ecab7 Fixes #10921: Add support for input groups within button toolbars 
* Floats any `.input-group` within a toolbar
* Simplifies the CSS to remove sibling selectors and instead use a
negative amrgin on the parent with only `margin-left`

See it in action: http://jsbin.com/aGEcUqAT/1/.
 2013-12-14 16:03:21 -08:00
Mark Otto
a54dbfdf2a Merge branch 'master' into pr/10951 
Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less
 2013-12-14 15:38:21 -08:00
Mark Otto
11c6ab767c Fixes #10370: Improved and deprecated dropdown menu alignment options 
* Removes an old pair of selectors that didn’t properly target the
right-aligned navbar alignment of dropdown menus.
* Deprecates the `.pull-right` alignment in favor of a more specific
and unique class name.
* Adds `.dropdown-menu-right` as the new alignment class. This is then
mixin-ed into the `.navbar-right.navbar-nav` dropdown menus for
auto-alignment.
* To override that auto-alignment, use `.dropdown-menu-left` as needed.
 2013-12-14 13:22:56 -08:00
Mark Otto
ecc6f4e6bc Merge branch 'master' into pr/11868 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-14 11:36:54 -08:00
Mark Otto
22820d7151 Fixes #10495: Float Glyphicon and set margins in .navbar-brand to ensure there is no added height because wtf even is CSS 2013-12-13 23:06:04 -08:00
Tobias Lindig
37b2c8a812 add dist files. 2013-12-13 12:27:56 +01:00
Tobias Lindig
3b5e0c9a3c hide space characters in input-group-btn to fix segmented buttons double border 2013-12-10 16:47:12 +01:00
Chris Rebert
9e38e25534 enable CSS source maps in grunt-contrib-less 2013-12-09 14:29:19 -08:00
Mark Otto
d466d527a4 Undo merge of #11778 and use cleancss min option 2013-12-09 00:12:11 -08:00
Mark Otto
ea61a19a04 Merge branch 'pr/11778' into drop_recess_for_less 
Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css
 2013-12-08 23:48:07 -08:00
Mark Otto
0016c17f93 Switch to &:extend(.clearfix all) for clearfix mixin 
Original discussion:
https://github.com/less/less.js/issues/1437#issuecomment-21383639.

Since we’re switching to `grunt-contrib-less`, we can take advantage of
newer LESS features than what RECESS supported. Included in that is the
ability to `:extend`, and not only that, but `:extend(.mixin-name
all)`. By doing so, we remove duplicate CSS for all our elements that
were being clearfix-ed.

Fixes #8947, #8968, #8991, #9257, #9268, #9291, #9430, #9604, #9686,
#9929, #10731, #10793, #11305, #11498, #11533, #11570, #11604, #11652.

(dem issues, tho)
 2013-12-08 23:18:28 -08:00
Mark Otto
2a4621b71f Merge branch 'master' into drop_recess_for_less 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 23:00:01 -08:00
Mark Otto
e4c1ef7c6d more closely align property order with recess 2013-12-08 22:55:09 -08:00
Mark Otto
0991c7c341 specify block indent as numeral to prevent fubared media query output 2013-12-08 22:33:24 -08:00
Mark Otto
e90ce1c0d5 single array == no rogue spaces 2013-12-08 22:32:07 -08:00
Mark Otto
4540f9e2d2 derp, don't sort min /cc @cvrebert 2013-12-08 22:16:43 -08:00
Mark Otto
aae9c2d136 merge, compile 2013-12-08 22:11:46 -08:00
Mark Otto
6df909ad9b Fixes #11786: Nest media queries within print utilities for mixin-friendliness 2013-12-08 19:19:06 -08:00
XhmikosR
fdc5d1dc34 Minify css with clean-css. 2013-12-08 13:05:10 +02:00
Mark Otto
1f9bfa89dc Fixes #11741: Don't set headings font-family again, just use inherit 2013-12-08 02:14:24 -08:00
Mark Otto
c37b710e85 Merge branch 'master' into pr/11744 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-08 02:00:37 -08:00
Mark Otto
b5008ebf9c add vertical-align back to where it's necessary since we reset from block to inline-block on several inputs 2013-12-08 01:59:44 -08:00
Mark Otto
12500047f9 Merge branch 'master' into pr/11750 
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
 2013-12-08 01:45:42 -08:00
Mark Otto
6273604601 Add .container-fluid variation for full-width containers and layouts 
/cc #10711 #9862
 2013-12-07 20:52:51 -08:00
Mark Otto
a9b86cbfde Merge branch 'pr/11138' 
Conflicts:
	dist/css/bootstrap.min.css
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
 2013-12-07 14:10:41 -08:00
Mark Otto
07de53c644 Contextual list group cleanup 
* Adds nav link to sidebar for contextual classes
* Refactors to use prefixed classes, like .list-group-item-info, instead of chained classes
* Adds default and linked variations to example in docs
 2013-12-07 14:09:03 -08:00
Mark Otto
a1f737b436 grunt dist after adding .text-justify 2013-12-07 12:19:17 -08:00
Mark Otto
b1215d1b2e Fixes #11193: Add kbd element styles to indicate user input via keyboard 2013-12-07 12:18:13 -08:00
Mark Otto
fe58357df1 Fixes #10884: Adds .info variant to contextual table classes 2013-12-07 11:56:35 -08:00
Mark Otto
c07632e4e8 Reorder button and table variants for consistent order 2013-12-07 11:47:37 -08:00
Mark Otto
107b334d34 Fixes #11766: Use color var for background on badges in buttons to restore proper background to default button badge 2013-12-07 11:45:11 -08:00
XhmikosR
f4087df47e Remove incompatible properties. 2013-12-07 04:52:20 +02:00
Zlatan Vasović
78b43d4c99 Darken icon bar to meet WCAG 2013-12-06 22:34:29 +01:00
Luke Noel-Storr
b92bee99ef reverted changes in commit 96109d3 which seemed to break conditional classes in striped tables (ignoring the comment above that the previous rules were needed for just this purpose) 
fixes issue twbs/bootstrap#11728
 2013-12-06 14:11:58 +00:00
Mark Otto
cf81cb60ef Merge branch 'master' into gradient-prefix-cleanup 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
 2013-12-04 21:23:09 -08:00
Mark Otto
a45d839874 Fixes #11712: Better support for .table-responsive within .panel's 2013-12-04 21:13:33 -08:00
Mark Otto
a42e9163cb Merge branch 'master' into responsive-visibility-table 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-03 22:58:25 -08:00
Chris Rebert
4a45650026 fix .btn-group-xs portion of #10979 2013-12-03 18:03:04 -08:00
awebdeveloper
3f1e4b92ee -moz and old webkit syntax removed for gradients based on 
http://caniuse.com/#search=grad
 2013-12-03 14:13:55 -08:00
Chris Rebert
303f8a33c3 add <table> case to responsive-visibility mixin; see #10056 2013-12-03 13:57:28 -08:00
Chris Rebert
bac153127c grunt 2013-12-03 13:54:56 -08:00
Zlatan Vasović
2b56ff0461 Reduce size of the visibility styles 2013-12-02 07:50:17 +01:00
Mark Otto
4876cbeef8 Merge branch 'master' into pr/11412 
Conflicts:
	dist/js/bootstrap.min.js
 2013-12-01 20:27:30 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto
5a0365524d Rework navbar padding and margins for right aligned last-child elements 
This slight reworking of the navbar spacing was brought about by a
problem noted in #11530: use of `.navbar-form.navbar-right` leaves an
extra 15px of space on the right.

Here’s what’s new:

* Removed the `padding` on `.navbar-collapse` within static top, fixed
top, and fixed bottom navbars. Meaning, it’s still there for the
default navbar. This was the root cause of the extra 15px padding for
navbar forms.
* As part of this, I also replaced the existing negative margin
overrides for last-child elements with more contextual ones within
their sub-components.

Overall not too different, but should be more effective now and easier
to work with now.

For example of new changes, see http://jsbin.com/odeSiSo/1/.
 2013-12-01 19:27:33 -08:00
Mark Otto
d417fcecea Fixes #11357: Vertically center sm and xs buttons in the navbar 2013-12-01 18:13:27 -08:00
Mark Otto
556d6cef3e Fixes #10941: Fix Glyphicons path for those importing bootstrap.less from another directory 2013-12-01 00:20:47 -08:00
Mark Otto
53047fa587 Merge branch 'master' into pr/11536 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-30 23:35:56 -08:00
Mark Otto
48269dcd28 Fixes #11658: Increase min-height of .radio and .checkbox for horizontal forms to ensure alignment of content below 2013-11-30 23:17:43 -08:00
Mark Otto
841da88f3f Remove browser default top margin from dl elements 2013-11-30 23:08:41 -08:00
Mark Otto
cf40b5db60 Fixes #11623: Reset position to static for grid columns within tables to unfuck borders in IE9/10 and Firefox 2013-11-30 23:04:55 -08:00
Mark Otto
22da6fcfb2 grunt 2013-11-30 21:17:53 -08:00
Mark Otto
6bc09dd949 Fixes #11268: Account for badges within buttons by matching background to text color and text color to background 2013-11-30 16:29:52 -08:00
Mark Otto
67d4e3323d Fixes #11277: Drop the abbr element from the .initialism selector 2013-11-30 16:18:07 -08:00
Mark Otto
7aa6b4190b Fixes #11402: Set width: auto; to select.form-control within .form-inline 2013-11-30 15:57:25 -08:00
Mark Otto
d2f8b5327b Fixes #11515: Reorder the headings with body text and text emphasis classes 2013-11-30 14:58:35 -08:00
Mark Otto
21e2ae9489 Fixes #11544: Add color: inherit; to .panel-title to ensure proper text color when customizing @headings-color 2013-11-30 14:53:54 -08:00
Mark Otto
82bbccde9b Merge branch 'master' into pr/11648 
Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less
 2013-11-30 13:09:55 -08:00
Mark Otto
853b69f2df Fixes #11351: Correct grid class reset on input groups by using attribute selector, not an old class from v3 betas 2013-11-30 12:52:08 -08:00
Mark Otto
a52e528d27 Fix up new margins on modals by not setting auto until screen-sm-min 2013-11-30 11:56:06 -08:00
Mark Otto
080aa7f5c8 Merge branch 'master' into pr/11299 
Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js
 2013-11-30 00:55:00 -08:00
Mark Otto
a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Mark Otto
bb4a39d51c Merge branch 'master' into pr/11388 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-30 00:26:53 -08:00
Mark Otto
8674228521 Merge branch 'pr/11493' 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-29 23:30:26 -08:00
Mark Otto
9f0da54856 grunt to get dist files 2013-11-29 23:29:34 -08:00
Mark Otto
e4848286c8 Fix #10979: Don't use .img-thumbnail as a mixin for .thumbnail to avoid dupe and unnecessary styles 2013-11-29 23:19:04 -08:00
Mark Otto
bf9f39270c Fixes #11425: Use margin instead of padding on .modal-dialog to enable click-thru to .modal-backdrop 2013-11-29 22:03:49 -08:00
Mark Otto
36b82c37ec Implement #11174 to fix #10936: increase height of large inputs to fix Firefox inconsistencies 2013-11-29 21:59:28 -08:00
Mark Otto
a4c54b5e5d Fixes #11390: Add max-width to containers within jumbotrons to avoid horizontal scrollbar 2013-11-29 18:33:59 -08:00
Mark Otto
09cd5289ab Fixes #11468: Prevent default gradient on in Firefox for Android 2013-11-29 17:47:27 -08:00
Zlatan Vasović
08e41d769a Add missing last column float 2013-11-29 08:37:54 +01:00
Mark Otto
b5f9cc2057 Merge branch 'master' into pr/11414 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-28 15:55:17 -08:00
Mark Otto
d654f90502 Fixes #10147: Remove outline from carousel controls on focus 2013-11-28 15:37:11 -08:00
Mark Otto
9d939080e6 Fixes #10483 and #10357: Make .container mixin-friendly by moving the width declarations within one class 2013-11-28 14:22:31 -08:00
Mark Otto
c13524e7e0 Fixes #11553: Prevent double border on tables in panels without thead content 2013-11-28 12:49:51 -08:00
Mark Otto
9f68a5b241 Fixes #11516: Invert dropdown divider border in navbars 2013-11-28 12:39:39 -08:00
Mark Otto
9d485db721 run grunt after last merge 2013-11-28 12:34:42 -08:00
Mark Otto
b7b72cc877 Merge branch 'master' into pr/11614 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-28 11:57:12 -08:00
Mark Otto
594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Tobias Lindig
3d5e598e5c add builded files from dist/ 2013-11-28 18:40:15 +01:00
Mark Otto
9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Jesse Mandel
bff8ba2b79 Fix for Issue #11411 2013-11-25 15:19:11 -08:00
aentan
ba4c5dae9b add support for button dropdowns in justified button groups 2013-11-19 17:24:49 +08:00
Julian Thilo
8aec527614 Run grunt dist 2013-11-17 23:45:42 +01:00
Mark Otto
ae4d5f21a9 fixes #11449: use menlo over monaco 2013-11-16 18:01:59 -08:00
Mark Otto
a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
Zlatan Vasović
c2a6e950d7 Remove unusual keyframes prefixes 2013-11-13 22:32:46 +01:00
Zlatan Vasović
aad447e290 Fix #11400 and #11431 2013-11-09 22:49:58 +01:00
Zlatan Vasović
0da3901ed5 Add missing .small styles and docs 2013-11-08 10:33:22 +01:00
Zlatan Vasović
96109d3138 Simplify table state styles 2013-11-07 09:53:33 +01:00
Mark Otto
88a06640dd Fixes #11295: Restore offset, push, and pull zero classes (e.g., .col-md-offset-0) 2013-11-06 13:03:08 -08:00
Mark Otto
6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Zlatan Vasović
f1bc840d43 Use nesting for .placeholder() 2013-11-02 09:35:51 +01:00
Kevin Locke
441f9d6717 Support .h1 in place of h1 inside .jumbotron 
As in #7284, it can often be useful to style text like a heading in
places where using the heading tag would be either semantically
incorrect, less accessible, or otherwise invalid.

Support this in .jumbotron as in the rest of the document by allowing
elements with class .h1 to stand in for the h1 element.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
 2013-10-31 10:48:55 -06:00
Mark Otto
867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
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
Martynas
80e8644230 removed outline from modal 2013-10-05 13:55:26 +03: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