Mark Otto
2981f0089f
remove glyphicons from demo component
2013-06-27 18:51:06 -07:00
Mark Otto
62f76ad33f
Merge branch '3.0.0-wip' into bs3_remove_icons
...
Conflicts:
docs/components.html
2013-06-27 18:49:05 -07:00
Mark Otto
cb29ed0751
Merge pull request #8307 from cvrebert/8287-docs-patch
...
Fix #8287
2013-06-27 18:38:34 -07:00
Julian Thilo
b4e0e4fee6
Adjust info callout, add callouts to docs
...
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
James Holland
2471b9d725
typo: match doc text and example
2013-06-26 08:27:12 -04:00
Chris Rebert
242d92e09c
Fix #8287
2013-06-25 20:18:30 -07:00
Kyle
c455d92f9e
Replaced <i> with <span> for glyphicon
2013-06-24 11:27:05 +08:00
Mark Otto
f64fe29003
Move Glyphicons into their own repo
...
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Chris Rebert
5c63883062
components docs: backticks ==> <code>
2013-06-16 21:40:50 -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
marsuboss
1421a0e9bb
Fix
2013-06-13 15:50:06 +03:00
Mark Otto
245ebda651
nuke the .col
2013-06-03 21:57:51 -07:00
Mark Otto
9762f95bde
Change up link alerts
...
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00
Mark Otto
6307dc40d7
Fixes #7898 : ensure button type
...
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
Mark Otto
31dcb91189
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00
Mark Otto
28a081cb20
Overhaul form control and button sizing, and some type styles
...
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto
0ac1af13d3
Merge pull request #7882 from juthilo/3.0.0-wip
...
Cleaning the navbar docs
2013-05-14 19:43:59 -07:00
Mark Otto
1d8ff36afa
Add .panel-footer
2013-05-14 18:55:37 -07:00
Julian Thilo
cd2d7b5d17
add detail to navbar component alignment section
...
* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
2013-05-14 22:42:06 +02:00
Julian Thilo
9af88380c4
.navbar docs: update -fixed-* callouts, fix -link
...
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
2013-05-14 22:31:15 +02:00
Robert Burns
da9cf1009b
Fix glyphicon in "Dropdown in a button group" example
2013-05-13 21:40:48 -04:00
Mark Otto
79a4269430
Fix navbar button docs
2013-05-12 16:34:12 -07:00
Mark Otto
8051695c87
Merge pull request #7838 from blakeembrey/btn-group-radius
...
Remove the overrides and resets from button groups
2013-05-10 16:35:25 -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
7a7971d6db
subnav for icons section
2013-05-09 14:08:06 -07:00
Mark Otto
766be659c1
.bs-docs-sidenote to .bs-callout
2013-05-08 22:58:54 -07:00
Mark Otto
09c3a4b3bc
.bs-docs-example to .bs-example
2013-05-08 22:56:29 -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
4b8b8d2e46
holy crap new docs layout separate from home, no more top navbar
2013-03-28 01:08:14 -07:00
Mark Otto
081c061281
new subnav on all pages
2013-03-28 00:21:21 -07:00
Mark Otto
5b298a2aaf
docs fixes with new .bs-docs-container; fixing some lingering grid classes
2013-03-26 23:54:17 -07:00
Mark Otto
ca31f060a8
New grid classes
2013-03-26 17:12:17 -07:00
Mark Otto
4c0719ea5f
fix derpy linenos in pygments for thumbnails component
2013-03-14 22:34:20 -07:00
Mark Otto
5a30e52aac
Fixes #6995 : Add disabled navbar nav link support
2013-02-28 23:20:58 -08:00
Tom Pietschker
1780873173
forgot navbar-fixed-bottom in the commit
2013-02-19 14:54:56 -05:00
Tom Pietschker
ba7b1e8234
tweak the position of the fixed to top/bottom navbars to remove double border
2013-02-19 14:50:44 -05:00
Tom Pietschker
ec9b01e691
remove the search-query class and increase the width
2013-02-19 14:40:05 -05:00
Tom Pietschker
62b54605a7
replace navbar-search with navbar-form
2013-02-19 14:35:48 -05:00
Tom Pietschker
3b7e5214e3
remove navbar-inner
2013-02-19 14:32:28 -05:00
Tom Pietschker
4c00f290f2
fix incorrect section id for labels
2013-02-18 20:57:54 -05:00
Mark Otto
023568fe3d
Navbar realignment:
...
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto
acdffe696c
Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems
2013-02-17 22:20:49 -08:00
Mark Otto
f6ec2c5dac
Drop the recently added .counter class for .badge
2013-02-17 21:06:20 -08:00
Mark Otto
4cbb663d9d
Update some links and rename #gridsystem to #grid-system
2013-02-17 18:10:29 -08:00
Mark Otto
6ccf588a8e
Restore submenu support
2013-02-17 13:35:14 -08:00
Mark Otto
ce21926704
All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star
2013-02-16 01:26:43 -08:00
Mark Otto
37becbab8c
convert components code examples to pygments
2013-02-14 21:42:33 -08:00
Mark Otto
e45f12ad42
rearrange jekyll and docs
2013-02-12 12:44:41 -08:00
Mark Otto
8b9733b288
nuke what we don't need for jekyll
2013-02-12 12:25:05 -08:00
Mark Otto
0b4668368b
Merge branch '2.3.0-wip' into 3.0.0-wip
2013-02-05 22:47:00 -08:00
Mark Otto
2fa77bf197
Update link to changelog
2013-02-05 22:46:45 -08:00
Mark Otto
e4a74607b0
simplify media docs
2013-02-05 01:12:39 -08:00
Mark Otto
b65293dec0
reorganize progress bars docs
2013-02-05 01:11:41 -08:00
Mark Otto
3949623eee
simpler alerts docs
2013-02-05 01:07:43 -08:00
Mark Otto
238566b445
mo betta thumbnails docs
2013-02-05 01:01:23 -08:00
Mark Otto
2576e6d1d6
reorder counters docs
2013-02-05 00:59:22 -08:00
Mark Otto
cf78f4b010
pagination docs cleanup
2013-02-05 00:54:48 -08:00
Mark Otto
1f673b77bb
simpler breadcrumbs docs
2013-02-05 00:51:19 -08:00
Mark Otto
74c8a5611d
Increase margins and line-height on h3; overhaul button dropdown docs
2013-02-05 00:49:54 -08:00
Mark Otto
c09b994eea
Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections
2013-02-05 00:30:03 -08:00
Mark Otto
94e256c016
Refactor navbar dividers
...
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto
d53af49afe
Refactor colors and progress bars
...
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Mark Otto
5e5670a1b4
Remove gallery link from navbar; add to homepage examples section instead
2013-01-31 18:00:11 -08:00
Mark Otto
83e5c01856
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
2013-01-31 17:57:31 -08:00
Mark Otto
f20c3368e4
Update pagination example HTML to match examples
2013-01-30 17:42:03 -08:00
Mark Otto
d30f47efb2
Tighten up badges docs; less bottom margin on h3
2013-01-19 18:53:41 -08:00
Mark Otto
c21c3f101b
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
2013-01-19 17:06:40 -08:00
Vickash Mahabir
67ec13a44c
Counters example doesn't need to be a table
2013-01-18 18:03:43 -04:00
Vickash Mahabir
964cb77383
Make the counter example more meaningful
2013-01-18 17:50:58 -04:00
Vickash Mahabir
665de0455c
Change .badge to .counter, make appearance more OSX-ish, and remove colors
2013-01-18 17:35:23 -04:00
Mark Otto
1b128b3431
comment tweaks and updating starter template
2013-01-17 20:28:05 -08:00
Mark Otto
fd89531f6a
Update commenting and structure of layout.mustache
2013-01-17 20:26:17 -08:00
Mark Otto
d9b35c2602
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
b30b8c2c12
Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though.
2013-01-17 17:02:35 -08:00
Mark Otto
97975c5fcf
Readd focused example of inputs to docs; clean up alerts section
2013-01-17 15:36:36 -08:00
Mark Otto
f6226c9b91
Update Getting Started page to include mention of Respond
2013-01-17 14:49:52 -08:00
Mark Otto
5c76518f7d
Add respond.js to main docs pages, but only for IE8 and down
2013-01-17 14:00:03 -08:00
Mark Otto
7c23d889bb
Change subheading of alerts page
2013-01-17 12:13:37 -08:00
Mark Otto
7e46b6f636
Update nav and add bounds for tablet container
2013-01-17 00:58:34 -08:00
Mark Otto
9ba14cfb7c
More navbar derping
2013-01-16 16:14:41 -08:00
Yohn
60bb95e611
adding class to example code
2013-01-16 07:45:31 -05:00
Mark Otto
f9ee99cf6f
Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing
2013-01-14 00:11:55 -08:00
Mark Otto
7d8d5c7838
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
583fc4b962
buttons and button group flattening improvements
2013-01-12 18:52:06 -08:00
Mark Otto
a33d45f308
Merge branch '3.0.0-wip' into bs3-flatten
2013-01-12 14:16:49 -08:00
Mark Otto
7a3f078fb4
Remove parent div from pagination component
...
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Mark Otto
a7231854c9
Address #6459 and add mention of disabled links in dropdowns to le docs
2013-01-12 00:33:12 -08:00
Mark Otto
88e816956a
Fixes #6552 : example fix for button group
2013-01-11 20:52:39 -08:00
Mark Otto
3d04d9ba75
Super lame typo on my part, sorry @necolas :)
2012-12-28 19:24:13 -06:00
Mark Otto
c063f7c9c2
Update docs to reflect latest on .clearfix
2012-12-24 02:08:45 -08:00
Mark Otto
d206ec1659
Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger
2012-12-24 02:06:28 -08:00
Mark Otto
c11f41ba04
flatten buttons and forms
2012-12-21 00:50:28 -08:00
Mark Otto
7c04d573d0
update docs regarding normalize and clearfix
2012-12-20 21:44:45 -08:00
Quy Ton
a27bf30f0d
Miscellaneous changes to docs
2012-12-20 21:38:53 -08:00
Mark Otto
4e54e7bb35
Remove dropdown submenu docs
2012-12-20 00:27:46 -08:00
Mark Otto
65edc9cd6e
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
2012-12-19 21:42:36 -08:00
Mark Otto
b6945a2168
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
2012-12-19 21:37:16 -08:00
Mark Otto
2011a0d50f
Drop labels from the docs
2012-12-19 21:29:57 -08:00
Mark Otto
bc0b94a3fd
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
2012-12-08 17:40:42 -08:00
