rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
4,624 Commits 108 Branches 89 Tags 552 MiB
40751305f8
Commit Graph

3181 Commits

Author SHA1 Message Date
Mark Otto
0fbfa167e1 fix text class in docs 2013-03-31 19:55:05 -07:00
Mark Otto
3365d4a06a Merge branch '3.0.0-wip-fixes' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-fixes 2013-03-31 19:28:27 -07:00
Mark Otto
c69310153e Fixes #7438: remove max-height from justified nav tabs with some CSS wankery 2013-03-31 19:26:40 -07:00
Robert Burns
d299ff4fce Fix image paths and carousel controls for carousel example 2013-03-31 21:47:02 -04:00
Mark Otto
4c49458336 remove text-rendering optimizeLegibility from headings 2013-03-31 18:40:07 -07:00
Mark Otto
db284a97d6 more consistent navbar vars 2013-03-31 17:56:31 -07:00
Mark Otto
d6f37f3c56 @link-color-hover to @link-hover-color 2013-03-31 17:27:22 -07:00
Mark Otto
d5fa1d80bb use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg 2013-03-31 17:22:12 -07:00
Mark Otto
6b23a66c29 -background to -bg on tooltip and popover vars 2013-03-31 17:19:12 -07:00
Mark Otto
c5042e050e fix nav divider 2013-03-31 17:17:10 -07:00
Mark Otto
388a4c878d remove lingering rem 2013-03-31 13:20:54 -07:00
Mark Otto
674768b177 restore px unit on @font-size-base 2013-03-31 12:00:04 -07:00
Mark Otto
a2145df7c4 run make after that breadcrumbs tweak 2013-03-31 11:58:25 -07:00
Mark Otto
42b6934930 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-31 11:58:08 -07:00
Mark Otto
b018513aa5 lingering nav-list use 2013-03-31 11:58:00 -07:00
Mark Otto
e62f2901d0 Merge pull request #7431 from burnsra/3.0.0-wip-fixes 
Cleanup items for 3.0.0
 2013-03-31 11:55:48 -07:00
