clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 12:37:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,676 Commits 116 Branches 89 Tags 628 MiB
b8a33eb1e0
Commit Graph

2025 Commits

Author SHA1 Message Date
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
3260288df8 Merge branch '3.0.0-wip' of https://github.com/eratzlaff/bootstrap into eratzlaff-3.0.0-wip 2013-08-19 00:15:47 -07:00
Mark Otto
e293873484 smaller h1 and h2 2013-08-18 21:49:05 -07:00
Elvis Ratzlaff
988c03d462 Variable name fix 2013-08-19 00:46:09 -04:00
Mark Otto
e989acfc79 Add responsive tables with help of .table-responsive wrapper 2013-08-18 21:43:05 -07:00
Elvis Ratzlaff
5b3e6eb563 make visible/hidden classes mixable 2013-08-19 00:23:53 -04: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
108d10a920 Refactor alerts to have a base class, but no default class, thus requiring a modifier class at all times 2013-08-18 19:50:53 -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
9dcae610e9 Merge branch '3.0.0-wip' into bs3_homepage 
Conflicts:
	customize.html
	examples/justified-nav/justified-nav.css
 2013-08-18 19:02:42 -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
Mark Otto
5746979aad Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-18 15:30:02 -07:00
Chris Rebert
9fa0a5d127 tweak some of the Glyphicon class names to match Bootstrap conventions 2013-08-18 15:19:13 -07:00
Mark Otto
43271f1ab6 Merge pull request #9804 from twbs/redundant-ampersands 
rm redundant ampersands from button-groups LESS
 2013-08-18 15:15:53 -07:00
Chris Rebert
7b0d93f79e regenerate Glyphicons LESS from their website; fixes some wrong codepoint numbers 2013-08-18 15:15:33 -07:00
Mark Otto
9b61b7a722 fixes #9803: label and input alignment in horizontal forms 2013-08-18 15:10:28 -07:00
Chris Rebert
fa3959a1e1 rm redundant ampersands from button-groups LESS 2013-08-18 15:05:42 -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
Zlatan Vasović
743fc9ac7e Nesting for link styles 2013-08-18 23:28:55 +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
3c1d951d29 fixes #9787: remove derp file 2013-08-18 11:00:04 -07:00
Mark Otto
d7eee9bd6e Merge pull request #9767 from twbs/bs3_restore_glyphicons 
BS3: Restore Glyphicons
 2013-08-18 10:35:26 -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
Mike Pagé
2488f2ae68 Update mixins.less 2013-08-18 19:23:42 +02:00
Mark Otto
73a1a4133c combine and simplify caret border widths 2013-08-18 10:08:18 -07:00
Mark Otto
a9e741bffc Merge branch 'fixcaret' of https://github.com/liuyl/bootstrap into liuyl-fixcaret 2013-08-18 10:07:34 -07:00
Mark Otto
4246f6a01f fixes #9769: use navbar border radius var in theme 2013-08-18 09:58:21 -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
c729f16282 it's levi-OH-sa, not levi-oh-SAR 2013-08-17 22:51:00 -07:00
Mark Otto
40cbfb69d2 undo old change to navbar brand from this branch 2013-08-17 22:44:59 -07:00
Mark Otto
18766db634 Merge branch '3.0.0-wip' into bs3_homepage 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-17 22:39:07 -07:00
Mark Otto
f891f91bac Reorder bootstrap.less to match docs oder 2013-08-17 21:18:00 -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
Mark Otto
9a66906d3d generic comment 2013-08-17 19:14:13 -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
Mark Otto
6636734388 Fixes #9752: clear floats in .panel-body 2013-08-17 15:46:42 -07:00
Mark Otto
61caed21e2 More consistent naming with screen size variables using xs, sm, md, and lg 2013-08-17 15:21:38 -07:00
Mark Otto
441e04c84a Merge branch '3.0.0-wip' into bs3_homepage 
Conflicts:
	dist/css/bootstrap.min.css
	getting-started.html
 2013-08-17 14:16:40 -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
Mark Otto
82f6f08f89 Fixes #9552: Downsize and use whole numbers for panel title to prevent odd 1px bug 2013-08-17 13:18:10 -07:00
Mark Otto
ab700d753c fix #9743: pager hover background should be light gray 2013-08-17 13:07:21 -07:00
Mark Otto
e279ffab14 Merge pull request #9737 from ZDroid/patch-1 
Removed blank .hidden-print
 2013-08-17 11:58:19 -07:00
Zlatan Vasović
0555d11665 Removed blank .hidden-print 
Blank .hidden-print class doesn't have sense.
 2013-08-17 15:24:37 +02:00
