Commit graph

8385 commits

Author SHA1 Message Date
Mark Otto
cae76171d0 Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar 2014-02-07 02:44:04 -08:00
Mark Otto
3ccc16cad0 grunt for days 2014-02-07 02:24:37 -08:00
Mark Otto
6814393c9a Merge pull request #12629 from twbs/search_inputs_ios
Override iOS search input's extra round corners
2014-02-07 02:13:39 -08:00
Mark Otto
da43f97be1 Override iOS search input's extra round corners 2014-02-07 02:08:32 -08:00
Mark Otto
c399bfb015 Fixes #12477: Clarify IE support in docs 2014-02-07 01:49:12 -08:00
Mark Otto
a9b964b9c3 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-07 01:41:46 -08:00
Mark Otto
2865fde67f Fixes #12590: Add Korean translation link 2014-02-07 01:41:04 -08:00
Mark Otto
b4aaf04b3f Merge pull request #12319 from twbs/address-12007
Clarify target of dropdown events
2014-02-07 01:39:00 -08:00
Mark Otto
16bbcd7aff clarify comment 2014-02-07 01:33:27 -08:00
Mark Otto
4f9cdefab7 consistency 2014-02-07 01:31:42 -08:00
Mark Otto
f83b201007 Fixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar 2014-02-07 01:27:07 -08:00
Mark Otto
228d4e59fc Fixes #12555: Rearrange variables to place grids and containers closer 2014-02-07 01:22:30 -08:00
Mark Otto
3b4b9a7fe5 Fixes #12614: Add progress bar example with visible label 2014-02-07 01:16:34 -08:00
Mark Otto
ebd132ce68 Fixes #12611: Mention limitation of one plugin's data attributes per element 2014-02-07 01:10:21 -08:00
Mark Otto
77d160151f Merge pull request #12497 from twbs/container-fluid-is-now-a-thing
rm DIY full-width callout now that there's .container-fluid
2014-02-07 00:48:25 -08:00
Mark Otto
91595d38f3 property order because @zdroid <3 2014-02-06 19:34:46 -08:00
Mark Otto
b124c4a6a4 Merge pull request #12620 from twbs/thumbnail-extend
use :extend in thumbnail Less
2014-02-06 19:32:31 -08:00
Mark Otto
42d7479dbf Merge pull request #12502 from ZDroid/moz
Remove redundant :-moz-placeholder styles
2014-02-06 19:31:29 -08:00
Mark Otto
ace0abfdb6 Merge branch 'master' into thumbnail-extend
Conflicts:
	dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
Mark Otto
596495c89b Merge pull request #12621 from twbs/carousel-img-responsive-extend
use :extend(.img-responsive) in Carousel's Less
2014-02-06 18:49:21 -08:00
Chris Rebert
7c1511502e use :extend(.img-responsive) in Carousel's Less 2014-02-06 15:52:26 -08:00
Chris Rebert
fda8d91c86 use :extend in thumbnail Less 2014-02-06 15:42:54 -08:00
Chris Rebert
651b289e26 Merge pull request #12613 from twbs/sized-btn-group-extend
use Less' extend feature in btn-group-lg etc.
2014-02-06 15:12:14 -08:00
XhmikosR
ef25676f6f Merge pull request #12616 from twbs/jszip
Update jzip to v2.1.0.
2014-02-06 23:35:15 +02:00
XhmikosR
5769b776e5 bs-raw-files-generator.js: use the global directive to define the btoa variable. 2014-02-06 23:34:02 +02:00
XhmikosR
aae64a9eba Update jzip to v2.1.0. 2014-02-06 23:10:37 +02:00
XhmikosR
119ed54bd1 Merge pull request #12605 from ZDroid/license-object
Use license object instead of licenses array
2014-02-06 21:04:36 +02:00
Chris Rebert
37c21a3ac7 use Less' extend feature in btn-group-lg etc. 2014-02-06 10:59:04 -08:00
Chris Rebert
87219cfeca Merge pull request #12612 from ZDroid/grunt-path
Update grunt paths
2014-02-06 10:42:01 -08:00
Zlatan Vasović
9bb5c319b8 Update grunt paths 2014-02-06 19:39:45 +01:00
Zlatan Vasović
96fd2dca02 Use license object instead of licenses array 2014-02-06 11:37:39 +01:00
Mark Otto
7eb532262f Merge pull request #12465 from XhmikosR/docs-img
Docs: losslessly compress images.
2014-02-05 14:11:46 -08:00
Mark Otto
81d9a46dcd Merge pull request #12534 from Techwraith/patch-1
Allow the bootstrap package in npm to expose css and less
2014-02-05 13:54:53 -08:00
Mark Otto
f16a2376c1 add basic back to top link to docs sidenavs, fixes #12589 2014-02-05 13:46:24 -08:00
Chris Rebert
7861f6e8a5 possibly avoid some extra S3 charges
Refs https://github.com/boto/boto/issues/2078
2014-02-05 10:45:05 -08:00
Mark Otto
00cb50a41a grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies 2014-02-04 19:27:25 -08:00
Mark Otto
45e65eef3d Merge pull request #12025 from ZDroid/clean-visibility-mess
Fix #12015 and minify styles
2014-02-04 18:29:05 -08:00
Mark Otto
28f5f6ecf3 Merge pull request #12512 from ZDroid/placeholder-img-fix
Improve alignment of the dashboard placeholder images
2014-02-04 16:21:23 -08:00
Chris Rebert
cc9242aa86 Merge pull request #12583 from twbs/grunt-directory
reorganize all grunt tasks into one directory
2014-02-04 15:33:58 -08:00
Chris Rebert
cd8a896ce6 Merge pull request #12554 from ZDroid/grunt-test-note
Add `grunt test` note
2014-02-04 13:21:45 -08:00
Chris Rebert
46f9d27142 reorganize all grunt tasks into one directory
also fixes #12581
2014-02-04 13:18:54 -08:00
Zlatan Vasović
0ed6075010 Add grunt test note 2014-02-04 22:06:15 +01:00
Mark Otto
ef3c560a06 Reorder grunt dist tasks to ensure JS gets copied over 2014-02-04 02:04:23 -08:00
Mark Otto
1387784d60 Merge branch 'master' of github.com:twbs/bootstrap 2014-02-04 02:01:45 -08:00
Mark Otto
07098d1bb7 Fixes #12470: Scope large modal styles to minimum viewport width 2014-02-04 02:01:31 -08:00
Chris Rebert
91f941929e Merge pull request #12574 from twbs/os-x-chrome-busted
disable OS X Chrome in Selenium tests to fix the build
2014-02-04 01:58:40 -08:00
Chris Rebert
b16efebc8e disable OS X Chrome in Selenium tests to fix the build 2014-02-04 01:51:40 -08:00
Mark Otto
95494f806d Merge pull request #12521 from twbs/outline-none-note
add note to CONTRIBUTING.md about `outline: none`
2014-02-04 01:49:29 -08:00
XhmikosR
2deb5f9f91 Compress examples screenshots with kraken.io.
Before: 1,12 MB (1.174.728 bytes)
After:  1,11 MB (1.173.614 bytes)
2014-02-04 11:33:28 +02:00
XhmikosR
7dd51beb42 Docs: losslessly compress images.
Before: 25,1 KB (25.773 bytes)
After:  23,7 KB (24.352 bytes)
2014-02-04 11:33:28 +02:00