Mark Otto
fc16e37aaa Remove the handful of rem font-sizes 2013-03-31 11:26:13 -07:00
Mark Otto
b96ab36d38 add some container padding for examples 2013-03-31 11:24:31 -07:00
Robert Burns
74e06cb279 Add styles for tooltip and popover examples 2013-03-31 09:59:02 -04:00
Mark Otto
6c1ed5638b actually readd the padding and set it to smaller amount for narrow viewports 2013-03-30 22:54:31 -07:00
Mark Otto
70ba9a880e remove padding form sign in form example 2013-03-30 22:53:35 -07:00
Mark Otto
40f671a531 add basic back to top link via affix 2013-03-30 18:41:26 -07:00
Mark Otto
e560c41ed1 simpler nav links 2013-03-30 17:06:59 -07:00
Mark Otto
6edd5f291a not quite #fff on .list-group-item-text 2013-03-30 17:00:11 -07:00
Mark Otto
1683669eaa Remove .nav-list given new .list-group 2013-03-30 16:56:49 -07:00
Mark Otto
2a9604fdd2 add list group component 2013-03-30 16:07:50 -07:00
Mark Otto
731903a175 panels subnav and links 2013-03-30 14:16:30 -07:00
Mark Otto
9fff2d3fb6 Change error to danger for all classes; add panels component 2013-03-30 14:15:18 -07:00
Mark Otto
aee25786a7 fuck everything about .clear_float() -- restore .clearfix() as mixin 2013-03-30 13:23:18 -07:00
Mark Otto
62df38586a navbar links in sidenav 2013-03-30 13:16:34 -07:00
Mark Otto
171c7feae2 navs nav links 2013-03-30 13:14:04 -07:00
Mark Otto
e9dd1826be fix brok btn-dropdowns links 2013-03-30 13:12:03 -07:00
Mark Otto
9336a827c6 fix submenu docs height given border-box 2013-03-30 13:11:15 -07:00
Mark Otto
bd69269426 more component nav updates 2013-03-30 13:09:56 -07:00
Mark Otto
906ff98601 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-03-30 12:12:28 -07:00
Robert Burns
501dfbe8ae Fix path to examples to account for new layout 2013-03-30 10:10:51 -04:00
Mark Otto
a4901e2da8 mention responsive image and google maps 2013-03-30 01:55:39 -07:00
Mark Otto
1dcadede36 fix broke grid classes 2013-03-30 01:09:30 -07:00
Mark Otto
af470f4c7b more content and nav twerks 2013-03-30 01:06:50 -07:00
Mark Otto
361c776e2b whitespace and taglines for main sections 2013-03-30 00:27:50 -07:00
Mark Otto
49ebf542a2 reorder docs 2013-03-30 00:19:05 -07:00
Mark Otto
601013ca04 drop .muted for .text-muted 2013-03-30 00:11:38 -07:00
Mark Otto
3359b8d5f6 nav change to go with that 2013-03-29 23:37:55 -07:00
Mark Otto
21d6a5933a fix buttons links 2013-03-29 23:37:43 -07:00
Mark Otto
8814125259 Add subnav support to CSS section 2013-03-29 23:33:08 -07:00
Mark Otto
23d7215dbe Modify scrollspy to add .active to all parent li items /cc @fat 2013-03-29 23:32:47 -07:00
Mark Otto
4dfc4e1022 clarify small docs 2013-03-29 22:40:42 -07:00
Mark Otto
f367090671 countypo 2013-03-29 22:38:25 -07:00
Mark Otto
4ce9203f2c Merge branch '3.0.0-wip' into bs3_new_nav 2013-03-29 14:21:03 -07:00
Mark Otto
9f59648702 add link to github project on getting started section 2013-03-29 14:04:11 -07:00
Mark Otto
2ebc060795 mo padding on side nav links 2013-03-29 13:43:37 -07:00
Mark Otto
d3fe506f04 clearer js instructions on how to include plugins 2013-03-29 13:43:30 -07:00
Mark Otto
3055f09a90 dat red 2013-03-29 10:45:00 -07:00
Mark Otto
e25ad912e2 correct page title and nuke liquid description 2013-03-28 17:20:17 -07:00
Mark Otto
384926a1d6 remove nonexistant example 2013-03-28 17:19:41 -07:00
Andreas Cederström
090545ffdf Make sure form actions are properly aligned with form-horizontal 2013-03-28 11:33:18 +01:00
Mark Otto
3278c40631 move nav into partial; rejigger content some more 2013-03-28 03:06:00 -07:00
Mark Otto
df35e26142 rejigger some content and start exploring section headings 2013-03-28 01:34:42 -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
fe414d8566 turn docs navbar into left navbar 2013-03-27 23:33:45 -07:00
Mark Otto
6696ff5d92 clarify docs on unstyled lists 2013-03-27 15:54:17 -07:00
Mark Otto
f0f33eb9a3 Refactor .list-inline and .list-unstyled 
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
 2013-03-27 15:42:11 -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
d5303906bd Remove grid example; update grid classes in examples 2013-03-26 17:17:39 -07:00
Mark Otto
ca31f060a8 New grid classes 2013-03-26 17:12:17 -07:00
Mark Otto
1e9be3644c remove .navbar-inner from starter template 2013-03-26 12:31:03 -07:00
Mark Otto
954dcc0dc5 Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip 
Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html
 2013-03-26 12:28:00 -07:00
mo
ab09fb25b9 Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle" 2013-03-25 18:13:13 -07:00
mo
a9e9d9d544 Fixed all the .brand in navbar to .navbar-brand 2013-03-25 17:46:44 -07:00
Mark Otto
3c82ccaa2b color border in table contextual classes 2013-03-17 17:26:02 -07:00
Mark Otto
3aee2adb4b Fixes #7297: add support for .success, .error, and .warning on td and th elements in tables 2013-03-17 12:10:58 -07:00
Mark Otto
28cdc8dc5f incorporate print utilities classes into responsive docs; rejigger some content 2013-03-17 11:57:00 -07:00
Mark Otto
6012d8221b Exploring rems as font-size unit 
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
 2013-03-17 11:33:07 -07:00
Mark Otto
68dfd322f4 fixes #7140: hide navbar toggle in print 2013-03-16 16:17:32 -07:00
Mark Otto
fe2658ed61 Fixes #7150: colorize links in alerts 2013-03-16 15:31:03 -07:00
Mark Otto
e0de08c389 typo 2013-03-16 14:49:21 -07:00
Mark Otto
8c9e9e28cf Fix vertical button groups 2013-03-16 13:03:31 -07:00
Mark Otto
efbf8373a5 Use form elements in checkbox and radio button groups 
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
 2013-03-16 12:34:07 -07:00
