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

6455 Commits

Author SHA1 Message Date
Mark Otto
dd9980e8c9 Fixes #10137: correct classes on thumbnails 2013-08-26 17:47:56 -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
Chris Rebert
d977c9902d Merge pull request #10146 from unwiredben/master
javascript.html: add data-ride note
2013-08-25 21:36:31 -07:00
Ben Combee
92bb465ba3 javascript.html: add data-ride note
carousel docs were missing mention of the data-ride attribute
used to automatically start the carousel at load time
2013-08-25 23:07:43 -05:00
Chris Rebert
90604bbcea Merge pull request #10148 from originell/patch-1
Correct Typo
2013-08-25 15:01:26 -07:00
Luis Nell
8401855f16 Correct Typo 2013-08-25 23:58:01 +02:00
Mark Otto
4c2b15d6f5 Merge pull request #10129 from pixelchutes/fix-3.0-migration-changes
Corrected 3.0 responsive utility class reference mapping when migrating ...
2013-08-25 00:36:03 -07:00
Mike Reid
62fde12c8a Corrected 3.0 responsive utility class reference mapping when migrating from 2.x (now accounting for new Large device support.) Also synchronized breakpoint values from Grid options > Media queries, for clarity. 2013-08-25 00:05:20 -06:00
Mark Otto
bae1726509 Merge pull request #10128 from leoj3n/alert-block-remove
Fixes #9008: remove `alert-block` class from example
2013-08-24 21:23:38 -07:00
Joel Kuzmarski
e63b6c0675 Fixes #9008: remove alert-block class from example 2013-08-24 23:01:08 -05:00
Mark Otto
86f28f0380 update raw files (should fix builds) 2013-08-24 14:47:58 -07:00
Mark Otto
00895977ff Merge branch 'master' of github.com:twbs/bootstrap 2013-08-24 14:40:36 -07:00
Mark Otto
7c8d9551cc fixes #9887: documents show and hide classes 2013-08-24 14:40:24 -07:00
Mark Otto
26eb9f3440 Merge pull request #10112 from kevinSuttle/button-roles
Add role="button" to <a> buttons
2013-08-24 14:31:33 -07:00
Mark Otto
4c794aaaef grunt dist on glyphicons width change 2013-08-24 13:59:03 -07:00
Mark Otto
d67ce62f5d Merge pull request #9996 from jodytate/master
changed description of default button
2013-08-24 13:41:24 -07:00
Kevin Suttle
dd9c15273c Add even more role="button" attributes
Missed the <a class="btw" in my regex search
2013-08-24 16:31:15 -04:00
Kevin Suttle
0add7700ad Add role="button" to <a> buttons
These should really be <button> elements, but until that gets squared away, this will suffice.
2013-08-24 16:29:35 -04:00
Mark Otto
c0b00f22fe forgot a pair of buttons 2013-08-24 12:30:46 -07:00
Mark Otto
74a778a7e6 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-24 12:29:45 -07:00
Mark Otto
ab3e1762d4 turn some buttons into <button> elements where possible 2013-08-24 11:46:24 -07:00
Mark Otto
a167a910d9 Merge pull request #10103 from hero-m/patch-1
Another case for Issue #10099
2013-08-24 01:33:04 -07:00
hero-m
54dcb4b699 Another case for Issue #10099
Another case for Issue #10099
2013-08-24 12:11:12 +04:30
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
802e5caf51 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 23:59:11 -07:00
Mark Otto
700d7e7b2c Remove footnote links and inline them; link to contributing guidelines in readme 2013-08-23 23:58:38 -07:00
Mark Otto
a6a97e1b27 Merge pull request #9964 from thomaswelton/patch-1
Bower - Added fonts to "main" files
2013-08-23 23:52:24 -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
705f7ba279 fixes #9876: avoid dropdowns in navbar examples to prevent overlap 2013-08-23 23:39:11 -07:00
Mark Otto
ddd594c6e2 follow up to #9963 and #10005: update docs to use .screen-*-min vars, update customizer as well; run grunt to adjust raw files 2013-08-23 23:33:16 -07:00
Mark Otto
adac269f95 grunt on previous ms scroll fix 2013-08-23 23:32:16 -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
99afaba2bf Merge pull request #10005 from twbs/deprecate-screen-device-vars
deprecate @screen-{phone,tablet,desktop} vars
2013-08-23 23:14:13 -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
Chris Rebert
a7e5bac2d7 Merge pull request #10100 from twbs/document_hide_text
Fixes #10076: Document hide text
2013-08-23 22:39:26 -07:00
Mark Otto
48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -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
e25ca1e7a9 Document .hide-text and .text-hide 2013-08-23 22:01:42 -07:00
Mark Otto
7a7149d2ee Rearrange helper classes docs section; add subnav list items to docs side nav 2013-08-23 22:00:54 -07:00
Mark Otto
7edd87dde9 Merge branch 'master' of github.com:twbs/bootstrap 2013-08-23 21:45:58 -07:00
Mark Otto
c4f1591e70 fixes #10095: note about backwards incompatibility 2013-08-23 21:45:46 -07:00
Mark Otto
c1ddb06de7 Merge pull request #10098 from wangsai/fix-form
fix form
2013-08-23 21:34:44 -07:00
Mark Otto
b67e49367a Merge pull request #10097 from wangsai/complete-td
complete missed </td>
2013-08-23 21:34:25 -07:00