0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Commit Graph

7152 Commits

Author SHA1 Message Date
Mark Otto
dcdafa4220 Merge branch 'master' into carousel-glyphicons-mainstream
Conflicts:
	javascript.html
2013-09-03 18:43:42 -07:00
Mark Otto
72b1f69bfc dat grunt 2013-09-03 18:31:02 -07:00
Mark Otto
894aa93a9f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 18:21:28 -07:00
Mark Otto
2804d37429 Merge branch 'color-code-IE89-table' 2013-09-03 18:20:43 -07:00
Mark Otto
e62a04a19b Color code IE8-9 table with text classes and Glyhpicons instead of table classes 2013-09-03 18:20:21 -07:00
Mark Otto
e4514b4596 Merge pull request #10413 from twbs/carousel-transitions-no-fallback-note
address #10343 more directly: add note on carousel transitions in IE8+9
2013-09-03 18:09:49 -07:00
Chris Rebert
73e4b81790 make Glyphicons mainstream in Carousel examples 2013-09-03 17:46:35 -07:00
Chris Rebert
01361951e6 address #10343 more directly: add note on carousel transitions in IE8+9 2013-09-03 17:34:21 -07:00
Chris Rebert
19db69c902 we've got your back (sorta), Linux Firefox users 2013-09-03 17:01:21 -07:00
Chris Rebert
5dc65894c0 Color-code the "Internet Explorer 8 and 9" features table 2013-09-03 16:51:17 -07:00
Chris Rebert
3bb3680aac docs: fix typo in "Internet Explorer 8 and 9" features table
"placehoder" (sic)
2013-09-03 16:46:02 -07:00
Chris Rebert
f3c644cb1b copyedit "Internet Explorer 8 and box-sizing" section 2013-09-03 16:36:13 -07:00
Mark Otto
b150422335 Merge pull request #10408 from twbs/getting-started-minor-edits
CSS vs. LESS vs. styles terminology; "precompiled" terminology
2013-09-03 15:52:28 -07:00
Mark Otto
171fc396ac Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 15:50:44 -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
5eead87ed7 remove min-height from ads because ie8 2013-09-03 15:35:48 -07:00
Mark Otto
6fb81f155b more space below links on homepage 2013-09-03 15:33:36 -07:00
Chris Rebert
1113224e97 minor copyedit 2013-09-03 12:53:52 -07:00
Chris Rebert
7fbd8affe4 CSS vs. LESS vs. styles terminology; "precompiled" terminology 2013-09-03 12:32:24 -07:00
Chris Rebert
488b8dad2b slightly clarify button.active use in docs 2013-09-03 12:21:19 -07:00
Chris Rebert
82d19a41ba bump grunt-contrib-connect to 0.4.0
Thanks David.
2013-09-03 12:17:30 -07:00
Chris Rebert
a1b3fb339e minor copyedit 2013-09-03 12:15:33 -07:00
Mark Otto
87df4784c1 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 07:31:00 -07:00
Mark Otto
c2a5334dee fixes #10396: mention table class change in migration docs 2013-09-03 07:30:46 -07:00
Mark Otto
b080347106 Merge pull request #10375 from StevenBlack/GSEdits4
Refactoring the paragraph describing the 'Examples' section.
2013-09-03 02:28:01 -07:00
Mark Otto
dd44123881 remove unused .panel-collapse ruleset 2013-09-03 01:04:17 -07:00
Mark Otto
352f5923d7 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-03 00:55:29 -07:00
Mark Otto
36afdbcaac mo betta docs on box-sizing to build on e521ee8309 2013-09-03 00:49:59 -07:00
Mark Otto
49373b9b45 fixes #10372: two download buttons on homepage; also fixes broke button styles 2013-09-02 20:20:47 -07:00
Mark Otto
a4897aed88 Merge pull request #10382 from StevenBlack/GSEdits5
'Disabling responsiveness' section of docs: simplification and focus
2013-09-02 20:13:57 -07:00
Mark Otto
54b75ffae3 Merge branch 'master' of github.com:twbs/bootstrap 2013-09-02 19:53:20 -07:00
Mark Otto
e521ee8309 update box-sizing third party support section to include mention of google CSE and expand to include CSS and Less options 2013-09-02 19:52:59 -07:00
Steven Black
9361ebe4fd Getting Started page: Simplified and focused the text of the 'Disabling responsiveness' section. 2013-09-02 20:01:36 -04:00
Steven Black
259be69e25 Refactoring the paragraph describing the 'Examples' section. 2013-09-02 15:24:55 -04:00
Julian Thilo
c6d51be2d8 Merge pull request #10374 from tagliala/patch-2
Fixed glyphicons count
2013-09-02 10:32:45 -07:00
Chris Rebert
e7f8d0c957 Merge pull request #10366 from coliff/patch-2
Update index.html (change from 'hero unit' to 'jumbotron')
2013-09-02 10:31:55 -07:00
Christian
5d88943a52 Update index.html
Updated text in the jumbotron container to reflect the Bootstrap 3 change from 'hero unit' to 'jumbotron'.
2013-09-02 21:36:54 +09:00
Chris Rebert
93dc003a83 Merge pull request #10364 from wangsai/patch-1
Completion of parentheses
2013-09-02 02:50:45 -07:00
wangsai
d132c48ec9 Completion of parentheses 2013-09-02 17:47:04 +08:00
Mark Otto
a245c0d1cd derp, add on to #10153 with proper variable /cc @ggam 2013-09-01 20:52:23 -07:00
Mark Otto
079fa16b9f Merge branch 'master' of github.com:twbs/bootstrap 2013-09-02 00:10:35 +02:00
Mark Otto
14b3a3542f fixes #10316: Document .active and :active for buttons 2013-09-02 00:09:49 +02:00
Mark Otto
f69da1c2ef Merge pull request #10342 from twbs/affix-docs
minor improvements to affix docs
2013-09-01 14:59:34 -07:00
Mark Otto
741e0fc52c fixes #10344: Update IE8-9 support section with table of specific CSS3 and HTML5 features and their support in Bootstrap 2013-09-01 23:58:22 +02:00
Mark Otto
8df05b95df Remove links to navbar examples from example navbars in Theme example--nullifies #9894 2013-09-01 23:46:23 +02: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
bfda156bb9 alt fix to #10278: Change Google Maps compatibility warning to a general box-sizing warning 2013-09-01 23:32:35 +02:00
Mark Otto
26727bfefd Merge branch 'master' of github.com:twbs/bootstrap 2013-09-01 21:55:59 +02:00
Geremia Taglialatela
f4fde25535 Fixed glyphicons count
Glyphicons are 200

refers to #9794
2013-09-01 14:36:32 +02:00