Mark Otto
be8f992c94 remove inner shadow from .highlight 2013-03-16 12:09:26 -07:00
Mark Otto
f77dc548a1 update pygments highlighting with customizations from preboot 2013-03-16 12:07:00 -07:00
Mark Otto
bb38fa5286 Overhaul the grid system and its docs 
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot)
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
 2013-03-15 23:21:10 -07:00
Mark Otto
145eb054d9 begin to rewrite the grid docs 2013-03-15 21:57:16 -07:00
Mark Otto
2a0fb08fad getting started as navbar link label 2013-03-15 21:23:59 -07:00
Mark Otto
ecfdecea00 Use translucent box shadow on hr elements; colorize hr elements within alert components 2013-03-14 23:01:23 -07:00
Mark Otto
4c0719ea5f fix derpy linenos in pygments for thumbnails component 2013-03-14 22:34:20 -07:00
Mark Otto
ed7fe0e5ba unfuck misaligned main container 2013-03-14 21:45:31 -07:00
Mark Otto
85e5d40099 fix example navbar brand 2013-03-14 18:54:43 -07:00
Mark Otto
3cd6d00cc4 use the proper selector 2013-03-14 18:53:46 -07:00
Mark Otto
b5eca07be1 modify copy 2013-03-14 18:23:08 -07:00
Mark Otto
d8234b38cb Merge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani-3.0.0-wip 2013-03-14 13:34:48 -07:00
Mark Otto
224296f695 Fixes #7281: make tables super specific for hovers and striping to avoid nesting issues 2013-03-14 13:29:43 -07:00
Mark Otto
00169b48bd Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	less/grid.less
 2013-03-14 13:25:59 -07:00
Addy
0c65a0e1ee Added bower install to download/install options in getting started guide 2013-03-14 10:58:16 +00:00
Mark Otto
d344ca4475 Merge pull request #7208 from benilovj/3.0.0-wip 
fix grammatical mistakes in carousel docs
 2013-03-10 23:32:13 -07:00
Mark Otto
d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05:00
Ufuk Avcu
33913e4586 Fix Typo sucess to success 
Mini typo fix in the docs...
 2013-03-09 21:04:09 +01:00
Jake Benilov
d5c3307ffa fix grammatical mistakes in carousel docs 2013-03-08 00:13:56 +00:00
Mark Otto
6e8ee02421 tweak icons alignment 2013-03-03 23:41:16 -08:00
Mark Otto
bfdc6f8607 Remove support for .uneditable-input 2013-03-03 23:31:09 -08:00
Mark Otto
6239094ca6 Nuke the gallery, punt it to the new http://expo.getbootstrap.com 2013-03-03 19:40:47 -08:00
Mark Otto
b83fc82aed fix row change at breakpoint 2013-03-03 18:19:31 -08:00
Mark Otto
e0647e8273 nuke commented out unused var 2013-03-01 12:37:36 -08:00
Mark Otto
a70c50d1f7 Merge branch 'master' 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/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.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/responsive.less
	package.json
 2013-03-01 12:37:21 -08:00
