root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
3,915 Commits 111 Branches 92 Tags 666 MiB
Commit Graph

2698 Commits

Author SHA1 Message Date
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