0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-10 03:46:13 +01:00

2887 Commits

Author SHA1 Message Date
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