Mark Otto
77e8e2aee9 Fix alignment of .navbar-brand 2013-03-01 00:50:08 -08:00
Mark Otto
492c249537 improve navbar toggle and hide code snippets on mobile devices for now 2013-03-01 00:18:10 -08:00
Mark Otto
2e3ba4afe6 redo the buttons examples 2013-03-01 00:04:41 -08:00
Mark Otto
ba633949dc customize navbar in docs 2013-02-28 23:36:54 -08:00
Mark Otto
38ba057dee Fixes #6998: disabled background color properly on pagination 2013-02-28 23:23:05 -08:00
Mark Otto
5a30e52aac Fixes #6995: Add disabled navbar nav link support 2013-02-28 23:20:58 -08:00
Mark Otto
4418c82888 Fixes #6954: properly reset grid classes within tables 2013-02-28 22:47:32 -08:00
Mark Otto
bfc4aaf6e8 Holy fucking shit fix that input group with buttons rounded corner noise 2013-02-28 21:19:02 -08:00
fat
839b0c893f shiiiit 2013-02-28 21:15:33 -08:00
fat
3469339068 2.3.1 2013-02-28 20:55:14 -08:00
fat
cec434a4c3 rebuild 2013-02-28 20:48:48 -08:00
fat
2f27d9851c whitespace 2013-02-28 20:48:02 -08:00
fat
01e0f8c653 only pass unique options through to child nodes in tooltips 2013-02-28 20:39:07 -08:00
fat
cf998040ec rebuild 2013-02-28 19:49:08 -08:00
Mark Otto
b19eb88b5a Fixes #6935: Use standard decimal points for .opacity() mixin 2013-02-28 19:46:49 -08:00
Mark Otto
0dea8b0c74 Fixes #6897: Print styles get own .less file 2013-02-28 19:42:51 -08:00
fat
40b7a909a6 le sigh 2013-02-28 19:37:30 -08:00
Mark Otto
9d763e805b Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting 2013-02-28 19:34:02 -08:00
Mark Otto
81a0306cce add new example thumbnails; update links to point to new windows 2013-02-26 00:56:06 -08:00
Mark Otto
ea01e8bbc4 nuke remaining less/tests/ files and move grid over to examples dir 2013-02-26 00:49:21 -08:00
Mark Otto
e2e5580c0e nuke glyphicons changes in buttons for now because it's whack 2013-02-26 00:44:15 -08:00
Mark Otto
5b3b11c02a moved examples added 2013-02-26 00:42:24 -08:00
Mark Otto
91660a0489 Move navbar examples to /examples directory 2013-02-26 00:37:59 -08:00
Mark Otto
e1bb94c383 try out new table-based type example 2013-02-24 01:29:19 -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
722ba5f227 added missing slash in the src for Gather Content 2013-02-18 21:03:52 -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
f51862f158 remove unused include 2013-02-18 01:27:08 -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
53091be6d2 remove unnecessary select border reset 2013-02-17 20:26:21 -08:00
Mark Otto
e2d829e511 fix inaccurate text classes code 2013-02-17 20:23:31 -08:00
Mark Otto
82d059de87 fix broken marketing section with updated class 2013-02-17 20:18:29 -08:00
Mark Otto
159167041f forgot about those quotes 2013-02-17 19:15:09 -08:00
Mark Otto
56e60d0468 fix the docs include logic 2013-02-17 19:12:30 -08:00
Mark Otto
9b3262cb15 more narrow jumbotron example fixes in the mobile first arena 2013-02-17 19:04:38 -08:00
Mark Otto
c6f341bd17 Refactor some common classes from docs css and examples, then prevent examples from using docs.css 2013-02-17 18:58:40 -08:00
Mark Otto
dba9eea98d revamp narrow jumbotron to avoid conflicts with docs .masthead 2013-02-17 18:48:00 -08:00
Mark Otto
36aec5e484 decrease top/bottom padding a bit in mobile fixed navbars 2013-02-17 18:47:44 -08:00
Mark Otto
ee9a0f4b94 css to go with it 2013-02-17 18:46:49 -08:00
Mark Otto
13ff3aced0 Add class to body for special styles to avoid conflict with examples 2013-02-17 18:46:30 -08:00
Mark Otto
c0ea077fb4 Revert the statis navbar in mobile views--they're back to being fixed all the time 2013-02-17 18:33:55 -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
5fecb4a9f4 add visibility note to docs about captions 2013-02-16 02:49:12 -08:00
Mark Otto
6dce3f63d8 Scrach that: carousel caption is always left aligned, but still hidden for mobile views 2013-02-16 02:47:48 -08:00
Mark Otto
6d048471c4 Re-add carousel captions as optional 
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
 2013-02-16 02:47:15 -08:00
Mark Otto
e74fb39080 Nuke the fluid example since it's no longer applicable 2013-02-16 01:43:23 -08:00
Mark Otto
401d4fabd1 Nuke the old_docs.css file 2013-02-16 01:39:09 -08:00
Mark Otto
b6ec72a3a2 Nuke @mdo's photos from the repo since we're using holder.js for carousel demo 2013-02-16 01:38:32 -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
d8e2668c1d Overhaul carousel a bit more: 
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
 2013-02-16 01:22:15 -08:00
Mark Otto
b688d8dcd4 More accurate padding for fixed navbars at >768px 2013-02-16 00:20:20 -08:00
Mark Otto
f38e50cdf1 Don't affix the fixed navbars in mobile views 2013-02-16 00:19:17 -08:00
Mark Otto
d1aae5f82b twerk gallery examples to stay at 400px or less for proper retinafying 2013-02-15 17:27:05 -08:00
Mark Otto
3d041096ba Update gallery examples on homepage; make all gallery entries open in new tabs 2013-02-15 17:21:41 -08:00
Mark Otto
866c8d60e9 restore jekyll-based css.html to docs 2013-02-15 12:22:26 -08:00
Can Burak Cilingir
a77cd6cb5d Fix typo on JavaScript documentation 2013-02-15 18:47:34 +08:00
Mark Otto
e44f8cc560 Fixes #6941: add alt attribute to images 2013-02-14 23:55:04 -08:00
Mark Otto
bcb6dd5ee6 fix spelling as pointed out by @jodytate that got nuked in the merge 2013-02-14 23:51:35 -08:00
Mark Otto
ae525258af Merge branch 'bs3_jekyll' into 3.0.0-wip 
Conflicts:
	docs/css.html
	docs/templates/pages/css.mustache
 2013-02-14 23:42:47 -08:00