Chris Rebert
e12d6208b6 un-hardcode @grid-gutter-width in @container-* LESS vars 2013-08-17 00:02:17 -07:00
Mark Otto
cd0df1d21a fixes #9436 more: put padding on containers, not the body because full width elements 2013-08-16 22:37:02 -07:00
Mark Otto
e4bb388bc9 Make negative margins on rows the default, not just in containers, and add padding to body to compensate 2013-08-16 15:16:03 -07:00
Mark Otto
f459d76e38 fixes #9475 2013-08-16 15:07:45 -07:00
Mark Otto
e6f185acad Justified nav now responsive; example updated accordingly (fixes #9708) 2013-08-16 14:01:32 -07:00
Mark Otto
c13772d5f7 switch to margin on navbar-nav to avoid stacking negative space reported in #9705 2013-08-16 12:38:41 -07:00
Mark Otto
e5f38207e0 fixed navbar static top borders 2013-08-16 11:34:30 -07:00
Mark Otto
ed4316d9b2 fixes #9642: open dropdown nav items get proper styling 2013-08-16 11:16:32 -07:00
Mark Otto
771ac3207e xs button is xs-er (fixes #9695) 2013-08-16 11:08:29 -07:00
Mark Otto
3bb5644c72 Fix alignment of navbar header in fixed navbars 2013-08-16 00:54:12 -07:00
Mark Otto
2fa0975956 don't scope width on .make-xs-column mixin 2013-08-15 21:51:41 -07:00
Mark Otto
111bdc4e93 fixes #9663: second part, reset pushes and pulls in md and lg grid tiers 2013-08-15 20:31:11 -07:00
Mark Otto
b0a66e60c1 Fixes #9663: Add offset overrides for medium and large grid tiers 2013-08-15 20:25:20 -07:00
Mark Otto
fc88bcf0d1 fixes #9655: scrope list group styles in panels to immediate children only 2013-08-15 18:58:02 -07:00
Mark Otto
7cd35f0cb6 nuke bg image on active/open for buttons for when we add gradients 2013-08-15 16:17:44 -07:00
Mark Otto
16d7265c9b fixes #9647: ensure open dropdown toggles get .active styles 2013-08-15 15:16:46 -07:00
Mark Otto
bf17721308 fixes #9587: add var for nav link padding 2013-08-15 13:58:16 -07:00
Mark Otto
2dbf2bb8fb fixes #9629 2013-08-15 13:54:47 -07:00
Mark Otto
418ca6c09b fixes #9622: reset to inline-block for img-thumbnail, but keep block for .thumbnail > img 2013-08-15 13:40:21 -07:00
Mark Otto
0664b3f0da fixes #9634: turn off overflow-y when the navbar is re-expanded into horizontal mode 2013-08-15 13:29:45 -07:00
Mark Otto
f9d2f9b6cd improve pagination's active state so it looks less like the active state and more like active nav items 2013-08-15 13:16:06 -07:00
Mark Otto
4b350f8b79 delete comments 2013-08-15 11:56:07 -07:00
Mark Otto
2690a3dc31 Add to #9578 and fix #9614: use cursor not-allowed on radios and checkboxes 2013-08-15 11:52:22 -07:00
Mark Otto
5a0ba42a7b fix up inverse navbar form styles 2013-08-15 11:47:56 -07:00
Mark Otto
06e6da0918 fixes #9596: proper dropup caret colors 2013-08-15 11:36:08 -07:00
Mark Otto
209d3af301 Fixes #9617: consistent variation order, add .label-primary 2013-08-15 11:31:26 -07:00
Mark Otto
51f2c907e7 fixes #9607: restore bottom border on hover of nav tabs for proper display 2013-08-15 10:30:37 -07:00
Mark Otto
fee3f1e733 fixes #9582: restore img-responsive as a class and move it's mixin to mixins.less 2013-08-15 00:46:18 -07:00
Mark Otto
1b6a5bbca2 fixes #9507: remove padding on navbar-collapse as any padding on an animated object screws it up; instead use some padding on the navbar nav 2013-08-15 00:08:21 -07:00
Mark Otto
622fe05ff4 fixes #9445: make img responsive mixin use display block, but provide option to pass custom value to it 2013-08-14 23:06:37 -07:00
Mark Otto
0456e5e4b3 fixes #9508: use navbar align mixin for buttons to get correct top/bottom spacing 2013-08-14 23:02:58 -07:00
Mark Otto
c5ca743cb7 Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-14 22:59:02 -07:00
Mark Otto
9de788134f refactor navbar file to better nest css and restore navbar-color to navbar text (fixes #9500) 2013-08-14 21:32:23 -07:00
Mark Otto
2e8a146b61 remove gradients from dropdown menu items on hover/active (fixes #9473) 2013-08-14 21:24:48 -07:00
Chris Rebert
3a67054536 fix copypasta-o to fully fix #9295 2013-08-14 19:07:14 -07:00
Chris Rebert
e684758b55 fixes #9511; set cursor:not-allowed for disabled buttons,checkboxes,radios 2013-08-14 18:20:28 -07:00
Mark Otto
a9d6b7ee0b Merge branch '3.0.0-wip' into reset-FF-Android-default-background-image 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-14 16:24:39 -07:00
Chris Rebert
4d527ec316 fixes #8702 until Normalize.css starts handling this 2013-08-14 16:08:24 -07:00
Mark Otto
0086761660 Merge branch '3.0.0-wip' of https://github.com/lerks/bootstrap into lerks-3.0.0-wip 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-14 15:33:38 -07:00
Mark Otto
60a281507a Merge pull request #9498 from ggam/panel-variant-fix 
Made panel-variant apply styles only to first child
 2013-08-14 15:32:21 -07:00
Guillermo González de Agüero
537910d484 Removed commented lines 2013-08-14 23:12:47 +02:00
ggam
72a2efb3db Added table-row-variant mixin 2013-08-14 21:16:45 +02:00
Luis Aleman
ef60b0e5fb Get rid of navbar-brand margin-right 2013-08-14 13:03:00 -04:00
Mark Otto
4ff48c9c3c Merge pull request #9496 from BBosman/accordion-border-color 
Remove old accordion remnant
 2013-08-14 09:39:55 -07:00
Luis Aleman
1b3896fabf Remove .navbar-collapse padding when not in mobile context 2013-08-14 11:39:38 -04:00
ggam
80d1b6b117 Made panel-variant apply styles only to first child 2013-08-14 16:40:26 +02:00
Bas Bosman
09464b5d41 Remove old accordion remnant 2013-08-14 16:33:35 +02:00
Luca Wehrstedt
1e1b5c737b fixes #9406: proper border for justified btn-groups inside tables 2013-08-14 12:37:48 +02:00
Luis Aleman
c79fa6ad04 Apply mixin to correct class 2013-08-13 22:53:23 -04:00
Luis Aleman
e29c2d0c24 Fix .navbar-right > .dropdown-menu alignment 2013-08-13 22:30:02 -04:00
Mark Otto
5b4fe08f42 fixes #9439: use overflow: auto on navbar collapse 2013-08-13 15:22:05 -07:00
Mark Otto
fa330f308a Overhaul navbar alignment (.pull-) utilities (fixes #9440) 
Now navbars have their own float utility classes, mixin-ed versions of
`.pull-left` and `.pull-right`.

* Removed chained `.navbar-nav.pull-right`
* Added `.navbar-left` and `.navbar-right` as mixins of the default
float utilities, but only above the `@grid-float-breakpoint` to match
the new navbar behavior
* Updated components docs to match the new changeas
* Added callout about component alignment here to explain the new
classes
 2013-08-13 15:19:59 -07:00
Mark Otto
3da3f7e474 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-13 14:56:33 -07:00
Mark Otto
2bc67b334d nuke the box-shadow on uncollapsed navbar-collapse 2013-08-13 14:46:34 -07:00
Guillermo González de Agüero
f0ee3aaac0 Swapped input-lg and input-sm 
Fixing my own error. Thanks to @kyleledbetter for reporting.
 2013-08-13 23:31:33 +02:00
Mark Otto
bd93ed2cb6 Merge branch '3.0.0-wip' into bs3_navbar_overhaul 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-13 13:48:33 -07:00
Mark Otto
3c772b1ceb lighter default navbar, add borders to navbars, tweak padding and alignments 2013-08-13 13:39:21 -07:00
Mark Otto
270af4dda3 fixes #9431: specify font-size in dropdown menus to avoid inheritance issues 2013-08-13 13:16:56 -07:00
Mark Otto
33a88c9a94 Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel 
Conflicts:
	dist/css/bootstrap.min.css
 2013-08-13 10:36:38 -07:00
Mark Otto
3e373a844c Merge pull request #9410 from ggam/pagination-size 
Added pagination-size mixin
 2013-08-13 10:35:24 -07:00
Mark Otto
ce77f10ce5 Merge pull request #9421 from ggam/input-size 
Added input-size mixin
 2013-08-13 10:35:04 -07:00
Mark Otto
69a3e9b4d0 enable button groups in vertical button groups 2013-08-13 10:24:18 -07:00
ggam
6ec0fd7d43 Added input-size mixin 2013-08-13 19:06:02 +02:00
Mark Otto
f15f259876 derp 2013-08-13 09:59:38 -07:00
Guillermo González de Agüero
e74ac0723b Fixed errors 2013-08-13 14:25:05 +02:00
ggam
ea04fa538e Added pagination-size mixin 2013-08-13 13:27:45 +02:00
Mark Otto
b0ab806dcc fix negative indenting in button group for nested button groups 2013-08-12 23:44:50 -07:00
Mark Otto
237640c706 Drop the accordion for the panel 
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
 2013-08-12 23:36:25 -07:00
Mark Otto
48e7468e3a invert dropdown styles in navbar for inverse variation 2013-08-12 21:43:59 -07:00
Mark Otto
80eb09cc1b Merge branch '3.0.0-wip' into bs3_navbar_overhaul 
Conflicts:
	components.html
	dist/css/bootstrap.min.css
 2013-08-12 21:34:55 -07:00
Mark Otto
49576704ea finish fixing #9295: add button group buttons to new input group sizing 2013-08-12 21:27:15 -07:00
Mark Otto
40723c8716 fixes #9400: add box-sizing to pseudo elements as well 2013-08-12 21:26:43 -07:00
Mark Otto
8bb7def26c Navbar refactor 
* Now responsive by default (fits better with mobile-first approach)
* Requires `.nav-header` to group `.navbar-brand` and `.navbar-toggle`
for proper mobile display.
* Changed `.nav-collapse` to `.navbar-collapse`
* Simplified examples in docs
 2013-08-12 21:23:28 -07:00
Mark Otto
eac61de138 fix navbar form alignment of inputs by restoring inline-block 2013-08-12 16:09:21 -07:00
Mark Otto
c558c035d7 fixes #9258: no more float bug with full-width grid columns by removing float on all .col-*-12 classes 2013-08-12 16:02:27 -07:00
Mark Otto
fb8ae7e514 drop the class on the button group toggles CSS (alt fix to #9297) 2013-08-12 15:46:11 -07:00
Mark Otto
394f698056 undo the grid max-width boundary because it makes offsets kinda borked (you'd have to set twice, for medium and large, in most cases--and that sucks) 2013-08-12 15:02:09 -07:00
Mark Otto
eb1565681f fixes #9392: no need for width auto on inline/navbar form controls given inline-block on parent form group 2013-08-12 14:52:49 -07:00
Mark Otto
a78c8d9c04 Newfangled input and button group sizing (fixes #9295) 
Instead of applying `.btn-` or `.input-` to individual elements in
button and input groups, we now have new sizing classes to keep your
markup a little leaner.

* Add `.input-group-sm` or `.input-group-lg` to your `.input-group` to
replicate `.input-sm` and `.input-lg`, respectively.
* Add `.btn-group-xs`, `.btn-group-sm`, or `.btn-group-lg` to your
`.btn-group` to replicate `.btn-xs`, `.btn-sm`, and `. btn-lg`,
respectively.

Both sets of new sizing classes simply use the existing individual
sizing classes as mixins, so customization of them is automatically
inherited when compiling.
 2013-08-12 14:03:57 -07:00
Mark Otto
abedd38c5b update grid xs mixin and update docs to match new mixins 2013-08-12 11:52:51 -07:00
Mark Otto
9564c356d3 inherit font-size in code when inside pre 2013-08-12 11:34:28 -07:00
Mark Otto
a74d6cfe73 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 11:09:07 -07:00
Mark Otto
f662dff6e9 fixes #9382: inline forms now require use of .form-group for proper alignment of all form controls 2013-08-12 11:07:23 -07:00
Mark Otto
ddd13dc100 Merge pull request #9373 from ggam/button-sizes 
Added button-size mixin
 2013-08-12 10:40:56 -07:00
Mark Otto
3d11e6dedf Merge pull request #9371 from ggam/buttons-consistency 
Renamed btn-pseudo-states mixin to btn-variant for consistency
 2013-08-12 10:06:34 -07:00
Mark Otto
a9a27d3794 Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip 2013-08-12 10:01:22 -07:00
Mark Otto
55cfa8d38f Drop background-clip and background-size mixins since they have no prefixes anyway 2013-08-12 10:01:13 -07:00
ggam
d80d9251ef Removed remaining Glyphicons mentions in carousel.less 2013-08-12 14:20:17 +02:00