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
Mark Otto
eb3cd5d7d2
Restore responsive docs
2013-01-16 12:44:25 -08:00
Mark Otto
c76f1cd97e
restore glyphicons
2013-01-16 12:30:44 -08:00
Mark Otto
992e0d922a
Re-add and update form styles:
...
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
2013-01-16 12:23:05 -08:00
Mark Otto
b6b8633542
twerk docs code examples
2013-01-16 12:02:45 -08:00
Mark Otto
cb99c4b63a
restore table styles
2013-01-16 11:48:20 -08:00
Mark Otto
6ac6be2a5e
more subhead/jumbotron tweaks for docs
2013-01-16 11:45:16 -08:00
Mark Otto
0df7411362
Derp on type styles a bit more; bring back and fix up more more docs styles
2013-01-16 11:38:34 -08:00
Mark Otto
81a22e189a
add back docs footer
2013-01-16 11:03:54 -08:00
Mark Otto
cb0691d92f
mo betta type margins for headings
2013-01-16 10:57:00 -08:00
Mark Otto
8fd26040d8
Port over temp responsive styles to bootstrap.less; readd buttons
2013-01-16 10:52:33 -08:00
Mark Otto
5a3cb0d778
remove extra border-radius props
2013-01-16 10:49:19 -08:00
Mark Otto
b80bf2c138
Merge pull request #6600 from Yohn/patch-12
...
added missing class to doc example
2013-01-16 10:28:02 -08:00
Yohn
598e9e6f13
Update docs/templates/pages/components.mustache
2013-01-16 07:46:42 -05:00
Yohn
60bb95e611
adding class to example code
2013-01-16 07:45:31 -05:00
Quy Ton
1da1994ba4
Add text alignment classes info to docs
2013-01-15 18:16:44 -08:00
Mark Otto
85db846b65
mobile-first navs, navbar, grids, and type
2013-01-15 17:55:14 -08:00
Mark Otto
094767fbfe
code changes
2013-01-15 14:34:04 -08:00
Mark Otto
267690eb1b
docs changes, more type improvements, add grid system basics back
2013-01-15 14:30:00 -08:00
Mark Otto
a67c86e40f
Fixes #6586 : remove top 5px margin from navbar input group button groups
2013-01-15 10:27:30 -08:00
Mark Otto
09696143e0
type and stuff
2013-01-15 10:14:12 -08:00
Patrick H. Lauke
c55329085e
Revert "Leave tabindex=-1 alone"
...
This reverts commit 370fa45fbe
2013-01-15 07:22:02 +00:00
Patrick H. Lauke
370fa45fbe
Leave tabindex=-1 alone
...
It seems that, as misguided as I personally think it is, ARIA does
indeed want dropdown menus not to behave as regular keyboard users
expect them, killing TAB/SHIFT+TAB in favor of cursor keys. Fair
enough, the issue I have is then with ARIA, not with bootstrap. I would
sugges thought that if you really do want to follow ARIA consistently,
*any* navigation bar should also become an ARIA menu, further making it
impossible for keyboard users to use TAB/SHIFT+TAB to navigate through
it, and that these changes should be reflected in the bootstrap
examples as well...
2013-01-15 07:16:33 +00:00
Patrick H. Lauke
4503ad7808
Revert "Keyboard accessibility in documentation"
...
This reverts commit a809daf284
2013-01-15 07:13:19 +00:00
Mark Otto
25c9b6b59a
nuke and flatten and stuff
2013-01-14 22:05:55 -08:00
Mark Otto
337741fc9a
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-01-14 00:33:16 -08: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
Yohn
a23eb06536
fix typo
2013-01-13 15:32:51 -05:00
Yohn
ecc24953a5
fix typo
2013-01-13 15:32:03 -05:00
Yohn
98aeb0acf1
added container options to docs for popover
2013-01-13 15:23:22 -05:00
Yohn
fdd1daeae1
added container options to docs for popover
2013-01-13 15:21:31 -05:00
Mark Otto
d247f71217
Reset docs jumbotron button to blue defaults
2013-01-13 04:27:51 -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
76ed6b0b2c
Remove comment out code and simplify what's left for button group toggles
2013-01-13 04:05:34 -08:00
Mark Otto
1916eb7c7f
Fix btn link hover and tweak dropdown border/shadows
2013-01-13 04:04:16 -08:00
Mark Otto
0b31cfc90e
Fix up .brand in navbar of docs
2013-01-12 20:10:42 -08:00
Mark Otto
01db5db2f6
white text on buttons on hover for links
2013-01-12 20:08:13 -08:00
Mark Otto
4b34f4947a
Update Holder.js 1.6 to 1.9
2013-01-12 19:49:15 -08:00
Mark Otto
ea1a12593d
Nuke shadow on pagination
2013-01-12 19:46:47 -08:00
Mark Otto
8670021935
fixed navbars fixings
2013-01-12 19:44:51 -08:00
Mark Otto
1ea647ce98
Remove shadows from active links in navbar
2013-01-12 19:02:58 -08:00
Mark Otto
7bcd02c167
Tweak button
2013-01-12 19:02:48 -08:00
Mark Otto
583fc4b962
buttons and button group flattening improvements
2013-01-12 18:52:06 -08:00
Mark Otto
a9a66e9c34
finetune buttons flattened colors
2013-01-12 17:51:57 -08:00
Mark Otto
ff02043bbc
Flatten navbar
2013-01-12 14:31:18 -08:00
Mark Otto
a33d45f308
Merge branch '3.0.0-wip' into bs3-flatten
2013-01-12 14:16:49 -08:00
Mark Otto
24f7df15e6
Remove mention of Extend page from readme and index page
2013-01-12 13:57:41 -08:00
Mark Otto
b1f0a7e62b
Remove Extend page from the docs entirely
...
* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page
2013-01-12 13:46:07 -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
6f275c6148
Update extend page to point to readme for compiling.
...
Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.
2013-01-12 12:41:01 -08:00
Patrick H. Lauke
a809daf284
Keyboard accessibility in documentation
...
Removed unnecessary (?) and harmful (from a keyboard access point of
view) tabindex=-1 in the documentation examples.
2013-01-12 17:04:51 +00:00
Patrick H. Lauke
77c68e4bc2
Cleaned up dirty CSS
...
Used recess rather than less
2013-01-12 11:02:13 +00: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
8a16746542
Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
...
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto
3773b99969
Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
...
update 3.0.0 docs to reflect #5786
2013-01-12 00:29:23 -08:00
Mark Otto
aaf80d410a
fix username navbar text in fluid example for responsive variations
2013-01-12 00:20:13 -08:00
Mark Otto
19e2ad0eb6
Fixes #6538 : Add th support to all the .table-rounded selectors
2013-01-11 23:38:53 -08:00
Mark Otto
6f894c62a5
Fixes #6528 : Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active
2013-01-11 23:35:22 -08:00
Mark Otto
42efd9f730
Address #6545 : clarify initialization of tooltips in docs
2013-01-11 20:58:24 -08:00
Mark Otto
4de3a77a64
Fixes #6547 : Make blockquotes use multiple of @baseFontSize
2013-01-11 20:55:09 -08:00
Mark Otto
88e816956a
Fixes #6552 : example fix for button group
2013-01-11 20:52:39 -08:00
Mark Otto
b242ff7851
Fixes #6553 : example fix for validation states
2013-01-11 20:51:11 -08:00
Mark Otto
767a293b4d
Increase input group margin on bottom and vertically center to match inputs
2013-01-11 20:46:21 -08:00
Mark Otto
56a24027c3
Fixes #6473 : Make .input-prepend and .input-append inline-block to match other form states
2013-01-11 20:42:44 -08:00
Mark Otto
d3b3b4c48f
Fixes #6474 : remove duplicate .btn border colors to make @btn-border work
2013-01-11 20:40:17 -08:00
Mark Otto
d7c93fc647
Fixes #6478 : scope table backgrounds to immediate td/th elements
2013-01-11 20:38:14 -08:00
Mark Otto
53f9e25150
Comment fix
2013-01-11 20:30:56 -08:00
Mark Otto
7626cc629f
Remove overflow: auto; from .tab-content
2013-01-11 20:26:48 -08:00
Mark Otto
b9b5cd786d
Fixes #6555 : remove .controls-row from responsive
2013-01-11 20:23:37 -08:00
Mark Otto
649d8c985e
Remove navbar links from sticky footer navbar example
2013-01-11 11:00:45 -08:00
Mark Otto
839f83c610
Merge branch 'wilfra-patch-2' into 2.3.0-wip
2013-01-11 10:58:17 -08:00
Mark Otto
6e5a2fedaa
Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago
2013-01-10 18:51:04 -08:00
William Franceschine
cf852c1f62
Update docs/examples/marketing-narrow.html
...
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine
9fdc9887cf
Update docs/examples/marketing-alternate.html
...
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine
edfc0bf8b3
Update docs/examples/hero.html
...
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine
1eb6a1d8c8
Update docs/examples/carousel.html
...
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine
5eff3cdd5d
Update docs/examples/fluid.html
...
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto
976b4ea263
Merge branch 'Justin-John-master' into 2.3.0-wip
2013-01-09 21:35:50 -08:00
Mark Otto
ccf4c2fbe3
add sticky footer with navbar
2013-01-09 19:53:42 -08:00
Mark Otto
91dd77939b
Add text alignment utility classes
2013-01-09 18:56:08 -08:00
Justin John Mathews
2c2a847e75
Corrected carousel arrows to active.#6494, #6489
...
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Chris Rebert
206205a6b2
update docs to reflect #5786
2013-01-05 17:36:20 -08:00
Chris Rebert
684c9d8d05
update docs to reflect #5786
2013-01-05 17:14:22 -08:00
Patrick H. Lauke
848ca6e315
Basic keyboard accessibility CSS tweaks
...
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto
3d04d9ba75
Super lame typo on my part, sorry @necolas :)
2012-12-28 19:24:13 -06:00
Mark Otto
5a2dc0b897
Improve documentation for new form validation styles
2012-12-28 14:47:55 -06:00
Mark Otto
1c0e4fc7bb
Popovers are now flexible width:
...
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
2012-12-28 14:18:59 -06:00
Mark Otto
f69d12af3d
Merge pull request #6407 from aurnik/master
...
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Aurnik Islam
aa997e274e
Fix link to File structure anchor
2012-12-27 01:49:09 -08:00
Mark Otto
dc5c6d6be8
Simplify form validation states while enabling them to be applied to one field at a time.
2012-12-26 15:57:52 -06:00
Mark Otto
d0baa99aed
Remove .text-info and .info form validation states
2012-12-26 14:59:58 -06:00
Mark Otto
2ef4fde09f
Drop .input-block-level modifier as inputs are already width: 100%;
2012-12-26 14:19:48 -06:00
Mark Otto
12b738bf30
Add grid column example to form input sizing
2012-12-26 14:13:44 -06:00
Mark Otto
070109abc1
Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required
2012-12-26 14:09:36 -06:00
Mark Otto
c17673dc61
Restore .form-horizontal
2012-12-26 13:59:09 -06:00
Mark Otto
9921d21969
Run make on previous commits
2012-12-26 13:59:01 -06:00
Mark Otto
b19fd8e4fa
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2012-12-26 10:15:23 -06:00
Mark Otto
330b143b40
Add longer tooltip example to docs, tighten up line-height on tooltip; run make
2012-12-26 09:36:07 -06:00
Mark Otto
9749d6afc2
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-26 09:21:34 -06:00
fat-kun
b9c7f29134
Merge pull request #6378 from Yohn/patch-7
...
fixes tooltip insert problems
2012-12-24 16:17:25 -08:00
Yohn
340d90138c
Update docs/templates/pages/javascript.mustache
2012-12-24 19:03:13 -05:00
Yohn
2a5fde272c
Update docs/javascript.html
2012-12-24 19:01:56 -05: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
Yohn
dfbac13ad1
data-toggle instead of rel for tooltip and popover
2012-12-23 07:04:24 -05:00
Yohn
5da8b315c0
data-toggle instead of rel for tooltip and popover
2012-12-23 07:00:03 -05:00
Yohn
da0217405f
data-toggle instead of rel for tooltip and popover
2012-12-23 06:51:46 -05:00
Yohn
f152dead92
Update docs/javascript.html
2012-12-23 04:25:27 -05:00
Yohn
68ff08cc91
Update docs/templates/pages/javascript.mustache
2012-12-23 04:23:18 -05:00
Jake Spurlock
0834bd51ec
Update docs/templates/pages/javascript.mustache
...
Adding spaces around the pipes. Makes it consistent with the rest of the docs.
2012-12-22 21:03:58 -08:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
fat
2c0ed072b0
shifting focus to parent and adding aria menuitem for dropdown
2012-12-22 13:57:57 -08:00
fat
4d195222d4
remake js
2012-12-22 13:48:28 -08:00
fat
fad0fb683b
allow multiple trigger types in tooltip and popover + default tooltip to hover & focus
2012-12-22 13:24:37 -08:00
fat
e2434fefbd
chnage for #6248
2012-12-21 20:27:53 -08:00
fat-kun
356e47efe1
Merge pull request #6247 from jimwebb/scrollspy-documentation-clarify
...
change scrollspy documentation to clarify javascript usage
2012-12-21 20:23:44 -08:00
fat
f59bf47081
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-21 20:20:04 -08:00
fat
ddd59f22c7
update mustace to reflect changes to data-slide-to
2012-12-21 20:19:33 -08:00
fat
24a36df9f6
add support for [data-slide-to] attr on carousel
2012-12-21 19:45:19 -08:00
Mark Otto
7f7039321d
Fixes #6189 : Add holder.js to carousel example
2012-12-21 19:10:05 -08:00
Mark Otto
a55605ca57
add readme image
2012-12-21 19:04:59 -08:00
Mark Otto
558bc52432
Add docs readme icon
2012-12-21 18:54:36 -08:00
fat
818c56f078
rewrite makefile to make a bit more "efficient" + rebuild
2012-12-21 17:42:24 -08:00
fat
e194c3e4f4
rebuild
2012-12-21 17:25:31 -08:00
Mark Otto
dc32555f5b
Fixes #6370 : Add comment to docs on typeahead and autocomplete
2012-12-21 15:46:10 -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
7b7581d44a
Finish migrating to Normalize 2:
...
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
2012-12-20 20:52:20 -08:00
Mark Otto
c1e82732cf
Update new example name and links
2012-12-20 20:27:07 -08:00
Mark Otto
a24e47b5b8
Update the examples index:
...
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto
43d130762b
Fixes #6352 : marketing-alternate broken nav in FF17
2012-12-20 14:40:39 -08:00
Mark Otto
1c33b857a6
Convert normalize comments to // style
2012-12-20 14:08:09 -08:00
Mark Otto
be74ad7e0d
Merge branch '3.0.0-wip' into bs3-normalize
...
Conflicts:
less/bootstrap.less
2012-12-20 14:02:54 -08:00
Mark Otto
8eb1549842
remove .hide specificity override from grid classes
2012-12-20 13:57:14 -08:00
Mark Otto
6bd5dc7d9f
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
2012-12-20 13:53:38 -08:00
Mark Otto
a5e04c0799
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
2012-12-20 13:47:36 -08:00
Mark Otto
5e4f663e69
Undo important on hide/show utilties; punt to 3.0
2012-12-20 13:46:07 -08:00
Mark Otto
00ff34b9e6
fix up code snippet
2012-12-20 13:41:45 -08:00
Mark Otto
b6575cc72e
fix up code snippet
2012-12-20 13:41:08 -08:00
Mark Otto
30d8eb3ed5
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
2012-12-20 01:34:19 -08:00
Mark Otto
0a1434b23b
Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors
2012-12-20 01:34:10 -08:00
Mark Otto
f706acb11c
Fixes #6339 : Use important flag on .hide and .show utility classes
2012-12-20 01:30:32 -08:00
Mark Otto
cdb25e11ef
lighter buttons closer to todays versions
2012-12-20 01:21:09 -08:00
Mark Otto
c00f29e4d4
Fixes #6236 : Fix popover font-size in input groups
2012-12-20 00:54:58 -08:00
Mark Otto
4e54e7bb35
Remove dropdown submenu docs
2012-12-20 00:27:46 -08:00
Mark Otto
cc6974b74e
Remove dropdown submenu CSS
2012-12-20 00:27:05 -08:00
Mark Otto
acde2dc1ee
Nuke third lines form carousel examples
2012-12-20 00:20:00 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' 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/base-css.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/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
Mark Otto
9726fded1c
Get on that carousel indicator lifestyle with some new hawtness
2012-12-19 23:52:38 -08:00
Mark Otto
5d776bcfd2
Merge branch '2.2.3' of github.com:twitter/bootstrap into 2.2.3
2012-12-19 23:39:40 -08:00
fat
bbe4625672
lol we dont' have affix(refresh)
2012-12-19 23:39:26 -08:00
Mark Otto
14844db862
Holy shit, buttons, button states, and input states updated
2012-12-19 23:37:33 -08:00
fat
7f9ff0ba5b
add js support for carousel indicators
2012-12-19 23:25:25 -08:00
Mark Otto
09dde5c84a
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto
a27952efd0
Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code
2012-12-19 23:12:38 -08:00
Mark Otto
9b4e5746a4
More button tweaks
2012-12-19 22:54:04 -08:00
fat
e9eff0cbff
wait 100ms before engaging affix (allows for initial browser scroll)
2012-12-19 22:37:41 -08:00
Mark Otto
afef81c0d7
remove commented out buttons css, update docs
2012-12-19 22:30:08 -08:00
fat
96e5fa6143
whitespace in tooltip + don't pass empty selector to $() in dropdown.js
2012-12-19 22:26:36 -08:00
Mark Otto
c38b7206eb
overhaul buttons
2012-12-19 22:25:56 -08:00
Mark Otto
a932476f80
Unfuck the fucked homepage
2012-12-19 22:07:11 -08:00
fat
7c456c8554
fix tooltip doc dumbness
2012-12-19 22:05:33 -08:00
fat
219d275ae6
can't extend bounding box thingy
2012-12-19 22:03:57 -08:00
Mark Otto
7449e2e5a1
Remove @black and just use #000
2012-12-19 22:02:57 -08:00
fat
dc4e80a655
fix ghetto ass timeout shit
2012-12-19 21:55:23 -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
fat
5bd8cdca91
remove inside support from tooltip + fix tooltip svg support + change makefile to rely on local npm install
2012-12-19 21:36:50 -08:00
Mark Otto
2011a0d50f
Drop labels from the docs
2012-12-19 21:29:57 -08:00
Mark Otto
c6cc1b1a1d
Drop .label component. Instead, just use .badge because fuck dupe code and stuff.
2012-12-19 21:18:32 -08:00
Mark Otto
85971ff3e8
Drop .form-search support
2012-12-19 21:12:37 -08:00
Mark Otto
51b1a027da
Merge branch 'bs3-input-groups' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto
26b999b76a
no need for margin-top on .typeahead, it's set on .dropdown-menu
2012-12-19 19:46:44 -08:00
Mark Otto
19a94d08d6
Remove support for multiple buttons in input groups because fuck that shit.
2012-12-19 19:33:14 -08:00
Mark Otto
dc6142751f
Fixes #6337 : scope '.media .pull-left' and '.media .pull-right' to immediate children only
2012-12-19 18:47:34 -08:00
Mark Otto
28c928f010
Use normalize as separate file instead of with other resets; still need to punt other styles
2012-12-19 18:43:55 -08:00
Mark Otto
840e47eabd
Update clearfix mixin and class per @necolas's feedback
2012-12-19 17:49:20 -08:00
Jim Webb
ecfa09decb
* modify scrollspy documentation to clarify javascript usage
...
* add scrollspy 'target' option
2012-12-12 11:48:44 -05:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
cddca18f12
Fixes #6174 : Caret alignment in small and mini buttons
2012-12-10 10:59:57 -08:00
Mark Otto
9d985978a3
Escape HTML of section element
2012-12-10 10:55:42 -08:00
Mark Otto
847b632577
IE10 fix in responsive utilities, not regular utilities
2012-12-10 10:29:16 -08:00
Mark Otto
83a6a55d2c
Move IE10 responsive fix to responsive utilities so Customizer gets it
2012-12-10 10:25:18 -08:00
Mark Otto
ab5d7f863c
move reset after vars and mixins
2012-12-10 09:57:23 -08:00
Chris Rebert
8c8a14ab59
document caveat regarding fieldset legend and #6199
2012-12-10 01:46:16 -08:00
Chris Rebert
48759eee94
document fieldset[disabled] styling added in #6199 ; per @mdo
2012-12-10 01:33:02 -08:00
Chris Rebert
3b5d4f52a3
fixes #5605 : style as disabled all form controls & btns under a disabled fieldset
...
this is a resubmission of #5875 , but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -08:00
Blake Embrey
c105906780
Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197
2012-12-10 16:42:58 +10:00
Mark Otto
4245e8ebb5
Fix checkbox and radios example
2012-12-09 22:13:40 -08:00
Mark Otto
6e9bbe6232
Nested columns docs tweaks
2012-12-09 22:08:11 -08:00
Mark Otto
4c82dd3645
Refactor input groups
...
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Nathan Bridgewater
18adc44171
lowered carousel beneath the nav
2012-12-09 22:10:38 -06:00
Mark Otto
6649918c7f
Merge conflicts
2012-12-08 22:45:39 -08:00
Mark Otto
070c125cec
Restore print styles
2012-12-08 21:05:05 -08:00
Mark Otto
68d1d7fc83
Test removal of print styles for customized builds
2012-12-08 21:02:37 -08:00
Mark Otto
b5ceca14db
Fix docs typos
2012-12-08 18:46:34 -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
Mark Otto
9376a7c221
Fixes #5729 : Nested striped tables
...
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -08:00
Mark Otto
cacc213762
Nesting tables
...
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
2012-12-08 12:52:19 -08:00
Quy Ton
3bd9a26c01
Apply code tag to data attribute on javascript page
2012-12-08 12:06:46 -08:00
fat
820a3b27b6
get tests passing for typeahead :P
2012-12-07 19:16:48 -05:00
fat
1747caf19d
insert menu of typeahead after input which it suggests on #3529
...
note: this will likely break things for people in the same way that doing
this to tooltip did… however we think this is a better insertion model for
z-index,scrolling,modal,etc. applications
2012-12-07 18:59:13 -05:00
fat
437654030a
focus on escape in typeahead
2012-12-07 18:37:32 -05:00
fat
91fbadad5b
remove slide from carousel constructor #5579
2012-12-07 17:49:05 -05:00
fat
66b70016d0
rebuild and only select visible dropdown items
2012-12-07 17:14:49 -05:00
fat
a7eb9c294a
add noConflict functionality to all bootstrap plugins
2012-12-07 17:06:01 -05:00
Mark Otto
1c5b8e967e
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 09:51:57 -08:00
Mark Otto
be45a821bb
Fixes #6148 : Icons in mini buttons properly aligned
2012-12-07 09:51:01 -08:00
Mark Otto
1413f976ae
Merge pull request #6151 from tierra/pre-code-white-space-fix
...
Fix code block white-space breaks within pre tags.
2012-12-07 09:48:14 -08:00
Mark Otto
cc6fda2262
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 09:43:32 -08:00
Mark Otto
2c7ab23d7a
Fixes #6136 : Proper scoping of breadcrumbs divider
2012-12-07 09:43:09 -08:00
Bryan Petty
f4466dd9c7
Fix code block white-space breaks within pre tags.
2012-12-06 11:33:00 -07:00
Quy Ton
81679981c5
Escape ×
2012-12-05 15:28:14 -08:00
Mark Otto
be5f31480b
Nuke all i18n tags from .mustache templates
2012-12-05 11:09:02 -08:00
Mark Otto
306c1b4914
Remove commented out old popover CSS
2012-12-05 11:06:16 -08:00
Mark Otto
33e14fe5bf
Merge branch '2.2.2-wip' into 3.0.0-wip
...
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
b3019d7aab
add gallery page, fill with a few screenshots to start
2012-12-04 20:30:21 -08:00
Mark Otto
ed74992853
Fixes #4550 : Temporary fix for dropdown taps on mobile
...
* Fix as documented here: https://github.com/twitter/bootstrap/issues/4756#issuecomment-9952781
* Stops propagation for touchstart for dropdowns
2012-12-04 18:36:18 -08:00
Mark Otto
12916b06aa
Fix up display of dropdown submenu examples on responsive views
2012-12-04 18:25:16 -08:00
Mark Otto
e31c7fb8a5
correct link on index page to grid system
2012-12-04 09:49:18 -08:00
Mark Otto
0f2a423b8d
Once more, update all the favicons to retina
2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015
Align the touch icons attributes
2012-12-03 13:22:10 -08:00
Mark Otto
869b69c66c
Fixes #6115 : scope breadcrumb styles to immediate children only
2012-12-03 13:09:38 -08:00
Mark Otto
06582edb2a
Improve rendering of carousel example for IE10
2012-12-03 13:01:27 -08:00
Andreas Cederström
68cbba347b
Fixing header color for success, error and info alerts
2012-12-03 14:20:14 +01:00
Mark Otto
f514c87d6b
Enable responsive features in IE10 when snapped
2012-12-02 20:57:34 -08:00
Mark Otto
30d6a71ccd
Revert vertical gradient spec to 'to bottom' as 'top' doesn't work in IE10
2012-12-02 20:40:24 -08:00
Mark Otto
139f1be49d
reset text align in popovers given inline insertion
2012-12-02 02:30:00 -08:00
Mark Otto
ea61cdb740
remove overrides on inner html of popover-content
2012-12-02 01:34:58 -08:00
Mark Otto
32d425967a
run make on js changes to popover
2012-12-02 01:32:23 -08:00
Mark Otto
e8b3c36068
run make on modal popover fix
2012-12-02 00:09:45 -08:00
Mark Otto
9c028ea54b
follow button width
2012-12-01 18:51:03 -08:00
Mark Otto
19ee7999f4
remove single corner border-radius mixins
2012-12-01 14:25:28 -08:00
Mark Otto
dd11d0a3fa
move around social buttons
2012-12-01 13:47:07 -08:00
Mark Otto
98b0d475ae
version bump to 3.0
2012-11-30 22:30:50 -08:00
Mark Otto
0947105656
section title change
2012-11-30 17:43:20 -08:00
Mark Otto
51b4de8eec
docs content changed
2012-11-30 16:43:31 -08:00
Mark Otto
6961b284b6
remove responsive image from css docs page
2012-11-30 16:42:48 -08:00
Mark Otto
ebd2215e49
remove deleted css files, run make
2012-11-30 16:31:24 -08:00
Mark Otto
10c14e8955
first pass at nuking scaffolding
2012-11-30 16:29:30 -08:00
Mark Otto
0fabca01db
Remove more fluid grid stuff
...
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto
adc2c779a0
grid vars updated
2012-11-30 15:43:07 -08:00
Mark Otto
b8b266ca7c
popovers and tooltips vars
2012-11-30 15:40:44 -08:00
Mark Otto
e34b3730b7
form state vars
2012-11-30 15:38:31 -08:00
Mark Otto
0a93bc143d
hero unit and pagination vars
2012-11-30 15:36:16 -08:00
Mark Otto
62a2220035
navbar vars
2012-11-30 15:33:56 -08:00
Mark Otto
a09cea44ae
more vars changed
2012-11-30 15:27:13 -08:00
Mark Otto
01421ecd62
remove sprites vars, change zindex vars
2012-11-30 15:23:13 -08:00
Mark Otto
12a00f62a9
remove color variables, swap others were appropro
2012-11-30 15:18:49 -08:00
Mark Otto
0ef347706c
more vars changing
2012-11-30 15:09:57 -08:00
Mark Otto
9239bfbc7b
more vars changed, remove @white var
2012-11-30 15:05:23 -08:00
Mark Otto
b0e2b5813d
more consistent variable naming patterns
2012-11-30 14:45:25 -08:00
Mark Otto
7a3d15eb21
Part 1 of unCamelCasing variables
2012-11-30 14:37:24 -08:00
Mark Otto
fe8061b84e
more tests for form styles; includes lightening help text
2012-11-30 13:35:20 -08:00
Mark Otto
f9a47e3a5f
Refine containers and navbars
...
* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars
2012-11-30 12:42:37 -08:00
Mark Otto
7313702cf3
Inputs now 100% width by default
...
* Includes text inputs, selects, and textareas
* Updated docs to include .span* sizes wherever possible
* Commented out responsive 1200px inputs grid
* Still some derp to be done to improve more, but this is a decent first stab
2012-11-30 00:53:07 -08:00
Mark Otto
4fd164d45b
consolidate font resets into scaffolding
2012-11-30 00:24:17 -08:00
Mark Otto
fca35c0dba
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto
bca3ff4ed6
Fixes #5853 : Maintain 10px margin above help block when following input groups
2012-11-29 23:39:33 -08:00
Mark Otto
f087b3428c
remove element from selector
2012-11-29 23:33:09 -08:00
Mark Otto
fe7b6decb1
Merge pull request #6039 from desheikh/2.2.2-wip
...
help-block margin-top should also apply after a span.uneditable-input
2012-11-29 23:32:38 -08:00
Mark Otto
322a56354f
run make with nav img fix
2012-11-29 23:27:20 -08:00
Mark Otto
38c546c785
upgrade to holder 1.6
2012-11-29 21:35:45 -08:00
Mark Otto
acc037de15
add holder and replace placehold.it
2012-11-29 20:59:14 -08:00
Zulfiqar Ali
ddd154481b
added compiled css file
2012-11-29 17:40:23 +08:00
Mark Otto
78390d12af
Fix the carousel after we scoped selectors
2012-11-28 15:40:51 -08:00
Mark Otto
f1349a2450
Fixes #5533 : Remove filter gradient from disabled links on dropdowns
2012-11-28 02:22:37 -08:00
Mark Otto
8fb36cb3dd
Fixes #5594 : Vertical button groups show use max-width, not width, and be scoped to immediate children buttons only
2012-11-28 02:21:34 -08:00
Mark Otto
296b838405
Fixes #5616 : scope carousel state classes to immediate children only
2012-11-28 02:17:50 -08:00
Mark Otto
bf3a5df371
Fixes #5930 : redeclare font-size for popoves in btn-groups
2012-11-28 02:10:23 -08:00
Mark Otto
783120dffa
Fixes #5927 : Scope button group 5px button left margin to immediate children
2012-11-28 01:51:04 -08:00
Mark Otto
014d3cedf5
Fixes #5940 : Prevent @headingsColor from changing alert colors
2012-11-28 01:48:34 -08:00
Mark Otto
bfc97fdaf6
Fixes #4852 : IE8 popover carets fixed
...
* IE8 refused a negative z-index to place the previous :after behind the .arrow, so I had to flip the styles.
* .arrow is the gray border/background, .arrow:after is now the white inner arrow
* Added a hex IE8 fallback to ensure the arrow shows for <IE9 as rgba() isn't supported
* Simplified some of the CSS for the popover carets
2012-11-28 01:38:21 -08:00
Mark Otto
fda5bb135e
Fixes #5963 : Add large button example to icons, fix vertical alignment in large buttons
2012-11-28 00:46:09 -08:00
Mark Otto
74f51105e9
Fixes #6010 : Navbar dropdown caret should match link hover color
2012-11-28 00:42:17 -08:00
Mark Otto
942f9c5df4
Fixes #6012 : Updated docs sidenav media queries and reset width for exactly 980px
2012-11-28 00:37:55 -08:00
Mark Otto
02097700e8
Fixes #6035 : use font-size vars in button groups
2012-11-28 00:31:52 -08:00
Mark Otto
dc10e6bbf8
Fixes #5935 : Updated vertical gradient mixin
2012-11-28 00:19:35 -08:00
Mark Otto
7e56e2265d
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
less/button-groups.less
2012-11-22 22:04:21 -08:00
Mark Otto
e0d0190803
fix image sizes on homepage
2012-11-22 12:26:54 -08:00
Mark Otto
5d1b4206b1
Fixes #5986 : single toggle button html examples
2012-11-22 12:06:36 -08:00
Mark Otto
8df2811d49
Simpler footer for docs
...
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto
a367fd4938
Fixes #5925 : Adjust top margin of input group in navbar
2012-11-16 01:19:15 -08:00
Mark Otto
88c2497368
Fixes #5912 : User correct selector for form field states.
...
Previously, we were using a generic label selector, but as this was changed in the main forms awhile back, we need to change it here.
2012-11-16 01:16:27 -08:00
Mark Otto
5702e1be6e
widths on github buttons
2012-11-16 01:13:52 -08:00
Mark Otto
fa1c130552
Change important badges/labels to danger
2012-11-15 09:17:11 -08:00
Mark Otto
a43bf14ea5
Merge branch '2.2.2-wip' into exploratory
2012-11-15 09:15:37 -08:00
Mark Otto
05655ff4ff
fixes #5922 : clicking only button should download custom build
2012-11-15 09:14:54 -08:00
Mark Otto
1700e48e7f
Fixes #5879 : Manual update of Normalize credit
2012-11-14 15:20:38 -08:00
Mark Otto
0df0b5f1f5
run make after latest merges
2012-11-14 15:19:16 -08:00
Drew Goodwin
c8856eeff3
fixes #5873 : @navbarInverseBrandColor not used
2012-11-10 17:58:00 -08:00
Mark Otto
1a4ce9ba18
Merge branch '2.2.2-wip' into exploratory
2012-11-09 10:09:04 -08:00
Mark Otto
54486de88c
run make again
2012-11-09 09:21:14 -08:00
Mark Otto
ddf5ceccce
typo fix
2012-11-08 23:49:04 -08:00
Mark Otto
cf7d7a7b5d
remove ; from customizer
2012-11-08 23:46:40 -08:00
Mark Otto
57eed7867b
merge in latest
2012-11-05 19:00:34 -08:00
Mark Otto
9d1eefa4fb
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-11-05 18:44:22 -08:00
Mark Otto
23a7ab4b51
icon vertical align in buttons
2012-11-05 18:44:10 -08:00
Mark Otto
33beb93e1b
new docs css for new icons
2012-11-05 18:40:00 -08:00
Mark Otto
b82bc97023
update docs and all classes
2012-11-05 18:38:59 -08:00
Mark Otto
cea2a701f0
adding new fonts and css for glyphicons update
2012-11-05 18:36:16 -08:00
Mark Otto
c0bbe1692c
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
less/variables.less
2012-11-05 18:27:25 -08:00
Alexandre Magno
0a1d296e19
insert missing i18n tag at customize and download string
2012-11-05 18:38:59 -02:00
Mark Otto
79b7017227
version bump
2012-11-05 09:32:48 -08:00
Mark Otto
d38bda1480
Fixes #5471 : Remove color from .navbar and .navbar-inverse and reassign to .navbar-text to prevent unintended cascading
2012-11-04 22:50:07 -08:00
Mark Otto
ee93541421
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/buttons.less
less/forms.less
2012-11-04 19:59:07 -08:00
Mark Otto
62c78e46f8
more required input tweaks
2012-11-04 19:53:13 -08:00
Mark Otto
91bcccd9a8
simplify invalid input css
2012-11-04 19:43:09 -08:00
Mark Otto
ebed09ec01
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-11-04 19:42:13 -08:00
Mark Otto
f3b3814606
Merge pull request #5786 from cvrebert/2.2.2-wip
...
fixes #5494 : style invalid fields as invalid regardless of required-ness
2012-11-04 19:41:59 -08:00
Mark Otto
823b5accd3
start documenting html5 invalid form fields
2012-11-04 19:41:41 -08:00
Mark Otto
7e6cc0bf7e
Fixes #5785 : allow for segmented button groups in input groups
2012-11-04 19:08:02 -08:00
Chris Rebert
76f9c9128e
fixes #5494 : style invalid fields as invalid regardless of required-ness
2012-11-04 18:26:25 -08:00
Mark Otto
51f293ba4c
Fixes #5662 : white-space: nowrap; on code element
2012-11-04 13:30:36 -08:00
Mark Otto
075e320a83
remove unnecessary bg declarations in buttons per #5684
2012-11-04 13:26:03 -08:00
Mark Otto
21957a3d9e
set background size for docs jumbotron for retina
2012-11-04 13:24:06 -08:00
Mark Otto
953dc3a6f2
higher res docs illustrations
2012-11-04 13:23:08 -08:00
Mark Otto
fb51efcbd4
Fixes #5113 : increase .typeahead z-index for proper use with modals
2012-11-04 13:01:31 -08:00
Mark Otto
2320a09898
fix modals display in docs on tablet view
2012-11-04 12:58:57 -08:00
Mark Otto
1af0021014
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
2012-11-04 12:42:00 -08:00
Mark Otto
22d1506d23
remove margin on .inline lists
2012-11-04 12:39:27 -08:00
Mark Otto
508cc1fef4
change up list classes to use .list- prefix
2012-11-04 12:38:35 -08:00
Mark Otto
269be76f4a
Merge branch '2.2.2-wip' into exploratory
2012-11-04 12:37:44 -08:00
Mark Otto
28da31218f
Refine new inline list option
2012-11-04 12:36:37 -08:00
Mark Otto
68f26d959f
Merge branch '2.1.2-list-inline' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-list-inline
2012-11-04 12:27:30 -08:00
Mark Otto
e4866c4b3c
clarify unstyled lists docs
2012-11-04 12:27:18 -08:00
Mark Otto
83a3789b5e
add justified nav links for tabs and pills
2012-11-04 00:52:10 -07:00
Mark Otto
05a2d37559
run make after removing responsive css file
2012-11-04 00:37:49 -07:00
Mark Otto
25fded1ff4
responsive images, updated shadows on navbars, remove responsive file from docs
2012-11-04 00:31:43 -07:00
Mark Otto
3de6f3ff88
Swap old icons for new in docs
2012-11-03 16:18:02 -07:00
Mark Otto
a56de2b84f
Merge branch 'glyphicons_font' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/sprites.less
2012-11-03 16:15:54 -07:00
Mark Otto
c0eacca0db
Navs refactor, restoring .nav-list
2012-11-03 16:14:44 -07:00
Mark Otto
a12eb2b9f5
rgba() tooltip bg
2012-11-03 13:44:55 -07:00
Mark Otto
a249d1c8ee
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
2012-11-03 13:44:01 -07:00
Mark Otto
5d6cf2ee19
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-11-03 13:43:23 -07:00
Mark Otto
2c93190283
Fixes #5776 : Reside white-space for popovers
2012-11-03 13:42:08 -07:00
Mark Otto
a8b9342aea
Fixes #5739 : Port in HTML5 BP print styles
2012-11-03 13:37:34 -07:00
Mark Otto
c9dbd2d601
Fixes #5458 : Clarify fluid nesting
2012-11-03 13:28:48 -07:00
Mark Otto
72e2d4bb77
Merge pull request #5766 from bradly/spelling-fixes-in-docs
...
Fixing various spelling typos in the docs.
2012-11-03 13:20:06 -07:00
Mark Otto
7ea343d570
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-11-03 13:19:53 -07:00
Mark Otto
ead5dbeba5
Fixes #5775 : Collapse labels/badges
...
* When :empty, display: none;
* Add documentation for change in behavior
2012-11-03 13:18:23 -07:00
Bradly Feeley
381d967ec8
Change example email addresses to use RFC 2606 reserved example domain.
2012-11-03 12:15:01 -06:00
Bradly Feeley
46b5e0cbc6
Fixing various spelling typos in the docs.
2012-11-02 16:34:21 -06:00
Mark Otto
fc42ac6a56
fixes #5756 : duplicate media CSS in compiled builds
2012-11-02 09:47:42 -07:00
Mark Otto
1477e081d4
Merge branch '2.2.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
docs/getting-started.html
docs/templates/pages/getting-started.mustache
less/accordion.less
less/alerts.less
less/breadcrumbs.less
less/buttons.less
less/code.less
less/dropdowns.less
less/forms.less
less/navbar.less
less/progress-bars.less
less/responsive-navbar.less
less/tables.less
less/thumbnails.less
less/tooltip.less
less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
4b3fb30877
tweaks to icons defaults and in buttons improve vertical align
2012-11-02 01:39:40 -07:00
Mark Otto
72198a59c0
removing glyphicons images, swapping in new icon font with new classes
2012-11-02 01:20:06 -07:00
Mark Otto
d0c75bbc83
fixes #5742 : add cursor: pointer; to labels and selects
2012-11-01 09:44:51 -07:00
Mark Otto
d350f577e9
fixes #3222 : simpler positioning of modals
2012-10-31 21:43:32 -07:00
Mark Otto
14b941744c
fixes #5700 : restore white text on active dropdown/typeahead text
2012-10-31 10:51:27 -07:00
Mark Otto
bf48c31406
Merge branch 'bradly-affix-docs-fix' into 2.2.2-wip
2012-10-31 10:48:44 -07:00
Mark Otto
64326322b4
fixes #5725 : hover state for a.muted; also reformatted CSS
2012-10-31 10:46:04 -07:00
Mark Otto
d5697fcf6b
fixes #5717 : add retina favicon, recompile docs
2012-10-31 10:41:41 -07:00
fat
3b3dd3ac3c
2.2.1 - hotfix for carousel
2012-10-30 21:59:56 -07:00
fat
404e4d9e9a
fix carousel and rebuild js
2012-10-30 21:32:15 -07:00
Bradly Feeley
cbf1dace2f
Fixing typos in affix options area in the docs.
2012-10-30 11:46:18 -07:00
Mark Otto
bf10a43ed9
derp, add that in the right spot
2012-10-29 21:34:10 -07:00
Mark Otto
5bb6c42405
fixes #4511 : remove focus on opened modal window
2012-10-29 21:33:20 -07:00
Mark Otto
9352fe1750
add a ton of the new vars to the customizer
2012-10-29 21:30:39 -07:00
Mark Otto
81c3c1c68c
add media.less to customizer page
2012-10-29 21:02:05 -07:00
Mark Otto
41ad16fe40
v2.2.0 instead of v2.1.2
2012-10-29 21:00:53 -07:00
Andreas Cederström
233e050adf
Adding .inline for ul and ol
2012-10-26 09:47:55 +02:00
Mark Otto
c33169a6ba
fixes #5572 : document .input-block-level
2012-10-18 11:19:16 -07:00
Jacob Thornton
ba2a99e7c4
don't lookup typeahead when shift alt or ctrl are pushed
2012-10-17 23:39:41 -07:00
Jacob Thornton
45046544a6
when static, refocus on click
2012-10-17 23:36:22 -07:00
Jacob Thornton
0b9d4e78ad
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 23:06:58 -07:00
Jacob Thornton
7f3b94c453
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
...
Conflicts:
js/bootstrap-carousel.js
2012-10-17 23:05:16 -07:00
billy gates
d6ac499ca8
Merge pull request #5309 from erlendfh/dropdown-bugfix
...
Fixed bug in dropdown toggle where menu would only clear on the first dropdown
2012-10-17 23:00:41 -07:00
Jacob Thornton
280d4aeb30
rebuild
2012-10-17 22:51:39 -07:00
Jacob Thornton
edc3eee5ea
fix carousel event
2012-10-17 22:26:44 -07:00
Jacob Thornton
8e6697f2b2
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 21:38:01 -07:00
Jacob Thornton
ac6625de5f
add updater function and rebuild
2012-10-17 21:37:34 -07:00
billy gates
3074737d90
Merge pull request #5549 from mfansler/2.1.2-wip
...
fixes #5336 : reorder focus() call to avoid scrolling
2012-10-17 21:21:31 -07:00
Mark Otto
e0a007b929
Merge pull request #5507 from bradly/2.1.2-wip
...
Fixing typo in docs.
2012-10-16 20:36:26 -07:00
Mark Otto
709870aa3e
fixes #5496 : use correct var for dropdown active link text
2012-10-16 20:34:42 -07:00
Mark Otto
57eb2a8018
more hellip on modals
2012-10-16 20:28:07 -07:00
Mark Otto
0ac50d28b5
fixes #5519 : hellip in modal code
2012-10-16 20:18:50 -07:00
Mark Otto
78f7ad95f4
fixes #5542 : move '.hero-unit p' font-styles to '.hero-unit' so they apply to all elements, including ul and ol, within the component.
2012-10-16 19:56:34 -07:00
Mark Otto
bf78333531
add in latest carousel example, reorg examples on getting started
2012-10-16 12:50:10 -05:00
Mark Otto
463eae25b0
clarify js docs individual or compiled section
2012-10-16 12:37:36 -05:00
mfansler
e24b46b7f3
fixes #5336 : reorder focus() call to avoid scrolling
2012-10-16 12:27:43 -04:00
Mark Otto
0048446db9
improve spacing in carousel example
2012-10-15 13:57:09 -05:00
Bradly Feeley
ed5c5994a7
Fixing typo in docs.
2012-10-13 18:31:41 -07:00
Mark Otto
fa778792c5
compress images and add new carousel example for .net magazine article
2012-10-10 17:58:22 -07:00
Mark Otto
31007c01d8
fixes #5478 : remove double background color on dropdown links
2012-10-10 10:29:22 -07:00
Mark Otto
4702e75410
comments in template
2012-10-08 18:59:44 -07:00
Mark Otto
ec8394cb6e
adding another template for same-width nav links using 'display: table-cell;'
2012-10-08 18:58:35 -07:00
Mark Otto
7e534ce98a
fixes #5443 : reset background gradient on disabled dropdown links
2012-10-07 21:45:16 -07:00
Mark Otto
e4f522990e
fixes #5416 : use correct variable for inverse navbar responsive links
2012-10-07 21:43:37 -07:00
Mark Otto
6203535d2f
Changing title of docs pages to simply say 'Bootstrap' like the docs home page
2012-10-07 21:38:28 -07:00
Mark Otto
7d649c9d4a
fixes #5430 : scope link styles in .dropdown-menu to .dropdown-menu li > a
2012-10-05 11:13:21 -07:00
Mark Otto
3726ce24bb
finish off scoping of grid sizing to table elements
2012-10-03 09:43:14 -07:00
Mark Otto
11ee1633b4
fixes #5257 : add data-original-title attribute selector to abbr element
2012-10-03 09:36:45 -07:00
Mark Otto
dd8b745b88
use border-radius vars where possible
2012-10-03 09:26:52 -07:00
Mark Otto
e73cd15fc8
copy and style changes to improve docs rendering on mobile devices
2012-10-02 17:01:18 -07:00
Mark Otto
7732d8b9b0
Merge branch '2.1.2-wip' into exploratory
2012-10-02 15:41:31 -07:00
Mark Otto
a2369021ce
fixes #5352 : update docs messaging for disable nav links
2012-10-02 15:10:22 -07:00
Mark Otto
1bd4723038
fixes #5392 : hover on submenu should maintain white icons for active parent a tag
2012-10-02 13:19:11 -07:00
Mark Otto
3bb9e0d753
increase border radius on navbar
2012-10-01 23:42:21 -07:00
Mark Otto
4ab7b77aa3
Merge branch '2.1.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/labels-badges.less
less/navbar.less
less/tables.less
2012-10-01 23:41:00 -07:00
Mark Otto
7c9597f4e7
remove double border effect: instead of inset shadow and border on fixed navbars, only border
2012-10-01 23:34:03 -07:00
Mark Otto
1b814458c9
improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu
2012-10-01 16:41:13 -07:00
Mark Otto
5cf7c803e2
Merge branch '2.1.2-wip-modal-responsivefix' of https://github.com/andriijas/bootstrap into andriijas-2.1.2-wip-modal-responsivefix
2012-10-01 15:29:21 -07:00
Mark Otto
86d5ed6f4f
fixes #5377 : change selectors for navbar collapse to be unique so only one open/closes at a time
2012-10-01 13:52:50 -07:00
Mark Otto
fd1e9b1498
fix copy on modal popover button doodad
2012-10-01 13:28:54 -07:00
Mark Otto
f8ac403d8b
fixes #5123 : scope table grid classes to td and th elements only, plus drop columns 13-24
2012-10-01 13:08:21 -07:00
Mark Otto
bc4f5d565e
fixes #5275 : inline-block badges and labels, then fix padding accordingly
2012-10-01 12:04:10 -07:00
Mark Otto
5035592988
fixes #5193 manually: checkbox and radio padding in .controls-row
2012-10-01 11:53:52 -07:00
Mark Otto
e6d6c7a413
Merge branch '2.1.2-wip' into exploratory
...
Conflicts:
docs/assets/css/bootstrap.css
less/navs.less
2012-10-01 11:27:40 -07:00
Mark Otto
c6c1ada600
clarify tables support of responsive utility classes, of which there is none
2012-10-01 11:18:49 -07:00
Mark Otto
a90334eebb
fix docs sidenav width for ie8-9
2012-10-01 11:11:33 -07:00
Mark Otto
239ce24f92
fixes #5188 : add .google-maps class to reset responsive images on case-by-case basis
2012-10-01 10:49:19 -07:00
Mark Otto
085d6d185d
fixes #5055 : wrap legend and form elements in fieldset so IE8 styles the legend properly
2012-10-01 10:42:45 -07:00
Mark Otto
32181816f7
run make on previous merge
2012-10-01 10:27:42 -07:00
Mark Otto
8da78223ff
reset input and button heights with updated padding
2012-10-01 00:19:29 -07:00
Mark Otto
56935c64c0
remove left margin reset from old grid system
2012-10-01 00:11:05 -07:00
Mark Otto
eb555b7a9d
remove .nav-list, instead use .nav-stacked on .nav-tabs or .nav-pills from now on
2012-10-01 00:06:44 -07:00
Mark Otto
26386ad615
remove tabbable tabs on left, right, and bottom; instead, from here out use stacked pills or tabs
2012-10-01 00:05:18 -07:00
Mark Otto
ecf6077f48
remove table grid sizing, it can use the new default grid columns instead
2012-09-30 23:59:35 -07:00
Mark Otto
3f4076c635
consolidate border-radius on code
2012-09-30 23:49:26 -07:00
Mark Otto
bfe51163e2
run make on prev commit
2012-09-30 23:47:00 -07:00
Mark Otto
4b0d71abc1
carousel refinements
2012-09-30 23:44:23 -07:00
Mark Otto
b6f6235e9b
change notes about responsive in Scaffolding page: no longer separate file
2012-09-30 23:26:51 -07:00
Mark Otto
de6ec034db
single CSS file for all css, including responsive
2012-09-30 23:24:07 -07:00
Mark Otto
3f2938948d
remove more ie7 css hacks
2012-09-30 23:20:43 -07:00
Mark Otto
08446563b9
clean up comments in reset, remove ie7 css hacks
2012-09-30 23:19:55 -07:00
Mark Otto
443b605246
remove -moz-box-shadow from .box-shadow() mixin, but keep -webkit since that's needed for most iOS and Android mobile browsers
2012-09-30 23:17:07 -07:00
Mark Otto
9872902e47
remove .border-radius mixin and replace with standard border-radius property, since -webkit-* and -moz-* are only needed for older versions
2012-09-30 23:11:54 -07:00
Mark Otto
2b06edc7d7
remove firefox <3.6 css hacks for buttons
2012-09-30 22:49:14 -07:00
Mark Otto
bbd543db53
Merge branch '2.1.2-wip' into exploratory
...
Conflicts:
docs/getting-started.html
docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto
da43c7c27c
run make after merge
2012-09-30 22:41:26 -07:00
Mark Otto
a4a6244eb7
add sticky footer example per martin bean's suggestion, using the implementation by ryan fait
2012-09-30 22:09:51 -07:00
Mark Otto
a2690c6d86
add link to examples on index page; add back narrow marketing page and signin page examples
2012-09-30 21:28:20 -07:00
Mark Otto
57f8dbe25c
fixes #5360 : typo in tables docs
2012-09-30 21:26:43 -07:00
Mark Otto
f8374a754d
clean up emphasis docs text
2012-09-28 15:01:12 -07:00
Mark Otto
8ecffcb32f
fixes #5334 : html snippet comments
2012-09-28 10:39:15 -07:00
Andreas Cederström
ecbb0ed4df
Making modal work with max width 767px - fixes #4860
2012-09-27 11:46:54 +02:00
Erlend Halvorsen
e9a648cd39
Fixed bug in dropdown toggle where menu would only clear on the first drop down
2012-09-27 10:31:40 +02:00
Mark Otto
ad96435d27
Merge branch '2.1.2-wip' into box-sizing-exercise
2012-09-26 16:02:33 -07:00
Mark Otto
24e277b85a
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-09-26 16:01:59 -07:00
Mark Otto
498a28b4cd
dat new kippt hotness
2012-09-26 16:01:45 -07:00
Mark Otto
cd5ae9e030
change up carousel
2012-09-26 11:20:27 -07:00
Mark Otto
6b578ec8de
move mixins that generate css to utilities.less with different class names, but the same mixins
2012-09-26 08:59:57 -07:00
Mark Otto
b6ba717b75
fix getting started examples
2012-09-25 23:01:18 -07:00
Mark Otto
80c4d5a9bf
fix homepage example sites
2012-09-25 22:59:49 -07:00
Mark Otto
ecbf1159a4
remove .dividers from breadcrumbs, instead use :after and content
2012-09-25 22:57:20 -07:00
Mark Otto
d1affe6154
restore gradient to navbars
2012-09-25 22:53:41 -07:00
Mark Otto
f8efc75a66
increase padding on navbar links, remove font-size override on .navbar from docs css
2012-09-25 22:51:05 -07:00
Mark Otto
c59e5251e1
initial pass at removing navbar-inner from .navbar component
2012-09-25 22:48:02 -07:00
Mark Otto
f12946be5a
thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup
2012-09-25 22:40:48 -07:00
Mark Otto
08eea302ef
remove remaining fluid grid css
2012-09-25 22:20:24 -07:00
Mark Otto
151ed38cdc
remove references to row fluid elsewhere
2012-09-25 22:18:34 -07:00
Mark Otto
9e97098802
make .input-* classes match .btn-* size classes
2012-09-25 22:16:47 -07:00
Mark Otto
0220015edd
remove all ie7 conditionals and mixins
2012-09-25 22:07:53 -07:00
Mark Otto
ce19e63d5b
Merge branch '2.1.2-wip' into box-sizing-exercise
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
2012-09-25 22:00:41 -07:00
Mark Otto
527d01ce99
headway, cleanup, and tests
2012-09-25 15:01:03 -07:00
Jacob Thornton
0540b63ab0
check affix pos on clicks - use timeout for clicks which scroll
2012-09-24 23:59:02 -07:00
Jacob Thornton
aec8b08930
update docs for tooltip html + the dropdown methods api
2012-09-24 23:32:55 -07:00
Jacob Thornton
88b1e44dd6
change tooltip/popover insert strategy
...
remove modal-open class
hopefully resolve z-index headaches
2012-09-24 23:28:38 -07:00
Jacob Thornton
4a2443901f
reverting d797a5fbd7
2012-09-24 23:19:33 -07:00
Jacob Thornton
bda3d57a00
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-09-24 23:16:09 -07:00
Jacob Thornton
003fcccceb
change tooltip/popover html default to false for xss safety net
2012-09-24 23:15:36 -07:00
Mark Otto
f4d3d7da2e
ensure 100% width for .uneditable-inputs in <767px viewports
2012-09-23 16:06:28 -07:00
Mark Otto
af871d57c9
fixes #5216 : calculate heading sizes via math rather than fixed pixel amounts
2012-09-22 22:16:12 -07:00
Jacob Thornton
ebf94c53a5
change transition.js, rebuild… travis maybe will be happy?
2012-09-20 16:50:36 -07:00
Jacob Thornton
fe38d12f12
rebuild - fix missing (
2012-09-20 16:26:00 -07:00
Jacob Thornton
667179f406
added support for jquery 1.8.*
2012-09-20 16:23:54 -07:00
Mark Otto
c92a75999f
fixes #5127 : add @inputHeight to replace static instances of '30px' throughout forms
2012-09-20 11:45:59 -07:00
Mark Otto
532ee08213
fixes #5150 : add btn-group support to input groups
2012-09-20 11:37:34 -07:00
Mark Otto
443c43f6c4
fixes #5102 , #5166 , #5194 , #5205 : add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8
2012-09-20 10:28:27 -07:00
Mark Otto
6c3cd6fd9d
fixes #5212 : text emphasis classes only get hover with links
2012-09-20 09:06:43 -07:00
Mark Otto
a6206c98d5
increase padding on homepage button
2012-09-19 15:18:14 -07:00
Mark Otto
2d90c816ac
add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations
2012-09-18 21:16:08 -07:00
Mark Otto
2769241aeb
add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other
2012-09-18 20:56:20 -07:00
Mark Otto
37460e58d3
Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip
2012-09-18 14:58:39 -07:00
Mark Otto
cc3de8bd6e
fixes #5177 : remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons
2012-09-18 12:00:57 -07:00
Mark Otto
78992bbf42
fixes #5178 : update normalize to avoid resetting audio and video elements in android
2012-09-18 11:23:16 -07:00
Mark Otto
3b3def4898
fixes #5087 : add hover states to text emphasis classes for links
2012-09-17 23:19:52 -07:00
Mark Otto
239e6a7d21
fixes #5082 manually: reset font-size for .dropdown-menu within .input-prepend/-append
2012-09-17 23:11:49 -07:00
Mark Otto
cedb3c7c56
fixes #5173 : proper popover offsets; added docs examples to enable tests in the future
2012-09-17 23:03:32 -07:00
Mark Otto
783f4885ab
add the media css to customizer
2012-09-17 18:17:22 -07:00
Mark Otto
26ca131a95
Merge branch 'wpbrains-media-component' into 2.1.2-wip
2012-09-17 18:15:44 -07:00
Mark Otto
143fef9f95
overhaul the docs and css to merge into 2.1.2 since this was against master
2012-09-17 18:15:39 -07:00
Mark Otto
917b46a343
resolve conflicts and remake
2012-09-17 16:43:18 -07:00
Mark Otto
caa79ed594
fixes #5001 : proper ids on form examples
2012-09-17 16:26:51 -07:00
Mark Otto
6881c193ca
fixes #5039 : properly set .row-fluid margins for .controls-row
2012-09-17 16:09:36 -07:00
Mark Otto
03a406d920
fixes #5041 : add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top
2012-09-17 15:49:22 -07:00
Mark Otto
6f3bef195a
nuke new examples for now
2012-09-17 08:53:13 -07:00
Mark Otto
6e25aacc91
more carouself example work
2012-09-16 21:54:06 -07:00
Mark Otto
6c4b276cd4
way cooler carousel example, along with updated screenshots for examples
2012-09-14 15:55:46 -07:00
Mark Otto
7857089065
tweak copy on each template, add sign in template
2012-09-14 15:21:44 -07:00
Mark Otto
0bcbcf69ec
adding new examples
2012-09-14 15:17:46 -07:00
Mark Otto
e4e2e37c5c
add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it
2012-09-14 14:48:03 -07:00
Mark Otto
5aa1018496
i18n homepage
2012-09-14 14:31:14 -07:00
Mark Otto
faa760f563
revert docs change
2012-09-14 10:30:55 -07:00
Martin Bean
2ead9a5bc3
Standardized spelling of 'JavaScript'; added icons to file trees
2012-09-14 14:06:15 +01:00
Mark Otto
595e1a189c
fixes #5119 : javascript in navbar typo
2012-09-13 10:07:57 -07:00
Mark Otto
15bb78ce80
fixes #5107 : make all .btn-group inline-block by default instead of just within a .btn-toolbar
2012-09-12 16:37:41 -07:00
Mark Otto
e1deba30aa
fixes #5097 : js docs typos
2012-09-12 16:22:52 -07:00
Mark Otto
537c5cc33d
use local var for a few other .box-shadow mixins to fix CSS not compiling
2012-09-12 16:18:52 -07:00
Mark Otto
38303dd997
revert the js evaluation in .box-shadow mixin, fix last mixin usages to escape if using >1 shadows
2012-09-12 15:53:29 -07:00
Brian Campbell
2c8eff0eec
Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs.
2012-09-12 14:10:03 -06:00
Mark Otto
0489c708c7
fixes #5040 manually: remove overflow: auto; from .modal to resolve sporadic modal right padding issues with scrollbars
2012-09-10 22:51:16 -07:00
Mark Otto
39791a8ea8
fixes #5059 manually: include media type in css getting started block
2012-09-10 22:44:08 -07:00
Mark Otto
7110b243f5
more tests and experiments
2012-09-10 10:11:02 -07:00
Geoff Young
76e42edb29
Updated sample markup to reflect live demo.
2012-09-09 18:58:23 -04:00
Mark Otto
dd1bce2611
latest tweaks to grid classes for forms
2012-09-08 12:50:37 -07:00
Mark Otto
b53da4b6e7
commenting out stuff and adding grid test page
2012-09-07 22:46:35 -07:00
Mark Otto
9a39306abe
nuke fluid grid docs again
2012-09-07 22:35:51 -07:00
Mark Otto
7e29581210
Merge branch '2.1.2-wip' into box-sizing-exercise
...
Conflicts:
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
Mark Otto
f29f98501c
run make after merging #5028 , which removes the left margin of responsive fluid grid offsets
2012-09-07 11:42:21 -07:00
Mark Otto
61332d727e
fixes #5020 : submenu support in dropup
2012-09-07 11:34:05 -07:00
Mark Otto
f2bd7d9f27
fixes #5018 : .btn-block in .modal-footer no longer has left margin
2012-09-07 11:10:00 -07:00
Mark Otto
6c5c3c81ec
Merge branch 'tiny-typos' of https://github.com/ramiro/bootstrap into ramiro-tiny-typos
2012-09-07 11:06:08 -07:00
Mark Otto
7a0f5c6c00
fixes #5010 : .pager span selector should be scoped to immediate children only
2012-09-07 11:04:51 -07:00
Ramiro Morales
138b5a8c05
Fix small documentatio typos.
2012-09-05 23:07:52 -03:00
Mark Otto
d4a16d35eb
fixes #4996 : incorrect border radius on a table
2012-09-05 10:05:54 -07:00
Mark Otto
3fa4ca2d87
Merge branch 'spantaleev-patch-1' into 2.1.2-wip
2012-09-05 10:04:38 -07:00
Mark Otto
dfb3175d4b
rebuild after merge
2012-09-05 10:04:28 -07:00
Mark Otto
08b8571cb8
version bump to get this started
2012-09-05 10:00:57 -07:00
Jacob Thornton
c52368d3c5
last rebuild before 2.1.1 release
2012-09-04 20:44:11 -07:00
Mark Otto
bc4ecd9984
regrettably remove the animated button for download on homepage to improve page performance in some browsers
2012-09-04 20:13:27 -07:00
Mark Otto
7e4629fbbe
fixes #4968 manually: typo in scaffolding docs about offset classes
2012-09-04 14:27:48 -07:00
Mark Otto
bf590d8c81
fixes #4958 : add version to minified js
2012-09-04 11:13:08 -07:00
Mark Otto
de36456f5d
fixes #4957 : use input border var for select element instead of #ddd
2012-09-04 11:00:25 -07:00
Mark Otto
1f0043a7f5
fixes #4959 : docs example
2012-09-04 09:13:09 -07:00
Mark Otto
8cda830eaf
fixes #4146 : IE7-8 responsive image helper
2012-09-03 01:13:42 -07:00
Mark Otto
9d5f9eca85
fixes #4909 : add color utility classes .text-warning, etc and document them
2012-09-03 00:47:48 -07:00
Mark Otto
69d4c3f9a1
fixes #4925 : ensure docs examples don't use fixed font-size and line-height for .lead
2012-09-02 20:54:41 -07:00
Mark Otto
3737904859
fixes #4922 : use basefontsize for realz on .lead
2012-09-02 13:25:03 -07:00
Mark Otto
209852c805
fixes #4902 : proper accordion html example
2012-09-01 12:03:55 -07:00
Mark Otto
02f6bd65f5
fixes #4910 : use @baseLineHeight * 1.5 for .lead font-size
2012-09-01 12:00:13 -07:00
Mark Otto
e8c5b3c9a5
fixes #4869 : typo in getting started
2012-08-31 23:51:48 -07:00
Mark Otto
b1bdca0fdb
fixes #4901 : attribute typo and reran make
2012-08-31 23:25:58 -07:00
Mark Otto
00d6f26270
fixes #4896 : reflect media query order in docs
2012-08-31 23:12:02 -07:00
Mark Otto
0f85e8b7f8
fixes #4824 : scope table grid sizes to .table instead of table
2012-08-31 22:37:46 -07:00
Mark Otto
beb0b64096
fixes #4889 : btn-link disabled styles
2012-08-31 14:02:18 -07:00
Mark Otto
afd931262c
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
2012-08-29 13:14:11 -07:00
Mark Otto
2da2169a56
fixes #4828 : make fluid grid inputs size the same as fixed grid inputs
2012-08-29 13:06:47 -07:00
Mark Otto
2137cd65fb
fixes #4819 : manual fix of missing .control-label in responsive767 file, coupled with a remake
2012-08-29 13:05:43 -07:00
Mark Otto
010a5dd84d
Merge pull request #4816 from desimone/master
...
Fixed a typo in docs/assets/css/docs.css
2012-08-29 10:48:04 -07:00
Bobby DeSimone
8878facc67
Fixed a typo in docs/assets/css/docs.css
2012-08-29 11:13:55 -03:00
Mark Otto
cb46ddee72
grid docs changes
2012-08-28 13:46:13 -07:00
Mark Otto
0b122bc5c5
remake the box-size grid, nuke fluid grid docs, fix up examples, clean up form styles
2012-08-28 13:33:06 -07:00
Mark Otto
e27b1355b5
fixes #4771 : widen .form-horizontal labels and .dl-horizontal terms given larger font-size of 2.1.0
2012-08-28 10:12:04 -07:00
Mark Otto
545edf5459
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
2012-08-27 22:43:05 -07:00
Mark Otto
609142eee2
fixes #4729 : only use margin-top on .help-block when it follows an input, select, textarea
2012-08-27 22:42:12 -07:00
Jacob Thornton
3568146b28
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements
2012-08-27 21:44:09 -07:00
Mark Otto
7d412b1e14
fixes #4741 : undo previous version's attempt at firefox gradient changes and add gradient tests
2012-08-27 21:18:55 -07:00
Mark Otto
55982664d0
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
2012-08-27 21:06:29 -07:00
Mark Otto
1eaf1cf418
fixes #4653 : add hover states to stateful table rows
2012-08-27 21:06:21 -07:00
Jacob Thornton
601e252074
fix for #4761
2012-08-27 20:58:51 -07:00
Jacob Thornton
d797a5fbd7
fix for open elements under modal when .modal-open
2012-08-27 20:43:12 -07:00
Mark Otto
17d8c78e52
fix docs horizontal scroll on tablet viewports
2012-08-27 20:32:42 -07:00
Alexandre Magno
b5a8c0a45e
i18n tags missing in some strings at getting started download page
2012-08-27 23:54:07 -03:00
Mark Otto
303a33f15c
fixes #4664 : spelling mistake in alerts docs
2012-08-27 15:48:54 -07:00
Mark Otto
3b67ece2d1
fixes #4666 : overrides for input types with .btn-block
2012-08-27 15:39:55 -07:00
Mark Otto
4674945fa8
fixes #4556 : add mention of disable state and required js to buttons docs
2012-08-27 15:27:58 -07:00
Mark Otto
b444582ccd
fixes #4671 : mention collapsing parents in docs for affix plugin
2012-08-27 15:20:50 -07:00
Mark Otto
8610fd9b2b
remove min-height from .span3 in docs since we no longer need it
2012-08-27 15:12:55 -07:00
Mark Otto
85dcbd0b34
add min-height: 1px; to .span* classes to prevent grid columns from collapsing
2012-08-27 15:12:22 -07:00
Mark Otto
cf9334bd7d
fixes #4725 : width of .uneditable-input should match standard text input width
2012-08-27 12:07:28 -07:00
Mark Otto
22c4f3d058
fixes #4718 : add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn
2012-08-27 12:05:15 -07:00
Mark Otto
15317419f4
fixes #4577 : no margin on .control-row .span* in responsive
2012-08-27 11:46:47 -07:00
Mark Otto
8a5dde556b
fixes #4644 : ensure new static navbar negative indents on responsive layouts like fixed navbars
2012-08-27 11:05:01 -07:00
Mark Otto
1c9d5c43b0
fixes #4640 : pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links
2012-08-27 10:56:46 -07:00
Mark Otto
a2b9a5e1fe
fixes #4680 : proper margin on buttons in navbar forms
2012-08-27 10:52:11 -07:00
Mark Otto
fcd08fce8f
fixes #4578 : add clearfix to .navbar-inner to clear floats
2012-08-27 10:32:07 -07:00
Mark Otto
54e3a26dda
fixes #4562 : correct select and input widths at 220px (changed with 2.1.0 when we changed padding)
2012-08-27 10:08:16 -07:00
Mark Otto
96542f14ab
fixes #4540 : adjust vertical alignment of .btn-group in .navbar
2012-08-27 10:04:58 -07:00
Mark Otto
bdc3ff99f3
fixes #4749 : correct initialism example
2012-08-27 09:18:32 -07:00
Mark Otto
72f176d1f5
fixes #4748 : document jquery dependency better
2012-08-27 09:17:20 -07:00
Mark Otto
1b8f4f5bc5
fixes #4512 : improved borders on navbars
2012-08-26 23:23:47 -07:00
Mark Otto
f15eb7b499
fixes #4506 : clearfix added to .dl-horizontal to account for empty dd elements
2012-08-26 23:06:56 -07:00
Mark Otto
eb8aad85b8
fixes #4734 manually: doctype in getting started in examples
2012-08-26 22:29:40 -07:00
Mark Otto
f744ad57fc
fixes #4676 manually: example html updated
2012-08-25 22:31:10 -07:00
Mark Otto
d9593e217d
avoid top margin on input-append/prepend in .navbar-form
2012-08-24 14:45:02 -07:00
Mark Otto
0682780cd8
fixes #4657 : proper border radius property in tables
2012-08-23 15:04:41 -07:00
Mark Otto
5cbb826961
Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
...
.warning for table tr and .info for .control-group
2012-08-23 09:47:44 -07:00
Mark Otto
be64955e25
nuke 10px right margin on .navbar .nav
2012-08-23 09:38:56 -07:00
Mark Otto
3424df22ee
delete components folder
2012-08-23 08:30:27 -07:00
Mark Otto
ac4420237c
fixes #4591 properly: remove -1px left margin on .input-append .add-on
2012-08-22 20:32:47 -07:00
Mark Otto
4775bc910c
fixes #4604 : add span support to .pager component
2012-08-22 20:28:08 -07:00
Mark Otto
5da217b96e
fixed #4598 , typo, manually
2012-08-22 20:23:58 -07:00
Mark Otto
535dfc2153
fixes #4561 : typo
2012-08-22 09:51:41 -07:00
Mark Otto
6160667b19
fixes #4564 manually: typo in getting started jumbotron
2012-08-22 09:48:57 -07:00
Mark Otto
5f97e04aa3
fixes #4567 : link in scaffolding page
2012-08-22 09:47:56 -07:00
Mark Otto
115c7b82c4
fixes #4586 : typo in docs
2012-08-22 09:45:57 -07:00
Andreas Cederström
a9764c34a7
Add info state to form validation
2012-08-22 11:24:02 +02:00
Andreas Cederström
361889def9
Add .warning to table rows
2012-08-22 11:20:31 +02:00
Mark Otto
5d41742f17
fixes #4505 : lighten navbar text and link color so hover looks darker
2012-08-21 14:53:34 -07:00
Mark Otto
8d00fe4c03
running make on previous merge
2012-08-21 14:43:13 -07:00
Mark Otto
46c10c8b58
alternate fix to #4522 : increase line-height on btn-mini
2012-08-21 14:38:47 -07:00
Mark Otto
190d3c9c3e
fixes #4526 : box-shadow on .radio and .checkbox if .control-group has a form field state
2012-08-21 14:22:26 -07:00
Mark Otto
e2ecd2df6c
Merge branch 'incbee-master' into 2.1.1-wip
2012-08-21 14:16:09 -07:00
Mark Otto
45978b6674
run make
2012-08-21 14:16:01 -07:00
Mark Otto
b1c93c2700
fixes #4523 : more specific selectors on white icon inversion
2012-08-21 14:15:01 -07:00
Mark Otto
311c00a29b
fixes #4532 : navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form
2012-08-21 14:07:20 -07:00
Mark Otto
13199c0020
fixes #4530 : fix docs nesting cols comments
2012-08-21 13:59:13 -07:00
Mark Otto
1c134d9a7f
update version numbers to 2.1.1
2012-08-21 13:11:25 -07:00
Mark Otto
b52d29095a
fixes #4520 : manually fix example html for icon
2012-08-21 13:09:01 -07:00
Mark Otto
4f918ce52c
fixes #4517 manually in mustache file as well, typo in docs
2012-08-21 13:08:09 -07:00
Mark Otto
8a2b9f4a5f
remove entity in content property on dropup carets--not necessary at all
2012-08-21 13:02:02 -07:00
Mark Otto
099cec1ca7
fixes #4493 : typo in dimiss alerts docs
2012-08-21 13:00:40 -07:00
Mark Otto
06c718b1d3
fixes #4480 : typo in scaffolding page
2012-08-21 12:59:26 -07:00
Mark Otto
55facf1f2e
fixes #4473 : docs example typo for js affix plugin
2012-08-21 12:58:48 -07:00
Mark Otto
6477ad1acf
fixes #4472 : manually change mustache file as well for typo
2012-08-21 12:57:41 -07:00
Jacob Thornton
320b75de63
add affix to zip
2012-08-20 23:13:43 -07:00
Jacob Thornton
9e0d87a4dd
fix afffix
2012-08-20 16:43:49 -07:00
Jacob Thornton
2b5e09038a
small nits
2012-08-20 16:21:57 -07:00
Jacob Thornton
5d63e8e2a8
fMerge branch '2.1.0-wip'
...
Conflicts:
docs/index.html
2012-08-20 16:13:46 -07:00
Mark Otto
01572f00bb
ie7 button group and button toggle padding changes
2012-08-20 12:27:45 -07:00
Mark Otto
58dd1f20ae
fix vertical button-groups in ie7
2012-08-20 12:20:22 -07:00
Mark Otto
6cf3752b9b
fix ie7 dropdowns examples in docs
2012-08-20 12:16:15 -07:00
Mark Otto
78cb09b440
run make and add comment
2012-08-20 11:31:24 -07:00
Mark Otto
e59642838f
remove relative and top positioning from docs sidenav at narrow layout
2012-08-20 11:28:30 -07:00
Mark Otto
2fda6a45aa
bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work
2012-08-20 11:22:37 -07:00
Mark Otto
47697c5f35
Merge branch 'progress-multi-2.1.0-wip' of https://github.com/jpommerening/bootstrap into jpommerening-progress-multi-2.1.0-wip
2012-08-20 11:13:07 -07:00
Mark Otto
afaee0ca13
reorder jumbotron links
2012-08-20 11:09:16 -07:00
Mark Otto
73cf9c4db8
fixes #4469 manually: reset width on file inputs
2012-08-20 10:28:41 -07:00
Jonas Pommerening
a1951ed7c0
stack mutliple progress bars
2012-08-20 10:12:03 +02:00
Mark Otto
e510306196
bump versions to 2.1.0
2012-08-19 23:07:18 -07:00
Mark Otto
a667fd93ab
pre font-size increase; revert static top navbar, undo contents section for now
2012-08-19 23:01:24 -07:00
Mark Otto
4e979f084d
fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs
2012-08-19 21:12:52 -07:00
Mark Otto
e4d4ef43b0
copy change for previous commit
2012-08-19 20:38:27 -07:00
Mark Otto
e71e2b4be2
fixes #4460 and #4461 : copy change for opera animations support
2012-08-19 20:38:16 -07:00
Mark Otto
b745b7768a
fixes #4458 : improve support for .btn + .btn in .btn-groups and .btn-toolbars
2012-08-19 17:07:41 -07:00
Mark Otto
887f11d47f
fixes #4455 : improve small styles and add to docs
2012-08-19 13:12:43 -07:00
Mark Otto
47cf3cc62f
copy edits to base css page
2012-08-19 12:07:23 -07:00
Mark Otto
bb85bbc657
compy edits to docs
2012-08-19 12:04:41 -07:00
Mark Otto
7ed82c1223
font-size change on examples in getting started
2012-08-19 11:59:28 -07:00
Mark Otto
8e271d664b
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-08-19 11:54:05 -07:00
Mark Otto
c531a75ff0
fixes #4451 manually: add .fade to modal example in both mustache and html
2012-08-19 11:53:55 -07:00
Jacob Thornton
c9cef741f6
listen to touchstart for dropdowns on mobile
2012-08-18 20:18:15 -07:00
Jacob Thornton
45dddc59a1
add click option for tooltip, popover - make click default for popover
2012-08-18 19:54:30 -07:00
Jacob Thornton
44e35e9dfa
fix component
2012-08-18 19:33:46 -07:00
Jacob Thornton
937cfa6a88
add note about .nav
2012-08-18 19:32:50 -07:00
Jacob Thornton
1166b39630
removed some old stuff from application.js
2012-08-18 19:24:29 -07:00
Mark Otto
e79eb75e09
fixes #4044 : make z-index of tooltips same as fixed navbar so they overlay it if generated from within
2012-08-18 17:05:37 -07:00
Mark Otto
e6e0e2ac9b
fixes #4442 : allow for .btn within a .btn-toolbar without .btn-group
2012-08-18 16:50:26 -07:00
Mark Otto
4d2f584fdd
fixes #4444 : clarify docs copy that new icon white style is intentional on active and hover links in .nav and .dropdown-menu
2012-08-18 16:47:04 -07:00
Mark Otto
9ae137aede
modifications to new content
2012-08-18 16:42:50 -07:00
Mark Otto
80ced60778
Merge branch '2.1.0-wip' of https://github.com/smerik/bootstrap into smerik-2.1.0-wip
2012-08-18 16:31:13 -07:00
Mark Otto
50638530e6
fixes #4445 : .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well
2012-08-18 16:30:47 -07:00
Erik van der Kolk
dda951d1e1
Remove inexisting end tag </hr>
2012-08-18 21:52:43 +02:00
Erik van der Kolk
ae275dccb8
Fix empty for attribute on labels in Horizontal form
2012-08-18 21:44:57 +02:00
Erik van der Kolk
b7233a49dd
Move code within code snippet as close to the left for Basic block
2012-08-18 19:51:57 +02:00
Erik van der Kolk
3f12c746e5
Replace Note: by Heads up!
2012-08-18 19:49:27 +02:00
Erik van der Kolk
2327d30ef5
Add code snippet to Icon examples => Form fields section
2012-08-18 19:40:42 +02:00
Erik van der Kolk
8b763286df
Add code snippet to Icon examples => Navigation section
2012-08-18 19:31:29 +02:00
Erik van der Kolk
d71efb855b
Separate Buttons examples in Icon examples section and add code snippets
2012-08-18 19:21:01 +02:00
Erik van der Kolk
97247a157c
Improve description for Images section
2012-08-18 18:24:18 +02:00
Erik van der Kolk
d8eb75d6e8
Fix Heads up! part for Images section
2012-08-18 18:14:20 +02:00
Erik van der Kolk
f1854a3cec
Move code within <pre> tags as close to the left for Images section
2012-08-18 16:53:43 +02:00
Erik van der Kolk
2ab0c8de1a
Fix typo in One class, multiple tags section
2012-08-18 16:50:08 +02:00
Erik van der Kolk
04a20fb402
Use one line per tag in code snippet for One class, multiple tags
2012-08-18 16:47:15 +02:00
Erik van der Kolk
7b7a02542b
Improve doc for block level buttons
2012-08-18 16:41:40 +02:00
Erik van der Kolk
41253fb073
Improve doc for Button sizes
2012-08-18 16:36:40 +02:00
Erik van der Kolk
a3c474c404
Move code within <pre> tags as close to the left for Input focus
2012-08-18 16:07:48 +02:00
Erik van der Kolk
f4f6783cc0
Add <input> into Help text code snippet as shown in example
2012-08-18 16:03:47 +02:00
Erik van der Kolk
263ed4e239
Add span5 from example into multiple grid inputs code snippet
2012-08-18 15:48:18 +02:00
Erik van der Kolk
f37d4b0918
Add missing placeholders and <select> in Grid sizing code snippet
2012-08-18 15:43:00 +02:00
Erik van der Kolk
01dadc05f4
Make Relative sizing code snippet the same as example
2012-08-18 15:31:11 +02:00
Erik van der Kolk
663fd4ff62
Make Extending form ... => Search form code snippet the same as example
2012-08-18 15:29:55 +02:00
Erik van der Kolk
a8b18b6f54
Fix typo
2012-08-18 14:54:32 +02:00
Erik van der Kolk
25f8ef3260
Add multiple="multiple" to Forms => Selects as described in explanation
2012-08-18 14:36:30 +02:00
Erik van der Kolk
c8b8d914b8
Make Forms => Textarea code snippet the same as example
2012-08-18 14:22:41 +02:00
Erik van der Kolk
7f5aa177f5
Make Forms => Default styles code snippet the same as example
2012-08-18 14:00:33 +02:00
Erik van der Kolk
0c24f51d2a
Change .help-block tag for "Forms => Default styles" example into <span>
2012-08-18 13:56:02 +02:00
Erik van der Kolk
05571db109
Add <caption> to Supported table markup example
2012-08-18 13:40:37 +02:00
Mark Otto
1ae194597c
nuke subnav styles from responsive navbar
2012-08-17 16:32:34 -07:00
Mark Otto
256a25f25c
fixes #4260 and #4322 : set vertical-align to top on input-prepend components to solve modal rounding issues
2012-08-17 16:28:45 -07:00
Mark Otto
5b947b8a2f
fix up padding on small buttons, add button examples
2012-08-17 16:11:52 -07:00
Mark Otto
f9deb8017a
Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip
2012-08-17 16:04:35 -07:00
Mark Otto
2b22c0c56e
fixes #4438 : button groups in inline forms now render inline
2012-08-17 16:00:36 -07:00
Mark Otto
9e6322dbab
fixes #4428 : specifity on .search-query increased
2012-08-17 12:59:32 -07:00
Mark Otto
077577c7f3
fixes #4421 : add static top navbar class
2012-08-17 11:46:23 -07:00
Mark Otto
b86e1fb62a
additional navbar contrast: add inset shadow since we nuked the border
2012-08-17 11:31:21 -07:00
Mark Otto
b8715ddfd0
fixes #4417 : proper height on thumbnail placeholder image
2012-08-17 11:27:11 -07:00
Mark Otto
79e05d0c0e
change css version #
2012-08-17 11:24:48 -07:00
Mark Otto
51b43acf20
run make on previous commit's merge
2012-08-17 11:23:39 -07:00
Mark Otto
ded21ebc91
fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements
2012-08-17 11:22:45 -07:00
Mark Otto
54c645e33d
tweak transition
2012-08-15 14:49:55 -07:00