Mark Otto
aa5f090371 Make example pages use Jekyll; add sticky footer navbar image to examples 2013-02-14 23:38:00 -08:00
Mark Otto
41ef649aa3 no need for scrollspy in example template 2013-02-14 23:07:36 -08:00
Mark Otto
979ca4ea7a Convert JS page to pygments; nuke prettify assets 2013-02-14 22:33:26 -08:00
Mark Otto
37becbab8c convert components code examples to pygments 2013-02-14 21:42:33 -08:00
Mark Otto
0ff7fb0d05 pygmentize the rest of the css page 2013-02-14 16:43:50 -08:00
Mark Otto
6b14de292a pygmentize grid section; update bs-docs-example corners 2013-02-14 00:43:43 -08:00
Mark Otto
7e6211e244 twerk dat manni pygment style 2013-02-14 00:39:32 -08:00
Mark Otto
5f0ecb740a Start pygmentizing css.html; add new theme for pygments 2013-02-14 00:23:23 -08:00
Mark Otto
d709dba284 Start using some includes; test out some pygments highlighting 2013-02-13 23:37:08 -08:00
Mark Otto
d3c458c7d8 make same css docs fix from upstream 2013-02-13 12:32:29 -08:00
Mark Otto
96953c2072 update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg 2013-02-13 12:30:56 -08:00
Mark Otto
b57c20a057 Restore gallery page, add active nav class jankitude, auto regenerate docs on file save 2013-02-13 11:48:22 -08:00
Mark Otto
b1e7010bfc Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-02-13 11:28:00 -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
1f5f23f869 nuke dat extend docs page 2013-02-11 21:38:44 -08:00
Gerald Monaco
876a412c90 Fix the Star glyphicon in the CSS docs 2013-02-08 19:52:50 -05:00
Mark Otto
63c1377ee7 Fixes #6852: add cursor pointer to carousel indicators 2013-02-08 09:56:04 -08:00
Mark Otto
1b2b049ef8 Fixes #6841: Add new Firefox placeholder, comments 2013-02-08 08:32:29 -08:00
Mark Otto
3eed90c187 Fixes #6837: Enable text alignment utility classes on tables 
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
 2013-02-08 08:24:10 -08:00
Mark Otto
ab1dc25ffc clean up responsive docs and global css styles 2013-02-08 00:13:44 -08:00
Mark Otto
2aa1a4dc70 Merge branch 'master' into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-07 22:18:53 -08:00
fat
501aabf572 remove prevent default on focus 2013-02-07 21:42:34 -08:00
fat
366e1e0a6d only fire hidden once backdrop has been removed 2013-02-07 20:13:40 -08:00
fat
1bf070b4ce Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-07 19:47:01 -08:00
fat
d8a7a380bc if no callback, don't try to call callback ya goof 2013-02-07 19:45:42 -08:00
Mark Otto
a9729c5fd0 fix js from @fat feedback for modal 2013-02-07 19:38:46 -08:00
Mark Otto
9b1520ee60 update example code 2013-02-07 19:34:06 -08:00
Mark Otto
cfa1e39510 nuke that whitespace 2013-02-07 19:32:30 -08:00
Mark Otto
b04acb37e8 finish modal tweaks 2013-02-07 19:31:12 -08:00
Mark Otto
a623b8c10f update docs modals 2013-02-07 19:21:56 -08:00
Mark Otto
cdb2147b13 add new modal to docs example 2013-02-07 19:00:48 -08:00
Mark Otto
e3f3542d0b Fixes #6823: add some docs notes about tooltips in input groups 2013-02-06 17:25:58 -08:00
Mark Otto
8ca70bd83a Overhaul modal to make it responsive and not super lame 2013-02-06 02:07:40 -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
421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less
 2013-02-05 22:42:54 -08:00
