rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
4,398 Commits 108 Branches 89 Tags 549 MiB
c3b9ac4676
Commit Graph

1888 Commits

Author SHA1 Message Date
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
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
ca31f060a8 New grid classes 2013-03-26 17:12:17 -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
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
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
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
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
d219b8b964 Set border-box globally instead 2013-03-10 13:24:07 -05: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
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
e2e5580c0e nuke glyphicons changes in buttons for now because it's whack 2013-02-26 00:44:15 -08:00
Mark Otto
e1bb94c383 try out new table-based type example 2013-02-24 01:29:19 -08: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
53091be6d2 remove unnecessary select border reset 2013-02-17 20:26:21 -08:00
Mark Otto
82d059de87 fix broken marketing section with updated class 2013-02-17 20:18:29 -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
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
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
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
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
aa5f090371 Make example pages use Jekyll; add sticky footer navbar image to examples 2013-02-14 23:38:00 -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
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
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
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
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
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
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
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
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
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
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
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
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
Gil Barbara
24f0505bde Update input-group-addon for input sizes 2013-02-01 01:39:26 -02: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
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
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
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
d7d5069be1 Add sticky footer navbar example to list; fix docs padding 2013-01-19 09:38:49 -08: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
caed3a9dbb fix up jumbotron example 2013-01-17 20:35:59 -08:00
Mark Otto
5075f4973b Semibold dat .navbar .brand 2013-01-17 20:30:40 -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
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