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

4670 Commits

Author SHA1 Message Date
Mark Otto
175e4676dd Merge pull request #8241 from nextgenthemes/3.0.0-wip
rename '.navbar .nav' to '.navbar-nav'
2013-06-20 09:57:18 -07:00
nextgenthemes
110fc88601 rename '.navbar .nav' to '.navbar-nav' 2013-06-20 19:40:30 +03:00
Mark Otto
65ad52060e Offcanvas example update
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto
b0bece66f2 Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example 2013-06-19 19:13:38 -07:00
Mark Otto
5fcdf1229d Fixes #8001: add IDs for example inputs 2013-06-19 19:02:29 -07:00
Mark Otto
badececcdf Merge pull request #8233 from zurt/patch-1
Add missing property to form-horizontal docs
2013-06-19 18:02:47 -07:00
Kurt MacDonald
98a8eaffc0 Add missing property to form-horizontal docs 2013-06-19 17:08:14 -06:00
Mark Otto
546d40a143 Add support for tr, th, and td to responsive utilities 2013-06-18 19:16:50 -07:00
Mark Otto
112dabb3c2 run make on last commit 2013-06-18 19:16:50 -07:00
Mark Otto
986c22a5c6 Merge pull request #8210 from cvrebert/backticks
docs/javascript.html: backticks -> <code>
2013-06-18 14:40:13 -07:00
Chris Rebert
7b60d04f0c docs/javascript.html: backticks -> <code> 2013-06-18 14:35:37 -07:00
Mark Otto
4b4079b224 Addresses #8199: darker default button 2013-06-18 11:16:43 -07:00
Mark Otto
c6c3009dd0 Add note about Jekyll version per #8195 2013-06-17 21:36:03 -07:00
Mark Otto
4130a1093d Merge pull request #8182 from karelvuong/3.0.0-wip
3.0.0-wip - Fixed 'Running Doc. Locally" Link
2013-06-17 21:34:31 -07:00
Mark Otto
bcc3af4b2a Fixes #7599: Improved print styles for a few key components
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto
37f4a25be4 Better clearing on .dl-horizontal for empty dd elements
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.

Addresses a few old issues, including #2824, #3819, #3821, #4062,
#6707, and #7180.

Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto
4436e727ed Properly unstyle the .list-unstyled class by switching from margin to padding
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto
84c0dc13ba Remove explicit, unncessary line-height on li elements 2013-06-17 14:21:16 -07:00
Mark Otto
731cbb302e Better base ul and ol styles
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Mark Otto
5f3f73c620 Merge pull request #8184 from FLOKER/3.0.0-wip
redundant lines removed
2013-06-16 20:48:27 -07:00
Mark Otto
abfcde4de2 Merge pull request #8189 from cvrebert/patch-2
components docs: backticks ==> <code>
2013-06-16 20:45:20 -07:00
Chris Rebert
5c63883062 components docs: backticks ==> <code> 2013-06-16 21:40:50 -06:00
Mark Otto
1555992e35 Merge pull request #8187 from imsky/3.0.0-wip
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 20:39:11 -07:00
Mark Otto
ce17746302 Merge pull request #8188 from cvrebert/patch-1
CSS docs page: backticks ==> <code>
2013-06-16 20:38:31 -07:00
Chris Rebert
50df5de14f CSS docs page: backticks ==> <code> 2013-06-16 21:36:56 -06:00
Ivan Malopinsky
c1655e6cbd upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers 2013-06-16 23:16:56 -04:00
FLOKER
125e472d6f redundant lines removed 2013-06-16 22:18:46 +02:00
Mark Otto
ac3521fef4 Remove WebKit overflow scrolling for now 2013-06-16 10:56:30 -07:00
Karel Vuong
0b7b40e281 Fixed link. 2013-06-15 22:23:09 -04:00
Mark Otto
6ce154c7ed Fixes #8175: Update input min-height vars to fix FF21 input rendering 2013-06-15 11:46:13 -07:00
Mark Otto
258e1d62fb Fix up broken input group example layouts 2013-06-15 11:37:59 -07:00
Mark Otto
ecf9b020dd Merge pull request #8168 from marsuboss/patch-2
Duplicate ID navbar-example
2013-06-13 13:41:23 -07:00
Mark Otto
ab162fe64e Merge pull request #8166 from liuyl/package
change version of recess to 1.1.7
2013-06-13 13:41:04 -07:00
Mark Otto
c14f23192a Merge pull request #8167 from marsuboss/patch-1
Duplicate ID drop5
2013-06-13 13:40:40 -07:00
Mark Otto
d363d96f4b Merge pull request #8169 from marsuboss/patch-4
Fix
2013-06-13 13:39:11 -07:00
marsuboss
1421a0e9bb Fix 2013-06-13 15:50:06 +03:00
marsuboss
436cffdaaf Duplicate ID navbar-example 2013-06-13 15:36:52 +03:00
marsuboss
c6f51d0919 Duplicate ID drop5 2013-06-13 14:29:34 +02:00
liuyl
2c00a2fe2f change version of recess to 1.1.7 2013-06-13 19:27:26 +08:00
Mark Otto
949c7cca00 Merge pull request #8156 from baer/toggle-button-fix
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto
47f8ba98f3 Merge pull request #8158 from baer/download-button-fix-proper
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer
6771be1ced Docs Customize "Customize and Download" button not working properly 2013-06-12 14:01:59 -06:00
Eric Baer
7f8703ef86 Docs Customize toggle button used incorrect selectors 2013-06-12 12:51:10 -06:00
Mark Otto
40751305f8 Merge pull request #8124 from eins78/3.0.0-wip-fix-json
fix JSON syntax error in composer.json
2013-06-10 16:37:29 -07:00
Max F. Albrecht
3a02d07aca fix JSON syntax error in composer.json 2013-06-10 14:59:42 +02:00
Mark Otto
d74a9634b0 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-06-09 23:45:23 -07:00
Mark Otto
9fac2c0467 Update docs JS to prevent clicks on links with hash hrefs 2013-06-09 23:45:14 -07:00
Mark Otto
9ba11ba60a No more need for grid column highlighting, so nuke that 2013-06-09 23:44:14 -07:00
Mark Otto
0a18d33d2c Redo grid documentation
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto
8b136f5b66 Merge pull request #8080 from mladenplavsic/patch-2
Update css.html
2013-06-08 20:53:37 -07:00