fat
3b56227553 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-02-05 22:30:54 -08:00
fat
4814281540 clean up styles 2013-02-05 22:29:59 -08:00
Mark Otto
6d21d86007 port docs fix from 2.3.0-wip to new css page 2013-02-05 22:29:01 -08:00
Mark Otto
accfdaafdb Fixes #6808: mention IE lame-itude in docs for invalid inputs 2013-02-05 22:28:18 -08:00
Mark Otto
0fe9148b91 Fixes #6190: Add print utility classes 2013-02-05 22:17:28 -08:00
Mark Otto
1629df8008 screwed up a merge and an old version number crept in 2013-02-05 21:20:29 -08:00
fat
a4b31d39a2 don't hide if already hidden ya n00b 2013-02-05 21:08:56 -08:00
Mark Otto
4270496e8a add codecademy to gallery 2013-02-05 21:07:30 -08:00
Mark Otto
a920697382 Dat compression 2013-02-05 21:05:24 -08:00
Mark Otto
fb1db88256 Update homepage examples, add hella new sites to gallery 2013-02-05 21:04:46 -08:00
Mark Otto
37a6879ca5 White navbar brand text for inverted navbar 2013-02-05 20:39:09 -08:00
fat
a866a51a2e clear interval in cycle + rebuild 2013-02-05 20:34:39 -08:00
fat
c25e8182ba Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2013-02-05 20:01:25 -08:00
fat
45656fc7fc update jquery to 1.9 2013-02-05 20:00:50 -08:00
Mark Otto
28e1702052 nuke rogue conflict comment and remake 2013-02-05 19:59:02 -08:00
Mark Otto
43da258bd9 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less
 2013-02-05 19:53:44 -08:00
Mark Otto
c97d304c0c derp, fix broke css and recompile 2013-02-05 19:43:49 -08:00
Mark Otto
15c7e73abd Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less
 2013-02-05 19:39:49 -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
5c1cc722e7 Forgot to remove base-css.mustache 2013-02-05 00:22:20 -08:00
Mark Otto
2c92b5f6a4 Remove base-css.html after recent merges 2013-02-04 11:12:32 -08:00
Mark Otto
0a3e3a50fe Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	less/type.less
 2013-02-04 11:12:09 -08:00
Mark Otto
1f6a988190 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:25 -08:00
Mark Otto
db8a78fae6 Fixes #6794: incorrect docs mention of th element 2013-02-04 11:11:04 -08:00
Mark Otto
2f7087eae9 Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip 2013-02-02 19:08:59 -08:00
Mark Otto
5638b2559a Verion number in JS makefile 2013-02-02 18:50:13 -08:00
Mark Otto
3d74c670d3 Rearrange forms content 2013-02-02 18:30:52 -08:00
Mark Otto
6993fadf7e Simplify input and input group sizing 
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
 2013-02-02 17:31:26 -08:00
Mark Otto
04aae2f56c Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip 2013-02-02 17:01:29 -08:00
Mark Otto
c64aa26d06 Add @btn-color variable and use in buttons and carets; fixes dropup caret as well 2013-02-02 13:03:18 -08:00
Mark Otto
dbe8aed76e Merge pull request #6763 from rjregenold/2.3.0-wip 
fixes jankiness with anchor tags in carousel.
 2013-02-02 12:35:39 -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
dad9889aeb Fixes #6657: Upgrade Normalize to 2.1.0 2013-02-01 21:49:54 -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
Nikhil Dabas
b7b2e4f8a1 Fixing inline lists for IE7 2013-02-02 02:04:30 +05:30
Mark Otto
2553d74b54 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html
 2013-02-01 10:34:25 -08:00
Mark Otto
7d655c3549 Use button element instead of a for responsive navbar buttons 2013-02-01 10:33:36 -08:00
Mark Otto
725cf7f6ec start to refactor justified nav example 2013-02-01 10:32:08 -08:00
Mark Otto
7528b6e10a button element instead of href-less a tag for navbar button 2013-02-01 10:30:48 -08:00
Gil Barbara
24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02:00
Mark Otto
755f1776da Refactor jumbotron-narrow.html example 
* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout
 2013-01-31 18:34:12 -08:00
Mark Otto
19b5ebcf24 Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes 2013-01-31 18:25:44 -08:00
Mark Otto
dfdf343825 Refactor jumbotron example: 
* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views
 2013-01-31 18:22:47 -08:00
