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

4714 Commits

Author SHA1 Message Date
Mark Otto
dbbd48f7bc remove duplicate text scaling 2013-05-09 17:29:07 -07:00
Mark Otto
90e4ff73d2 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
	less/forms.less
2013-05-09 17:22:48 -07:00
Mark Otto
a19fda699d update reference to value of base line-height 2013-05-09 17:21:18 -07:00
Mark Otto
6fba68eb8b Unitless line-height
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
2013-05-09 17:20:46 -07:00
Blake Embrey
579d566299 Update button groups to use not selector and remove redundant CSS. 2013-05-09 16:53:28 -07:00
Mark Otto
7b6352d2cf Fix up navbar forms by using inline form as a mixin; fix docs for those 2013-05-09 16:41:35 -07:00
Mark Otto
3c72b1e9a0 remove the input from an example 2013-05-09 16:31:10 -07:00
Mark Otto
1fdfee8de0 Merge pull request #7837 from blakeembrey/input-group-radius
Remove input-group border radius resets
2013-05-09 16:30:48 -07:00
Mark Otto
293a3baca3 More forms overhaul
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
2013-05-09 15:05:06 -07:00
Blake Embrey
9716b73f67 Make the border-radius on input-groups to be overrides instead of resets on every size. 2013-05-09 14:48:27 -07:00
Mark Otto
7a7971d6db subnav for icons section 2013-05-09 14:08:06 -07:00
Mark Otto
8f9cc5ae81 Merge pull request #7836 from blakeembrey/icon-antialias
Make icons antialiased on Webkit browsers
2013-05-09 13:59:18 -07:00
Blake Embrey
4a03d45651 Make icons antialiased on Webkit browsers. 2013-05-09 13:48:02 -07:00
Mark Otto
d5e6bbba27 fix some broke buttons on the js page 2013-05-09 13:28:05 -07:00
Mark Otto
ec39bed94f Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-09 13:19:38 -07:00
Mark Otto
1d6971dc2b Merge pull request #7835 from blakeembrey/progress-bars
Remove backface-visibility from progress bars
2013-05-09 13:18:39 -07:00
Mark Otto
88a4712540 fix broken buttons on css docs 2013-05-09 13:12:40 -07:00
Blake Embrey
cc5e6619b4 Remove backface-visibility from progress bars. 2013-05-09 13:09:33 -07:00
Mark Otto
7fa6ae578b Update getting started page 2013-05-09 11:40:39 -07:00
Mark Otto
25b6df9944 rename welcome to getting started 2013-05-09 11:20:15 -07:00
Mark Otto
7c94f5ef64 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-05-09 09:22:58 -07:00
Mark Otto
751eb0bdcc Fixes #7823: add mention of container to CSS page; build out CSS overview subnav 2013-05-09 09:22:49 -07:00
Mark Otto
217ac7b7b7 Merge pull request #7824 from burnsra/3.0.0-wip-examples
Fix form in navbar
2013-05-09 09:14:31 -07:00
Mark Otto
d731690352 remove lingering typeahead reference in makefile 2013-05-09 09:09:44 -07:00
Robert Burns
3a539abbd2 Fix form in navbar 2013-05-09 07:21:22 -04:00
Mark Otto
766be659c1 .bs-docs-sidenote to .bs-callout 2013-05-08 22:58:54 -07:00
Mark Otto
526dfb7735 .bs-docs-tooltip-examples to .bs-example-tooltips 2013-05-08 22:57:42 -07:00
Mark Otto
09c3a4b3bc .bs-docs-example to .bs-example 2013-05-08 22:56:29 -07:00
Mark Otto
ac28ad81d0 .bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer 2013-05-08 22:55:17 -07:00
Mark Otto
705063c73a .bs-docs-social-* to .bs-social-* 2013-05-08 22:54:25 -07:00
Mark Otto
22f212379f nuke stuff from customizer 2013-05-08 22:53:31 -07:00
Mark Otto
3c3e56ca50 .bs-docs-top to .bs-top 2013-05-08 22:52:48 -07:00
Mark Otto
e5e5f6616c .bs-docs-header to .bs-header 2013-05-08 22:51:44 -07:00
Mark Otto
67b7a2fc34 docs css reorg 2013-05-08 22:50:41 -07:00
Mark Otto
d7acf4e82d more work on the sidenav, including small css refactor and new classes 2013-05-08 22:42:42 -07:00
Mark Otto
f09b07dc2a more navbar and header tweaks 2013-05-08 22:31:49 -07:00
Mark Otto
fa4d4e8d88 new docs page headers 2013-05-08 22:29:53 -07:00
Mark Otto
241d342363 red navbar for docs 2013-05-08 22:24:07 -07:00
Mark Otto
65289bb1ea make restored top navbar collapsable 2013-05-08 22:17:26 -07:00
Mark Otto
feeaaa6feb refactor homepage jumbotron masthead doodad 2013-05-08 22:13:56 -07:00
Mark Otto
07aed1abc3 move social buttons to separate include 2013-05-08 22:07:28 -07:00
Mark Otto
edb733ebc7 Super massive docs overhaul
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto
88dd9de9ba Drop typeahead.js--instead try Twitter's typeahead plugin 2013-05-08 20:04:54 -07:00
Mark Otto
54561f1121 hide entire navbar in print views 2013-05-08 19:57:42 -07:00
Mark Otto
1cb880b4f1 Fixes #7816: revert negative margin on .navbar-nav 2013-05-08 19:55:20 -07:00
Mark Otto
509f2244da Merge pull request #7809 from twitter/bs3_adding_btn_default
BS3: Require .btn-default for all standard buttons
2013-05-08 11:47:43 -07:00
William Ghelfi
7090eb0061 Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example 2013-05-08 14:26:55 +02:00
William Ghelfi
9013ff002a add offcanvas layout example based on bradfrost/this-is-responsive 2013-05-08 14:25:37 +02:00
Mark Otto
f03d337151 indentation fix 2013-05-07 23:43:51 -07:00
Mark Otto
c459c657f8 Update forms
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
2013-05-07 21:56:55 -07:00