0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

2000 Commits

Author SHA1 Message Date
Mark Otto
1c4bdb053b Fixes #10399: Add hover styles to text emphasis classes 2013-09-04 13:56:32 -07:00
Mark Otto
d8dc805f9b Merge branch 'master' of github.com:twbs/bootstrap 2013-09-04 09:09:22 -07:00
Mark Otto
34f1487146 Fixes #10436: use screen-sm var instead of hardcoded pixel value 2013-09-04 09:08:52 -07:00
Liam
12558bb504 Fixed error in documentation in mixins.less 2013-09-04 18:59:44 +10:00
Mark Otto
143403f3fd Fixes #10407: Add line-height to progress bar for proper text alignment within 2013-09-03 20:11:27 -07:00
Mark Otto
0a78e7907d fixes #10406: Update grid to use width on .container instead of max-width as IE8 improperly computes width 2013-09-03 15:49:03 -07:00
Mark Otto
dd44123881 remove unused .panel-collapse ruleset 2013-09-03 01:04:17 -07:00
Mark Otto
a245c0d1cd derp, add on to #10153 with proper variable /cc @ggam 2013-09-01 20:52:23 -07:00
Mark Otto
de82c80784 update vars to use new component-active-color 2013-09-01 23:40:04 +02:00
Mark Otto
1fd9237840 fixes #9909: Add component active color variable to complement component active bg variable 2013-09-01 23:38:11 +02:00
Mark Otto
26727bfefd Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 21:55:59 +02:00
Mark Otto
b45c3ea647 fixes #10164: Document .center-block mixin and update CSS to include it as a class as well 2013-09-01 11:21:14 +02:00
Mark Otto
50bf4d47b1 reverse vars for backwards compatibility /cc @cvrebert 2013-09-01 11:06:33 +02:00
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