Mark Otto
52aa67fa1c only round jumbotron corners at 768px+ 2013-01-31 18:11:45 -08:00
Mark Otto
b02a0fe768 Button up navbar form which was adding 2px padding to .navbar 2013-01-31 18:09:49 -08:00
Mark Otto
061d2849a6 Update starter template to include left/right padding on inner container; also include body padding 2013-01-31 18:06:56 -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
RJ Regenold
2f44d8d2da removes anchor tag definition. 2013-01-31 12:49:53 -06:00
RJ Regenold
6014e63054 lets see how much i can mess this pull request up. :| 2013-01-31 11:10:41 -06:00
RJ Regenold
e38d08d4c0 fixes jankiness with anchor tags in carousel. 2013-01-31 10:03:53 -06:00
Mark Otto
baadc33c88 make on prev commit 2013-01-30 18:22:20 -08:00
Mark Otto
3cc65cb86c clear up show-grid stuff 2013-01-30 18:16:14 -08:00
Mark Otto
dd4ce35ddc add meta tag to second example 2013-01-30 17:46:18 -08:00
Mark Otto
a5fc3e0667 make on prev commit 2013-01-30 17:45:02 -08:00
Mark Otto
3b6b8e9f41 Merge branch 'greg-raven-patch-2' into 2.3.0-wip 2013-01-30 17:44:45 -08:00
Mark Otto
f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
Fred Sauer
d6e3b6b5a4 Fix form-actions documentation 2013-01-28 10:01:59 -08:00
Greg Raven
22f1cc44ca Update docs/templates/pages/getting-started.mustache 
Add meta tag for viewport in the <head>; revise the URL for the latest version of jQuery.
 2013-01-22 06:46:53 -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
c77a459b35 IE8 compatible fix for disabled button hover 2013-01-19 19:32:55 -04:00
Mark Otto
64bc5dc91f remove .navbar-inner from sticky footer navbar 2013-01-19 09:40:26 -08:00
Mark Otto
1a88367b72 mo betta links between sticky footer examples 2013-01-19 09:39:56 -08:00
Mark Otto
d7d5069be1 Add sticky footer navbar example to list; fix docs padding 2013-01-19 09:38:49 -08:00
Mark Otto
7c9295d44b update sticky footer templates 2013-01-19 09:34:08 -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
Vickash Mahabir
b741c731a2 Fix logic error where a disabled button would change color in an enabled fieldset 2013-01-18 12:12:30 -04:00
Vickash Mahabir
6e96cd1a7c Forgot to add built docs css file 2013-01-18 11:58:12 -04:00
Mark Otto
411e6b18cb unified and simplified sign in form example 2013-01-18 01:52:16 -08:00
Mark Otto
82bfa965a7 cleanup more examples 2013-01-18 01:37:31 -08:00
Mark Otto
d4cb7077fe mo betta justified nav 2013-01-18 01:33:55 -08:00
Mark Otto
604f76dcf8 overhaul justified nav example 2013-01-17 21:05:23 -08:00
Mark Otto
8111e307b9 Remove docs and prettify css from examples thus far; update narrow page 2013-01-17 20:39:38 -08:00
Mark Otto
caed3a9dbb fix up jumbotron example 2013-01-17 20:35:59 -08:00
Mark Otto
6466fe00a1 Rename hero.html to jumbotron.html 2013-01-17 20:32:07 -08:00
Mark Otto
5075f4973b Semibold dat .navbar .brand 2013-01-17 20:30:40 -08:00
Mark Otto
ac3c907799 finish updating starter template 2013-01-17 20:30:19 -08: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
f068cdeb63 Combine .thumbnail and .img-thumbnail into simpler selectors 2013-01-17 20:18:03 -08:00
Mark Otto
ca74b9882b Change .img-polaroid to .img-thumbnail 
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
 2013-01-17 20:16:04 -08:00
