0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

6939 Commits

Author SHA1 Message Date
Mark Otto
37933a9e08 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	dist/css/bootstrap.min.css
2013-09-11 12:31:21 -07:00
Mark Otto
5d1707a25c Remove old and unused .prettyprint styles in code.less (per #10566) 2013-09-11 11:09:50 -07:00
Chris Rebert
c62426daeb Merge pull request #10579 from roryokane/patch-1
Fix capitalization of “list groups” in middle of sentence
2013-09-11 10:29:19 -07:00
Rory O’Kane
eebbee7c81 Fix capitalization of “list groups” in middle of sentence
When “list groups” is used in the middle of a sentence in http://getbootstrap.com/components/#list-group-basic, it is not capitalized.
2013-09-11 12:18:32 -04:00
gribelu
d8202dd626 Fixed hardcoded tooltip arrow positioning
Tooltip Arrow positioning was hardcoded to 5px instead of using @tooltip-arrow-width.
2013-09-11 16:47:13 +03:00
Zlatan Vasović
50fcaba24f The last 2013-09-11 10:38:42 +02:00
Zlatan Vasović
d9613268b0 Again? 2013-09-11 10:35:12 +02:00
Zlatan Vasović
a0653ef018 Rumbo Jumbo 2013-09-11 10:33:30 +02:00
Zlatan Vasović
e2e1c80d1a Another fixup 2013-09-11 10:32:08 +02:00
Zlatan Vasović
b8a33eb1e0 Eagle eye 2013-09-11 10:29:15 +02:00
Chris Rebert
1497c21fe3 Merge pull request #10567 from ZDroid/patch-2
Use @screen-sm-min in forms
2013-09-11 01:14:36 -07:00
Zlatan Vasović
c10238c95f Use @screen-sm-min in forms 2013-09-11 09:54:38 +02:00
Mark Otto
022e40404c Remove multiple touch icons and roll with a single one 2013-09-10 21:46:12 -07:00
Mark Otto
b7e1103c32 Merge pull request #9989 from eins78/more-monospace-elements
code.less: also set default monospace font for `<kbd>` and `<samp>`
2013-09-10 21:38:24 -07:00
Mark Otto
e645d51b62 Merge pull request #10565 from twbs/gruntfile-css-banner
generate CSS banners via Gruntfile; fixes #10101
2013-09-10 21:27:07 -07:00
Mark Otto
84567af1a8 Merge pull request #10560 from ZDroid/patch-1
Remove display: block from address
2013-09-10 21:25:31 -07:00
Chris Rebert
2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert
1f3a87a8a0 fix punctuation in author field of package.json 2013-09-10 19:12:47 -07:00
Chris Rebert
76d8757b0a rm period from licensing header so it's not mistaken as part of the URL 2013-09-10 19:01:40 -07:00
Chris Rebert
a9335e94e1 run grunt dist 2013-09-10 18:59:09 -07:00
Chris Rebert
cf09ec3c77 Merge pull request #10563 from lipis/patch-1
Updated the old btn-large in carousel example
2013-09-10 16:52:37 -07:00
Lipis
a2a5be11a3 Updated the old btn-large in carousel example 2013-09-11 01:34:56 +02:00
Chris Rebert
52516eceba add missing comma in carousel.less; fixes #10562 2013-09-10 16:20:36 -07:00
Julian Thilo
1ebd282693 Rephrase text 2013-09-10 23:31:57 +02:00
Zlatan Vasović
886e7037f6 Remove display: block from address
<address> is already displayed as block in all browsers (UAs).
2013-09-10 23:27:04 +02:00
Julian Thilo
10a9601560 Fix #10556
Make media queries example in docs clearer
2013-09-10 18:00:58 +02:00
Mark Otto
c8c3bf00b6 fixes #9985: update grid classes in grid example 2013-09-09 13:56:10 -07:00
Mark Otto
cd98b10ea5 Merge pull request #10542 from twbs/controls-migration-docs
add .control* to migration docs; fixes #10532
2013-09-09 13:22:34 -07:00
Chris Rebert
6bc1a5cf6e add .control* to migration docs; fixes #10532 2013-09-09 12:34:53 -07:00
Mark Otto
fff5e540f5 fixes #10526: Remove custom background on responsive tables and set it in the docs where it should've been originally 2013-09-08 20:03:52 -07:00
Mark Otto
afb6cf1d01 Match order of vars to order of components; darken some alert borders 2013-09-08 16:58:56 -07:00
Mark Otto
16279056ae Merge branch 'master' of github.com:twbs/bootstrap 2013-09-08 08:04:19 -07:00
Mark Otto
3f158175ce fixes #10521: Only remove bottom-border from last row of cells in tbody and tfoot within responsive tables 2013-09-08 08:04:11 -07:00
Julian Thilo
601364418f Merge pull request #10523 from ZDroid/patch-1
Added missing semicolon
2013-09-08 06:47:14 -07:00
Zlatan Vasović
f9fe6cd05f Added missing semicolon 2013-09-08 15:37:02 +02:00
Mark Otto
d126d8c6f3 Run grunt to gen raw files 2013-09-06 09:57:25 -07:00
Mark Otto
f80fd03542 Remove nav from jumbotron example (temp fix for #10228) 2013-09-06 09:57:19 -07:00
Mark Otto
8bea86e2ef fixes #10024: Use negative margin to fix the border between button and input in input groups 2013-09-06 09:50:38 -07:00
Mark Otto
e5038a339c Merge pull request #9968 from thelukemcdonald/master
Apply gradient stripe @color parameter
2013-09-06 09:31:36 -07:00
Mark Otto
5c4c7eba54 Merge branch 'master' of https://github.com/nuttertag/bootstrap into nuttertag-master
Conflicts:
	dist/css/bootstrap.min.css
2013-09-06 09:23:49 -07:00
Mark Otto
532e4bab58 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-06 09:22:34 -07:00
Mark Otto
b24adeb82f fix broke width of containers in docs given change to use width over max-width 2013-09-06 09:22:19 -07:00
Mark Otto
72a39eb747 Merge pull request #10025 from barryvdh/patch-2
Add missing methods (rotateX/Y, perspective(-origin) and transform-origin)
2013-09-06 09:18:00 -07:00
Mark Otto
394161f281 Merge branch 'GSEdits7' of https://github.com/StevenBlack/bootstrap into StevenBlack-GSEdits7
Conflicts:
	getting-started.html
2013-09-06 09:11:26 -07:00
Mark Otto
cec89e20a9 fixes #10491: new docs background base64 image 2013-09-06 09:03:50 -07:00
Mark Otto
b51579241f account for last child bottom border; use 0 instead of none 2013-09-05 15:10:56 -07:00
Kevin O'Connor
ac244040d1 Don't double border a bordered table within a panel 2013-09-05 15:54:18 -04:00
Steven Black
00673991af Fixed two more instances of [.]LESS in the text 2013-09-05 14:03:43 -04:00
Steven Black
bdb9fd9a7c Removed the '.' from '.LESS' in two instances. 2013-09-05 13:43:04 -04:00
Chris Rebert
8651180ca7 Merge pull request #10471 from javiereguiluz/patch-4
[doc] fixed the horizontal form example
2013-09-05 10:25:06 -07:00