2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

21773 Commits

Author SHA1 Message Date
Mark Otto 1b89a63a48 Use @font-family-base for headings font-family variable 2013-06-20 15:38:18 -07:00
Mark Otto 3c60645ec0 Merge pull request #8237 from luishdez/feature/var-heading-family
Add heading font family variable
2013-06-20 15:36:49 -07:00
Mark Otto c5fb401a62 Move examples out of the main repo to twbs/bootstrap-examples
While examples are phenomenally useful and awesome for folks getting
started with Bootstrap, they don't really shine as well being buried in
the main docs. Moreover, having anything that's not core HTML, CSS, JS,
or documentation in the main repo seems to just get in the way.
Therefore, examples gets its own repo.

Specifically, we're doing the following:

* Deletes all example screenshots
* Deletes example layout
* Deletes example files
* Updates Getting Started docs to include only the template and a link
to the new examples project

All the examples and their history will be preserved in the switch.
2013-06-20 12:36:27 -07:00
Mark Otto 8383209521 run make on @nextgenthemes last commit 2013-06-20 09:58:21 -07:00
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
Luis Hdez cd09f3213b Add heading font family variable 2013-06-20 12:50:30 +02:00
Mark Otto 14273cd53d add example screenshots dir 2013-06-19 23:17:17 -07:00
Mark Otto a550ea5113 minify latest bs3 2013-06-19 23:16:34 -07:00
Mark Otto f91559d85d update starter template to use new format; include latest BS3 CSS 2013-06-19 23:16:00 -07: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 9f73fef30a 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 84b6847c75 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
Edgar Schnueriger 6a79f53899 Use correct font-size to calculate input-heights 2013-06-18 21:43:34 +02: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
Edgar Schnueriger b0d202455d Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed 2013-06-17 18:56:17 +02: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