Mark Otto
89b6477bdc Remove .info from table rows 2013-01-17 20:13:11 -08:00
Mark Otto
5663833bfc Restore .btn-info 2013-01-17 19:51:22 -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
41ecc2a171 derp, numbers 2013-01-17 16:35:30 -08:00
Mark Otto
2523b91dad dat min 2013-01-17 16:11:01 -08:00
Mark Otto
8765df47cd remove global text-shadow from alerts components because it was fucking up buttons in a real way 2013-01-17 15:43:23 -08:00
Mark Otto
e304798194 scrollspy example twerks 2013-01-17 15:42:52 -08:00
Mark Otto
3a1e1167d6 restore scrollspy example 2013-01-17 15:40:43 -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
32bcbe5671 cleanup example templates 2013-01-17 15:00:49 -08:00
Mark Otto
f6226c9b91 Update Getting Started page to include mention of Respond 2013-01-17 14:49:52 -08:00
Mark Otto
237f5e15d3 Nuke shadows around thumbnails 2013-01-17 14:25:40 -08:00
Mark Otto
bb94de7873 Larger homepage headings 2013-01-17 14:22:41 -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
26f9f4e3a5 Remove navbar search 2013-01-17 12:02:17 -08:00
Mark Otto
32ebe2efd1 mo betta navbar dropdowns 2013-01-17 11:55:37 -08:00
Mark Otto
597a248d4a Rearrange navbar.less and improve vertical divider support 2013-01-17 11:34:46 -08:00
Mark Otto
360f0c5359 Fix floats in navbar 2013-01-17 11:20:19 -08:00
Mark Otto
01b32f472d Simplify and bring back the grid mixin for generating spans and offsets 2013-01-17 10:49:10 -08:00
Mark Otto
7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto
267d3e7ed7 streamline css docs 2013-01-17 00:50:19 -08:00
Mark Otto
2398245e17 Remove all old responsive styles since we're motherfucking mobile first son 2013-01-17 00:43:58 -08:00
Mark Otto
687d4a3eeb Move grid/container styles to grid.less; update docs; add offsetting back 2013-01-17 00:42:31 -08:00
Mark Otto
255cb87734 update getting started to reflect latest changes; pull list of components because fuck that 2013-01-17 00:27:46 -08:00
Mark Otto
a8a60e94e3 padding twerk 2013-01-17 00:24:18 -08:00
Mark Otto
33864b4a3d dat docs messaging (on the homepage) 2013-01-17 00:23:25 -08:00
Mark Otto
9374965b83 docs css cleanup 2013-01-17 00:20:00 -08:00
Mark Otto
630005687d Remove ported navbar css that was already commented out 2013-01-17 00:13:12 -08:00
Mark Otto
4129be6ebd Update sidenav and responsive css 2013-01-17 00:13:04 -08:00
Mark Otto
f535201781 improve navbar vars and fix side nav alignment 2013-01-16 23:33:26 -08:00
Mark Otto
6b193dc22d More navbar tweaks, including making fixed navbars work in the docs by adding padding to body 2013-01-16 16:20:29 -08:00
Mark Otto
9ba14cfb7c More navbar derping 2013-01-16 16:14:41 -08:00
Mark Otto
960804cea3 mo betta new navbar styles; hook up some changed vars 2013-01-16 15:35:41 -08:00
Mark Otto
ee9403e2d2 flatten the progress bars 2013-01-16 15:19:55 -08:00
Mark Otto
baa8c3ec9e restore alerts, and make them suck much less 2013-01-16 15:16:04 -08:00
Mark Otto
0b81dd217f tuck some margins 2013-01-16 15:11:17 -08:00
Mark Otto
1288304e91 Make jumbotron mo responsive 2013-01-16 15:07:57 -08:00
Mark Otto
cf693b5632 Add in responsive for 1200px+ layout; increase padding for that viewport size 2013-01-16 14:48:25 -08:00
Mark Otto
13a80f33c8 fix up sidenav and components page 2013-01-16 14:10:33 -08:00
Mark Otto
3e40e7dfbf mo betta sidenav for responsive hotness 2013-01-16 13:20:32 -08:00
Mark Otto
beb2c13f4d Prevent grids from collapsing, fix affixed side nav for docs 2013-01-16 13:11:45 -08:00
Mark Otto
a7a06a05a4 Remove commented out files; leave responsive stuff commented out for now 2013-01-16 13:08:27 -08:00
Mark Otto
910ca85a70 restore remaining components 2013-01-16 13:07:41 -08:00
Mark Otto
bc7fd582ed restore pagination and pager 2013-01-16 13:07:08 -08:00
Mark Otto
2127690e73 restore breadcrumbs 2013-01-16 13:06:15 -08:00
Mark Otto
2407217686 restore wells and close 2013-01-16 13:05:20 -08:00
Mark Otto
ab38493e91 Restore button groups 2013-01-16 13:04:29 -08:00
Mark Otto
c18b5b9735 restore glyphicons docs styles and then overhaul the shit out of them 2013-01-16 13:02:15 -08:00
Mark Otto
a4cc704220 Restore dropdowns.less 2013-01-16 12:44:31 -08:00