Mark Otto
25cc04c5ab
Merge branch 'deprecate_screen_containers'
2013-09-01 11:05: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
Chris Rebert
604c3b2efc
tweak #10336 to double up on the hyphen-minuses to better approximate a long dash
2013-09-01 01:46:18 -07:00
Chris Rebert
24d45f26eb
Merge pull request #10336 from Shipow/master
...
Replace invalid US-ASCII character "\xE2")
2013-09-01 01:43:48 -07:00
Mark Otto
9a32b21dc7
Merge branch 'master' into tagliala-patch-1
2013-09-01 10:13:47 +02:00
Mark Otto
7f6210cea4
Merge branch 'master' of github.com:twbs/bootstrap
2013-09-01 10:04:54 +02:00
Mark Otto
daa8330b41
Merge branch 'master' into dancek-breadcrumb-separator
2013-09-01 10:01:57 +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
Mark Otto
f29ec45715
Merge branch 'master' into deprecate_screen_containers
2013-09-01 09:33:11 +02:00
Mark Otto
9ba64cc1a9
Merge branch 'patch-1' of https://github.com/tagliala/bootstrap into tagliala-patch-1
2013-09-01 08:13:51 +02:00
Mark Otto
eb95574d80
Merge branch 'breadcrumb-separator' of https://github.com/dancek/bootstrap into dancek-breadcrumb-separator
2013-09-01 08:12:56 +02:00
Kevin Granger
f849e65d56
Replace invalid US-ASCII character "\xE2")
...
Replace invalid US-ASCII character "\xE2") '—' => '-'
2013-08-31 17:50:14 +02:00
Mark Otto
3e62905f9d
Merge branch 'master' of github.com:twbs/bootstrap
2013-08-31 09:04:17 +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
Geremia Taglialatela
86632a242b
Base the navbar default brand hover color on default brand color
...
IMHO this default is better
2013-08-28 18:18:44 +02:00
Hannu Hartikainen
a19ff2f50f
Parameterize @breadcrumb-separator
2013-08-28 12:17:46 +03: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
58408b0232
Fixes #10154 : add .small
2013-08-27 09:21:09 -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
Julian Thilo
8f83a6010a
rm inverted navbar search styles
2013-08-26 18:42:03 +02:00
Mark Otto
5491d53b99
Deprecate container-{device} vars for container-{size} classes; updates customizer and grid to do the same
2013-08-24 14:00:52 -07:00
Mark Otto
d9e991fefe
Merge pull request #10059 from felixhirschfeld/patch-1
...
Add mixin for transition-property
2013-08-24 00:19:37 -07:00
Mark Otto
c7db8eadc2
Merge pull request #10022 from thomaswelton/proposal-glyphicon-block
...
Proposal - Fixed width for glypicons
2013-08-24 00:15:34 -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
d82030f482
Merge pull request #10057 from sambowler/patch-1
...
Fix responsive table scrolling on Windows Phone 8.
2013-08-23 23:19:05 -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
b86cd3bc3d
Merge branch 'master' into deprecate-screen-device-vars
...
Conflicts:
less/variables.less
2013-08-23 22:56:23 -07:00
Mark Otto
d5a2785545
more specific deprecation comment
2013-08-23 22:51:39 -07:00
Mark Otto
8a96616726
Merge pull request #9963 from twbs/min-breakpoint-naming
...
rename @screen-XX to @screen-XX-min for clarity+unambiguity
2013-08-23 22:50:41 -07:00
Mark Otto
a66ccbc562
split mixin and grunt dist to be sure
2013-08-23 22:19:58 -07:00
Mark Otto
6de67c0ab6
Deprecate .hide-text mixin for .text-hide as mixin and class
2013-08-23 22:11:41 -07:00
Mark Otto
2b37d2b533
Update and document use of small
in headings
2013-08-23 14:22:51 -07:00
Mark Otto
310642d5ac
Merge branch 'master' into header-font-size-vars
2013-08-23 14:00:28 -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
Felix Hirschfeld
c52e1b85ab
Add mixin for transition-property
...
It's quite handy if a transition needs the same duration, timing-function or delay and only specific properties to animate.
2013-08-23 09:22:54 +02:00
Sam Bowler
343fd1bb1e
Fix responsive table scrolling on Windows Phone 8.
2013-08-23 07:53:09 +01:00
Barry vd. Heuvel
c5cfc690dd
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
...
Added missing mixins:
rotateX
rotateY
perspective
perspective-origin
transform-origin
2013-08-22 13:05:06 +02:00
Thomas Welton
31ab249809
Removed glyphicon-block instead target :empty .glyphicons
2013-08-22 10:30:18 +01:00
Thomas Welton
8663b75c4d
Added glyphicon-block class
...
Prevents elements moving around the page after the font file has loaded by setting a defined width on elements using the icon font.
2013-08-22 02:54:54 +01: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
Chris Rebert
22ce649910
deprecate @screen-{phone,tablet,desktop} vars
2013-08-21 12:26:20 -07:00
James Lawrence
2cb1626907
Fixes #9974
...
Added th selector in .table-row-variant mixin
2013-08-21 17:56:36 +01:00
Max F. Albrecht
27d92f45a5
code.less: also set default monospace font for <kbd>
and <samp>
2013-08-21 14:08:43 +02:00
Denis Gonchar
4284fc0a5e
fix #9941
2013-08-21 15:57:48 +06:00
Chris Rebert
a3a02f9e6e
rename @screen-XX to @screen-XX-min for clarity+unambiguity
2013-08-20 23:25:13 -07:00
Luke McDonald
c8402e6e2a
Remove progress bar striped @color parameters; use default transparent white.
...
* If the @color parameter is not removed, the stripes are the same color as the element background color. In this case, the stripes do not appear.
2013-08-20 22:46:01 -05:00
Luke McDonald
e965ef0df3
Apply @color argument to striped gradient
...
The @color argument is currently not being used for the striped gradient.
2013-08-20 22:13:03 -05:00
Chris Rebert
9a4fbde461
add variables for heading font sizes; fixes #9921
2013-08-20 17:49:23 -07:00
Geremia Taglialatela
db7cce42f2
Removing whitespaces
2013-08-20 14:56:10 +02:00
Mark Otto
3f87bf46e4
fixes #9855 : account for modal overflow on body hiding scrollbar
2013-08-19 13:16:32 -07:00
Mark Otto
3d5ccc6c6f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-19 10:43:45 -07:00
Mark Otto
723b9b89d7
Merge pull request #9864 from boomsb/3.0.0-wip
...
Update tables.less
2013-08-19 10:43:26 -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
boomsb
bfe2dc4109
Update tables.less
...
Fixed Table cell sizing with multiple classes by using *= instead of ^=
2013-08-19 11:30:38 -05:00
Mark Otto
d195d5989f
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-19 08:58:59 -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
7e82ceb533
fix #9832 somewhat: more vars for jumbotron
2013-08-19 08:46:49 -07:00
saiwang
fabbb9e4ba
.table
style is duplicate in List groups in panels
and Tables in panels
2013-08-19 22:08:06 +08: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
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
ggam
6993db1840
Added button-size mixin
2013-08-12 14:07:19 +02:00
ggam
83293516b6
Renamed btn-pseudo-states mixin to btn-variant for consistency
2013-08-12 13:55:09 +02:00
Mark Otto
175a112548
fix #9239 by restoring old ie8 responsive img foo
2013-08-12 01:56:38 -07:00
Mark Otto
5e73cc90d9
fixes #9266 manually on account of list group file reorganization
2013-08-12 01:39:43 -07:00
Mark Otto
acdbe73851
fixes #8835 : make it so active list group items aren't dependent on an <a> tag
2013-08-12 01:38:06 -07:00
Mark Otto
6dbf588237
fixes #9310 : alerts aren't dismissable by default, now requires .alert-dismissable if you need a close button
2013-08-12 01:20:22 -07:00
Mark Otto
efe62a7ef4
rename and refactor a smidge to add medium grid mixins
2013-08-12 00:36:22 -07:00
Mark Otto
f50aea30c4
Merge branch 'patch-12' of https://github.com/ggam/bootstrap into ggam-patch-12
2013-08-12 00:31:28 -07:00
Mark Otto
a2b9988eb9
Media query (grid and responsive utilities) overhaul
...
Grid classes have been changed to account for a fourth set of classes,
meaning we now have XS, S, M, and L options. Specifically, we made the
following changes:
* Renames `.col-` to `.col-xs-`
* Adds `.col-md-` for devices 992px wide and up
* Remaps `.col-lg-` for devices 1200px wide and up
Alongside that, we've updated our media queries to better handle
advanced grid layouts:
* All column classes now kick in when they hit a `min-width`, undoing
the #9128 fix in
https://github.com/twbs/bootstrap/commit/db45a60cc86190a060f0baf0b3961cb
c690f3a65
* All column offsets, pushes, and pulls are scoped to an appropriate
range, meaning a `min-width` and `max-width` (thanks for the idea,
@eratzlaff)
We've also modified the widths of our grid containers for the small
device grid (now a max 720px instead of 728px) and large device grid
(now a max 1140px instead of 1170px) to avoid horizontal scrollbar
problems in Firefox (likely due to box-sizing, which is why we didn't
see it in 2.x).
Similarly, we've updated the responsive ultility classes to match the
new four media query approach of the grid system. That means we've:
* Added new `.visible-xs` and `.hidden-xs` classes
* Reassigns visible and hidden classes for small, medium, and large to
matching grid system media queries
* Updates docs examples to match grid system and account for fourth
utility range
-----
Fixes the following:
* #9135 : fourth grid tier
* #9302 : undoes previous range change for small grid system, so no need
to update any docs here
* #8755 : consistent grid and responsive utilities schemas)
* #9195 , #9216 , and #9227 : no more horizontal scrollbars
2013-08-12 00:28:50 -07:00
Mark Otto
95affa32e6
simplify padding in list groups and margins on badges within
2013-08-11 21:17:49 -07:00
Mark Otto
c52a3508c6
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-11 20:45:42 -07:00
Mark Otto
0819cfc450
addressing #9189 manually, part 7: thumbnails vars
2013-08-11 19:32:16 -07:00
Mark Otto
bf4900072d
Drop the font-weight on panel labels since heading elements already get it
2013-08-11 19:20:23 -07:00
Mark Otto
85ec6e741d
Follow up commit: fix collapse clearing and navbar brand/nav spacing
2013-08-11 19:19:44 -07:00
Mark Otto
ba8026e00f
Refactor navbars to simplify things
...
* `.navbar-brand` is no longer centered, thus removing need for
max-width and a few lines of code
* Clear floats of `.navbar-brand` in the `.nav-collapse` like we did in
2.x, thus simplifying some clearing and other things.
* Restyle the `.navbar-toggle` button to align it's bars up with the
text and flow of the document.
* Restyle the `.navbar-brand` to not use padding on left/right as to
avoid negative margin and other fuckery. This limits the ability to put
a bg color on the brand, but I think that's fine for now.
2013-08-11 19:06:26 -07:00
Mark Otto
c2cfd3153b
addressing #9189 manually, part 6: add a navbar margin var, but avoid the navbar-nav var because that should really be customizable
2013-08-11 18:32:52 -07:00
Mark Otto
e9650f51bf
addressing #9189 manually, part 5: don't bother with a .label font-weight var and let's just use bold because windows hates 500
2013-08-11 18:10:42 -07:00
Mark Otto
a66cdb0c30
addressing #9189 manually, part 4: input group background var
2013-08-11 18:09:56 -07:00
Mark Otto
83f1a75e7a
addressing #9189 manually, part 3: forms
2013-08-11 18:06:26 -07:00
Mark Otto
286636755a
spacing
2013-08-11 17:47:53 -07:00
Mark Otto
58b90dae15
addressing #9189 manually, part 2: dropdown header and disabled link colors (and refactor commenting styles)
2013-08-11 17:47:30 -07:00
Mark Otto
8b76e0d0f0
addressing #9189 manually, part 1: code and pre vars
2013-08-11 17:23:19 -07:00
Mark Otto
32f6cbf9d0
Merge pull request #9211 from zacwasielewski/responsive-visibility-utilities-as-less-mixins
...
Make visibility utility classes responsive when used as LESS mixins
2013-08-11 17:03:24 -07:00
Mark Otto
83c236f570
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-11 16:07:57 -07:00
Mark Otto
1ff1dfb2bd
fixes #9348 by ditching a comment
2013-08-11 16:07:45 -07:00
Mark Otto
9b07b999d2
Merge pull request #9286 from neilhem/3.0.0-wip
...
set img-circle class in percents
2013-08-11 15:15:53 -07:00
Mark Otto
39899e46cd
Merge pull request #9229 from ggam/patch-13
...
Removed Glyphicons mention from carousel.less
2013-08-11 15:02:07 -07:00
Mark Otto
0561cfec6b
fixes #8900 : nuke empty space between panel heading and list group
2013-08-11 15:01:16 -07:00
Mark Otto
6b6241feaa
fixes #9241 : enable collapsing for labels, in addition to badges, when empty
2013-08-11 12:43:43 -07:00
Rakhat Jabagin
c07717ce47
set img-circle class in percents
2013-08-09 17:57:49 +06:00
liuyl
d557fa2839
navbar.less
2013-08-09 15:44:10 +08:00
liuyl
ee62c37f17
panels
2013-08-09 15:24:38 +08:00
Chris Rebert
d3a26a5afe
Fix Find/Replace-o; good catch, @FagnerMartinsBrack!
...
Problem introduced in 6b23a66c29
2013-08-08 12:07:27 -07:00
Guillermo González de Agüero
f69833f9a9
Removed Glyphicons mention from carousel.less
2013-08-08 12:21:27 +02:00
Mark Otto
f3104a3e3b
Merge pull request #9200 from geedmo/3.0.0-wip
...
Update to use @list-group-border-radius
2013-08-07 18:11:15 -07:00
Zac Wasielewski
407c966736
Make visibility utility classes responsive when used as LESS mixins
2013-08-07 16:47:49 -04:00
Guillermo González de Agüero
001e5d3da9
Added missing grid make-column mixins and fixed some inconsistencies
...
make-column() was still been use to generate "medium size" columns (col-sm), while make-small-column was creating the default columns (col).
I also changed @grid-float-breakpoint to @screen-small, as it was used in make-row() and I think it makes more sense here than the other.
2013-08-07 21:15:01 +02:00
Guillermo González de Agüero
f90ac58410
Updated panels.less to use variant-panel mixin
2013-08-07 20:19:12 +02:00
Guillermo González de Agüero
a24bc28de8
Added panel-variant mixin
2013-08-07 20:15:12 +02:00
geedmo
2f786aa0c1
Update to use @list-group-border-radius
2013-08-07 14:47:47 -03:00
Mark Otto
03258683ed
property order
2013-08-07 00:28:44 -07:00
adamjacobbecker
a8d95d4721
Improve accessibility (Section 508, WCAG)
...
This PR significantly improves Bootstrap's accessibility for users of assistive technology, such as screen readers. Some of the these changes add additional markup to the source examples, but we believe that the sacrifice in readability is worth achieving more widespread usage of accessibility best-practices.
What was done
- Added lots of [WAI-ARIA attributes](http://www.w3.org/WAI/intro/aria )
- Added `.sr-only` helper class, that is only readable by screen readers (and invisible for all other users). This lets us - make progress bars and paginations accessible to screen reading users.
- Advised users to always use label elements. For inline forms, they can hide them with `.sr-only`
- Added 'Skip navigation' link
- Added "Accessibility" section to getting-started.html.
What *wasn't* done
- Contrast issues (twbs#3572)
- Tooltips (twbs#8469)
- Documentation re: usage of icons, since they now live in a separate repo
Major props to all that contributed: @bensheldon, @jasonlally, @criscristina, and @louh. Feel free to chime in, guys, if I've left anything out.
2013-08-06 21:58:09 -07:00
Mark Otto
d1e712d848
fixes #8959 : only negative indent rows within .container (prevents horizontal scroll on full-width pages)
2013-08-06 21:11:16 -07:00
Mark Otto
18a4082553
fixes #8935 : add gutter width param to grid mixins
2013-08-06 21:00:12 -07:00
Mark Otto
2af9cf10ce
more twerks to the theme
2013-08-06 18:42:10 -07:00
Mark Otto
402dbfb617
Merge branch '3.0.0-wip' into bs3_theme
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-06 18:29:54 -07:00
Mark Otto
3f3dfc54e7
update use of mixins and add bg-colors where necessary
2013-08-06 18:05:37 -07:00
Mark Otto
076ec90d0b
Merge branch '3.0.0-wip' of https://github.com/archanl/bootstrap into archanl-3.0.0-wip
...
Conflicts:
less/mixins.less
2013-08-06 18:05:24 -07:00
Mark Otto
c3ac95333d
Fixes #8749 : prevent navbar nav from overlapping navbar toggle
2013-08-06 17:28:02 -07:00
Mark Otto
223e032150
Fix #9174 : pad bottom of navbar collapsed content and clear floated contents
2013-08-06 16:39:18 -07:00
Mark Otto
7ae7aa6676
Merge pull request #8731 from nrw/patch-1
...
Format multiple badges in list-group-item
2013-08-06 15:41:50 -07:00
Mark Otto
c731961f9d
fixes #9140 : use correct var in tables
2013-08-06 11:40:02 -07:00
Mark Otto
2f1fcca6c5
Fixes #9145 : Fix tooltip opacity
...
Update tooltips to not use RGBa colors so IE8 can have tooltips, too
(means we're now using `opacity`).
2013-08-06 11:18:53 -07:00
Mark Otto
db45a60cc8
Scope tablet classes to tablets range only
...
Fixes #9128
2013-08-05 20:55:30 -07:00
Mark Otto
219f0fe7c5
Merge branch '3.0.0-wip' into bs3_alerts_default_class
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-05 20:00:23 -07:00
Mark Otto
f3bd6dbf03
fixes #8647 : remove focus outline on :focus of buttons in button groups
2013-08-05 16:16:58 -07:00
Mark Otto
ab090a29fb
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 16:15:43 -07:00
Mark Otto
98df9495cc
remove dupe border-box
2013-08-05 16:15:36 -07:00
Mark Otto
2354cd1ae8
Merge pull request #9124 from geedmo/3.0.0-wip
...
Fix Issue #8175 - .input-group-addon broken in Firefox
2013-08-05 16:14:48 -07:00
Mark Otto
04dc221037
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
...
Conflicts:
customize.html
less/alerts.less
less/badges.less
less/button-groups.less
less/buttons.less
less/carousel.less
2013-08-05 16:03:10 -07:00
geedmo
c2737771b4
Fix Issue #8175 - remove lh for input-lg|sm
2013-08-05 19:58:38 -03:00
geedmo
7bc817bcba
Fix Issue #8175
2013-08-05 19:43:39 -03:00
Mark Otto
9bbe8a020a
Merge pull request #9121 from Flydiverny/alerts
...
Added padding variable for alerts and changed customize.html
2013-08-05 15:40:22 -07:00
Mark Otto
0faf42b4bc
Remove dupe hover background color
2013-08-05 15:35:16 -07:00
Mark Otto
c4281f3919
Update labels to include a base class
...
* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
2013-08-05 15:30:28 -07:00
Markus Maga
9108ab9fb8
Added padding variable for alerts and changed customize.html Warning state (which doesn't exist anymore)
2013-08-06 00:06:57 +02:00
Mark Otto
844df9e001
Fixes #8732 : unfucks disabled fieldset form example with form groups
2013-08-05 14:45:00 -07:00
Mark Otto
bfe76273a0
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-05 14:20:46 -07:00
Mark Otto
c15f5a89a0
Enable scrollable responsive nav bar
...
Fixes #9007 in a hopefully decent way
2013-08-05 14:19:32 -07:00
Chris Rebert
c321adf289
carousel.less: copyedit explanatory comment
2013-08-05 13:13:54 -07:00
Mark Otto
96136dbb56
Merge branch 'pullright' of https://github.com/liuyl/bootstrap into liuyl-pullright
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-05 12:20:52 -07:00
Mark Otto
e23906faca
Fixes #8150 : add .static-form-control
for vertical alignment of static form text
...
- Also fixes the vertical alignment of labels in horizontal layouts on
account of the recent button and input padding changes
- Also changes the vertical alignment of the checkboxes and radios in
horizontal forms
2013-08-05 12:17:09 -07:00
Mark Otto
bac9e80a46
Fixes #8872 : widen the carousel indicators to prevent wrapping
2013-08-05 11:59:32 -07:00
Mark Otto
a82ca0f9e1
Fixes #8795 , a reoccurence of #1969
2013-08-05 11:47:12 -07:00
Mark Otto
01c46bfc0f
More button updates
...
- Fixes #9113 (caret colors in dropdown buttons)
- Darken borders around buttons for contrast in button groups
2013-08-05 11:30:50 -07:00
Mark Otto
6af693d160
Fixes #8770 : mobile-first (stacked by default) horizontal dls
2013-08-05 09:10:52 -07:00
Mark Otto
41eef69e6f
Fixes #8786 (part 2): new default button styles
...
Also relevant: http://www.youtube.com/watch?v=Ldyx3KHOFXw
2013-08-05 09:02:59 -07:00
Mark Otto
2ee9bea890
Fixes #8786 (part 1): darken hover states on buttons
2013-08-05 08:52:22 -07:00
Mark Otto
e85b8f315f
Fixes #9049 : switch order of gradient mixin params to avoid problems for upgraders
2013-08-05 08:45:51 -07:00
Mark Otto
d6ed590e83
Clean up mixins, fix #9100 (no ms-keyframes)
...
- Spacing tweaks in the general mixins
- Add comments to transform mixins about IE support
- Remove `-ms-keyframes` because only IE10+ supports it, and without
prefix
2013-08-05 08:11:13 -07:00
Mark Otto
d2389ec7c4
fixes #8832 and #8823 : remove max-width from .navbar-brand when not mobile
2013-08-05 00:50:40 -07:00
Mark Otto
11e46845b2
fixes #9063 : add var for navbar border radius
2013-08-05 00:47:23 -07:00
Mark Otto
2a2acb6bf2
Merge branch 'patch-1' of https://github.com/jholl/bootstrap into jholl-patch-1
2013-08-05 00:07:19 -07:00
Mark Otto
a2823d0f5e
Fixes #9061 : Panel titles should inherit color when linked
2013-08-04 23:44:02 -07:00
Mark Otto
d95ff9da81
fixes #8805 : ensure .active buttons in button groups behave like :active buttons
2013-08-04 23:27:15 -07:00
Mark Otto
f62ea2afe2
fixes #8793 : remove padding-right from inputs with state changes
2013-08-04 23:20:55 -07:00
Mark Otto
73c048578d
Enable input focus state customization
...
- Add new mixin to generate and customize focus state as needed
- Adds variable to set default color
- Include clear disclaimer about customizing this—it's about users', so
don't go making everything bright red and expect them not to be
confused or alarmed.
Relevant issues: #2742 , #4185 , #7942 , #8171 , #8610 , #9044
2013-08-04 23:05:54 -07:00
Mark Otto
2641fed73f
Fixes #8723 : allow modals to not need the .fade class /cc @fat
2013-08-04 22:30:09 -07:00
liuyl
584759eac0
btngroups
2013-08-05 08:29:01 +08:00
Chris Rebert
23ef8c0c20
Greater standardization of sizing terminology
...
In class names:
* large => lg
* small => sm
* mini => xs ("Extra small")
In screen size categories:
* Tiny => Extra small
2013-08-03 21:39:57 -07:00
liuyl
4bbbf774a4
add line-height
2013-08-04 09:27:23 +08:00
Mark Otto
4582eb704f
Merge pull request #9036 from eratzlaff/3.0.0-wip
...
Change value with variables for btn-large, btn-small and pagination
2013-08-03 16:50:08 -07:00
Maurice Fonk
bf0f3c7c1c
using @line-height-computed in .navbar-nav link
...
When a user changed the @line-height-base/@line-height-computed var, the
nav-bar items would not scale appropriately.
2013-08-03 15:09:56 -04:00
James Holland
744b79a666
Update .navbar-toggle to match other navbar el
...
In place of commit #9040 , fix #8844
And sizing .navbar-toggle more like .btn elem
+ change `position:absolute` to `position:relative`
+ remove `right: 10px` in favor of `float:right`
+ change to `height: 34px`
+ remove `top:` in favor of `.navbar-vertical-align` basis new height
+ change `padding:` to match `.btn` el
2013-08-03 10:28:17 -04:00
Elvis Ratzlaff
777ae911b6
Change value for padding on pagination to variables
2013-08-03 03:59:37 -04:00
Elvis Ratzlaff
2fd8689b08
Change line-height value with variable for btn-large and btn-small
2013-08-03 03:56:06 -04:00
Mark Otto
4bac2c567a
Merge branch 'btngroup' of https://github.com/liuyl/bootstrap into liuyl-btngroup
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 20:19:20 -07:00
Mark Otto
a3be713f8f
Merge branch 'navtext' of https://github.com/liuyl/bootstrap into liuyl-navtext
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 19:30:03 -07:00
Mark Otto
9435991ff0
move form layouts from input groups back to forms (messed this up in b281ad6409
)
2013-08-02 18:48:44 -07:00
Mark Otto
6b850132d0
Remove requirement of .list-group-flush
when list groups are in panels
...
Fixes #8900
2013-08-02 17:57:19 -07:00
Chris Rebert
0fefbbe659
fix typo in comment
2013-08-02 16:36:54 -07:00
Mark Otto
173dac4e54
Tighten up buttons and form controls
...
* Smaller padding on buttons and large buttons
* Same with inputs and large inputs
* Remove about 10px from height of large inputs/buttons and 4px from
regular ones
Fixes #8707 and #8700 .
(Also relevant: #8711 )
2013-08-02 15:09:48 -07:00
Mark Otto
d46e645a0f
fixes #9015 : bold links not semibold in alerts
2013-08-02 14:07:26 -07:00
Mark Otto
83eea13e63
Merge branch '3.0.0-wip-fixed-grid-push-pull-offset' of https://github.com/jtickle/fp-bootstrap into jtickle-3.0.0-wip-fixed-grid-push-pull-offset
...
Conflicts:
dist/css/bootstrap.min.css
2013-08-02 13:58:06 -07:00
Jon Schlinkert
c017e19ed2
Resolves https://github.com/twbs/bootstrap/issues/9014 . updates mixins to consistently use semicolons as argument separator. Rebuild to confirm, no diff in compiled CSS.
2013-08-02 15:33:03 -04:00
Mark Otto
dfd6c23527
Merge pull request #8967 from bassjobsen/patch-2
...
Update input-groups.less
2013-08-02 10:11:06 -07:00
Mark Otto
e4b113934d
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
2013-08-02 10:02:46 -07:00
Mark Otto
048e19b892
Fixes #8996 : shift placement of justified CSS for nav component
2013-08-02 09:42:50 -07:00
Mark Otto
d0b94ead9a
Fix #9008 : consolidate .alert-block
styles into .alert
2013-08-02 09:32:58 -07:00
Guillermo González de Agüero
824d5d5de4
Fix #8944
2013-08-01 20:07:34 +02:00
Jeff Tickle
1583dd55e9
Added classes for lg-pull, lg-push, lg-offset, sm-pull, sm-push, sm-offset
2013-08-01 12:16:20 -04:00
Bass Jobsen
a5641b0cca
Update input-groups.less
...
align inline radio and checkbox groups with their label for horizontal forms, see http://stackoverflow.com/q/17990310/1596547 (Question 2)
2013-08-01 16:05:07 +02:00
leonardovcid
15b98a0bb1
Correct comment which is showing a wrong mixin call example (mixins.less)
...
I was copy-pasting the example and it wasn't working. Then I found that the example in the comment was a typo.
Thanks
2013-08-01 14:39:28 +01:00
liuyl
56aedcb713
add table-layout
2013-08-01 11:26:12 +08:00
Mark Otto
e9413315b5
fixes #8937 : align the dropdown menus in input groups
2013-07-31 18:06:20 -07:00
Mark Otto
7e19b6b02c
add the theme file derp
2013-07-31 18:02:41 -07:00
Mark Otto
60e1f5e0e8
start with buttons
2013-07-31 17:48:22 -07:00
Cesidio Di Landa
3696530aaf
Removed trailing whitespaces
...
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
Archan Luhar
b9f59428f9
Removed background color from #gradient mixins to support transparent gradients
2013-07-30 19:30:24 -07:00
Mark Otto
e6ac348bfc
Merge pull request #8726 from andreypopp/3.0.0-wip
...
Fix out of order variable declaration order
2013-07-30 14:14:51 -07:00
Mark Otto
96eef43dee
Merge pull request #8852 from briannelsondesign/label_baselines
...
Adjusts vertical alignment of labels and badges
2013-07-30 14:07:00 -07:00
Chris Rebert
da98c5c2c3
trivial spacing fix
2013-07-30 12:35:39 -07:00
Brian Nelson
220fee80bf
Improves label and badge alignment so text aligns with baseline
2013-07-30 11:23:25 -04:00
liuyl
7cfcfdfe64
make navbar-text float left
2013-07-30 09:30:21 +08:00
Mark Otto
8b5e41d900
Refactor .input-* sizing a bit by not chaining to .form-control ( fixes #8672 )
2013-07-29 17:30:36 -07:00
Mark Otto
09edfcf8c2
fixes #8670 : move list group bg color to individual items for mo betta rendering
2013-07-29 17:23:08 -07:00
Mark Otto
5716355cda
Restore mini button ( fixes #8644 )
2013-07-29 17:08:04 -07:00
Andrey Popp
e0395b425d
reorder nav-justified classes
2013-07-30 03:27:32 +04:00
Mark Otto
d9c9afa6d1
add focus to button group active button behavior
2013-07-29 14:53:55 -07:00
liuyl
e77d134481
buttons
2013-07-29 14:09:41 +08:00
Nicholas Westlake
8858ef4dae
Format multiple badges in list-group-item
2013-07-28 21:25:16 -05:00
Andrey Popp
0d7940d950
get rid of out of order variable declaration
2013-07-29 03:04:12 +04:00
Mark Otto
111dc1492f
fixes #8714 : correct stacked pills nav
2013-07-28 09:37:10 -07:00
syed
1aedb7862c
move things around
...
Moved alerts, badges, button groups, buttons, carousel, close to
variables.less and customize.html
2013-07-28 17:32:08 +05:00
liuyl
efac0bf8d6
make pull-right !important
2013-07-28 14:05:47 +08:00
Mark Otto
ce57378705
fixes #8665 : have modals use auto margin on sides and widen it instead of positioning and negative margin
2013-07-27 19:38:05 -07:00
Mark Otto
b281ad6409
Input groups overhaul
...
* Moves input groups CSS into separate file
* Moves input groups docs into the Components page
* Add support for radios and checkboxes in input groups to fix #8679
2013-07-27 18:56:31 -07:00
Mark Otto
e953c23019
fixes #8659 : remove lingering .nav-header
2013-07-27 16:51:04 -07:00
Mark Otto
14f688c7fc
fixes #8675 : align horizontal form label and input
2013-07-27 16:37:45 -07:00
fat
d0cafdd3a8
rebuild + use serif arrows
2013-07-26 22:59:21 -07:00
Mark Otto
88dd20e6ac
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-26 22:18:16 -07:00
Mark Otto
bf5434dbec
Fix up dropdowns being incorrectly positioned on nav pills
2013-07-26 22:11:58 -07:00
fat
2cf1851d9f
use transforms to make the dialog smooooth
2013-07-26 22:09:31 -07:00
Mark Otto
88887f8c00
Undo changes from #8582 because it made links uneven on desktop
...
/cc @salman-javed-confiz
2013-07-26 21:49:35 -07:00
Mark Otto
8349236f8c
Twerk lead font-size for mobile devices
2013-07-26 21:12:48 -07:00
fat
38044e55ae
rebuild + fix #2539
2013-07-26 20:44:35 -07:00
fat
e2d4cf5f68
change how collapse works - collapse, collapsing, and in
2013-07-26 20:34:39 -07:00
Mark Otto
01c6617f79
Update inline and horizontal forms
...
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
2013-07-26 15:51:25 -07:00
Mark Otto
68827689e8
Use .form-control
in input sizing CSS
2013-07-26 15:41:16 -07:00
Mark Otto
1cf0a07f17
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
...
Conflicts:
css.html
2013-07-26 15:08:45 -07:00
Mark Otto
444973e54d
Fixes #8605 : use .form-control
in .input-group
instead of HTML tags
2013-07-26 14:31:24 -07:00
Mark Otto
9e98b733f1
Vars update
...
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
2013-07-26 11:08:27 -07:00
Mark Otto
e62e992b88
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
2013-07-26 10:44:46 -07:00
Yulong Liu
e4300fa1bf
fix background of btn-link
2013-07-26 22:27:55 +08:00
Yulong Liu
a2f120a7aa
remove background:none
2013-07-26 21:59:50 +08:00
James Holland
2e7593a40d
Update forms.less to remove .form-horizontal .row + .row
...
use .form-group to apply consistent vertical spacing on form rows
2013-07-26 09:04:39 -04:00
syed
1b8ba0d159
move things around :)
...
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
Fred Delrieu
06980ae5a1
Small typo
2013-07-26 10:10:35 +02:00
Mark Otto
210ee63693
Fixes #8586 : add addional color text classes to apply all of branch colors easily
2013-07-26 00:18:18 -07:00
Mark Otto
56404bc89b
Add .panel-title
to panel component to mirror modals
...
/cc @leeaston
2013-07-25 21:16:43 -07:00
Mark Otto
2a4a6fe0f0
Merge pull request #8611 from twitter/bs3_form_classes
...
Updated BS3 form classes
2013-07-25 20:31:11 -07:00
Mark Otto
35aad07456
Add comment about opacity mixin not being used
2013-07-25 19:56:04 -07:00
Mark Otto
27cedf71d5
Update form validation states
...
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
2013-07-25 19:45:14 -07:00
Mark Otto
71d3d2c3f6
Spacing
2013-07-25 18:55:00 -07:00
Mark Otto
13bc74b636
Refactor forms styles
...
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
2013-07-25 18:29:51 -07:00
Chris Rebert
90fb40b707
twbs ALL the links
2013-07-25 12:24:13 -07:00
Mark Otto
c7995cf964
move some thing around
2013-07-25 10:50:59 -07:00
Mark Otto
f94d9ce096
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip
2013-07-25 10:11:30 -07:00
Mark Otto
768e7edabf
fixes #8571 completely: add better th support for table classes
2013-07-25 10:01:42 -07:00
Geremia Taglialatela
0017f7fca4
Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height
...
When using navbar heights higher that default, the navbar-toggle button is not centered.
Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/
Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
2013-07-25 17:09:12 +02:00
syed
a06afd8320
Moved navs inline properties to variables.less and customize.html & nav-customize.html
2013-07-25 12:43:14 +05:00
syed
f8d5a974bc
Moving navbar inline properties to variables.less and customize.html
2013-07-25 11:58:25 +05:00
Mark Otto
1f40da9676
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-24 16:53:34 -07:00
Mark Otto
51de38e5b9
make again
2013-07-24 16:52:47 -07:00
Mark Otto
61ac20ebb5
Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip
2013-07-24 16:42:13 -07:00
Mark Otto
a36f444c25
Merge pull request #8583 from liuyl/disabled
...
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto
3080104642
make footer border color use header border color in modals
2013-07-24 16:31:17 -07:00
syed
2e6fcefc5c
Moved modals inline properties to variables.less
...
In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.
2013-07-24 18:43:21 +05:00
liuyl
7e9532dabe
set cursor to not-allowed for disabled elements
2013-07-24 17:10:27 +08:00
Salman Javed
0caab585f5
issues fixed for nav-justified on pills on android default browser.
2013-07-24 13:39:16 +05:00
Mark Otto
18157e9f39
Run make on prev commits
2013-07-23 23:48:17 -07:00
Mark Otto
9029b4c06c
Update forms vars
...
* Reorganize layout
* Add input group var
* Add legend border var
2013-07-23 23:25:46 -07:00
Mark Otto
398038c798
Update dropdown vars
...
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00