Mark Otto
9c63ffa00f
update links to point to download links
2013-07-27 01:06:59 -07:00
Mark Otto
d78c85c82a
unfuck broke links in docs
2013-07-27 00:47:08 -07:00
Mark Otto
80123fc039
mo links, fix ads and analytics in gh pages
2013-07-27 00:35:26 -07:00
Mark Otto
94df8090a7
fixes for hella broken links on account of jekyll and twbs.github.com links
2013-07-27 00:28:23 -07:00
Mark Otto
0f2b22a210
herpy derpy shit for urls
2013-07-27 00:18:12 -07:00
Mark Otto
295a87ab0f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 23:28:20 -07:00
Mark Otto
c884e51bfc
2.3.2 not 2.3.3
2013-07-26 23:24:02 -07:00
fat
ec42ddf1f4
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 23:14:48 -07:00
fat
b1e01a1b04
update js title
2013-07-26 23:14:21 -07:00
Mark Otto
40d398bcd0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 23:04:12 -07:00
Mark Otto
c8883647ae
add cname
2013-07-26 23:04:03 -07:00
fat
d0cafdd3a8
rebuild + use serif arrows
2013-07-26 22:59:21 -07:00
fat
4f4e74be78
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 22:41:34 -07:00
fat
0da0b321ab
small copy change
2013-07-26 22:36:23 -07:00
Mark Otto
45f6f1629b
ignore the gruntfile from jekyll
2013-07-26 22:31:14 -07:00
fat
7b9a949a18
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 22:25:11 -07:00
fat
cfa4ab90f3
fix scrollspy for window *and* children
2013-07-26 22:24:51 -07:00
Mark Otto
88dd20e6ac
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-26 22:18:16 -07:00
Mark Otto
bed8e959b3
responsive tables all up in js docs
2013-07-26 22:17:53 -07:00
Mark Otto
bf5434dbec
Fix up dropdowns being incorrectly positioned on nav pills
2013-07-26 22:11:58 -07:00
fat
2cf1851d9f
use transforms to make the dialog smooooth
2013-07-26 22:09:31 -07:00
Mark Otto
4e27740916
Fix broke ass navbar example docs stuff
2013-07-26 22:09:05 -07:00
Mark Otto
44a4e71215
Fix clipped dropdowns in input groups section of docs
2013-07-26 22:03:52 -07:00
Mark Otto
5bed9f4635
simpler forms docs structure
2013-07-26 21:52:23 -07:00
Mark Otto
88887f8c00
Undo changes from #8582 because it made links uneven on desktop
...
/cc @salman-javed-confiz
2013-07-26 21:49:35 -07:00
Mark Otto
85591d82dd
derp
2013-07-26 21:40:58 -07:00
Mark Otto
2967cc1d60
mo tables mo responsive or whatever the hell that means
2013-07-26 21:35:56 -07:00
Mark Otto
572174652e
another responsivey table
2013-07-26 21:31:00 -07:00
Mark Otto
70fa8ef4b0
Responsivey docs table for grid section
2013-07-26 21:28:44 -07:00
Mark Otto
8349236f8c
Twerk lead font-size for mobile devices
2013-07-26 21:12:48 -07:00
Mark Otto
ad235f5f51
Broser meta tag docs layout change
2013-07-26 21:12:35 -07:00
fat
fff2854c5e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 21:01:50 -07:00
fat
f83995684c
fixes #6937
2013-07-26 21:01:14 -07:00
Mark Otto
27a656f72e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 20:53:26 -07:00
fat
93eeb8578d
Merge branch '3.0.0-docs-js' of git://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-js
...
Conflicts:
javascript.html
2013-07-26 20:50:51 -07:00
fat
38044e55ae
rebuild + fix #2539
2013-07-26 20:44:35 -07:00
Mark Otto
425ec58ea9
Contrast on old docs callout
2013-07-26 20:36:02 -07:00
fat
6fdb18b641
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 20:34:59 -07:00
fat
e2d4cf5f68
change how collapse works - collapse, collapsing, and in
2013-07-26 20:34:39 -07:00
Mark Otto
ae3a1ddd14
Color change to sidenav
2013-07-26 20:20:21 -07:00
Mark Otto
46a332049f
Mo betta side nav colors
2013-07-26 19:58:46 -07:00
Mark Otto
d16396f44a
Fix broke ass popovers direction example
2013-07-26 19:50:02 -07:00
Mark Otto
20040868c1
Unfuck JS docs spacing and closing divs
2013-07-26 19:46:42 -07:00
Mark Otto
b2c618c212
Update IDs on customize page
2013-07-26 19:38:12 -07:00
Mark Otto
22fda2f54d
Upate IDs on components page
2013-07-26 19:37:31 -07:00
Mark Otto
d89c3b9d23
Update IDs on css page
2013-07-26 19:35:24 -07:00
Mark Otto
e2d497c385
Update IDs on getting started page
2013-07-26 19:32:15 -07:00
Mark Otto
e3b8081b7e
Better spacing of le docs sections
2013-07-26 19:32:05 -07:00
Mark Otto
e647d54f25
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 19:26:58 -07:00
fat
178d8e98de
update docs nav targets
2013-07-26 19:25:45 -07:00
Mark Otto
71acb0c42b
Tweak getting started section
2013-07-26 19:25:13 -07:00
Mark Otto
259ff8b6a4
More vars work
2013-07-26 19:24:59 -07:00
Mark Otto
305455a9b3
Use some vars for key urls for easier updating
2013-07-26 19:05:43 -07:00
Mark Otto
a285a3db3f
more space in sidenav
2013-07-26 18:52:05 -07:00
Mark Otto
bdac42ea40
Merge pull request #8631 from jamescostian/patch-1
...
Fix ID of buttons section on javascript page
2013-07-26 18:47:08 -07:00
James Costian
2c58fab318
Fix ID of buttons section on javascript page
...
The old ID caused the link on affix to not work.
2013-07-26 19:15:11 -05:00
Mark Otto
e4159b53f6
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 16:53:00 -07:00
Mark Otto
75f5a70f7d
Fixes #8293 : sub nav links in JS docs
2013-07-26 16:52:09 -07:00
Mark Otto
e686464ad8
Simpler horizontal form button placement
2013-07-26 16:01:34 -07:00
Mark Otto
6585c723f8
Ignore less dir in Jekyll
2013-07-26 16:01:24 -07:00
Mark Otto
01c6617f79
Update inline and horizontal forms
...
* No more need for `.row.form-group`--only need `.form-group`
* Change tag selectors for inline form to use `.form-control`
* Docs improved to explain what's happening
2013-07-26 15:51:25 -07:00
Mark Otto
68827689e8
Use .form-control in input sizing CSS
2013-07-26 15:41:16 -07:00
Mark Otto
73427f717d
Tweak side nav styles
2013-07-26 15:34:50 -07:00
Chris Rebert
7b4c40ddb5
Merge pull request #8630 from caouecs/patch-1
...
Fix example of textarea in css.html
2013-07-26 15:14:08 -07:00
Mark Otto
c75f3748e8
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 15:13:41 -07:00
Mark Otto
b513cd9add
grunt on previous commits
2013-07-26 15:13:03 -07:00
Chris Rebert
6aa051b000
README: update stray "2.3.2" to "2.3.3"
2013-07-26 15:12:32 -07:00
Fred Delrieu
4ca3e3677a
Example of textarea
2013-07-27 00:09:27 +02:00
Mark Otto
1cf0a07f17
Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3
...
Conflicts:
css.html
2013-07-26 15:08:45 -07:00
Mark Otto
444973e54d
Fixes #8605 : use .form-control in .input-group instead of HTML tags
2013-07-26 14:31:24 -07:00
Mark Otto
5dd2bff38c
more readme clarity and reorg--think this makes more sense now
2013-07-26 14:15:48 -07:00
Mark Otto
fd6f7dcce1
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 14:09:45 -07:00
Mark Otto
b82692b2bf
more readme love
2013-07-26 14:09:12 -07:00
Chris Rebert
0168ebade2
tweak terminology to be pedantically correct & add link
2013-07-26 14:04:35 -07:00
Mark Otto
953e0e445c
update 2.3.x version mention and link in readme
2013-07-26 13:59:56 -07:00
Mark Otto
bc1ba8f08b
update readme per comments in pr
2013-07-26 13:58:18 -07:00
Mark Otto
1ad3e1e8a7
Merge branch '3.0.0-wip' of https://github.com/jojohess/bootstrap into jojohess-3.0.0-wip
2013-07-26 13:51:27 -07:00
Mark Otto
ded4ebfa7e
Make customize layout match default layout
2013-07-26 13:50:55 -07:00
Mark Otto
52e8aedb8e
More customizer changes, and revert to placeholder layout
2013-07-26 11:17:48 -07:00
Mark Otto
e3af87967a
Fix broken indentation
...
Not sure when or how this happened, but I just noticed it—4 spaces were
used instead of 2.
2013-07-26 11:11:09 -07:00
Mark Otto
9e98b733f1
Vars update
...
* Drop progress bar text-shadow
* Reorganize popover and tooltip vars and fix complier error due to
missing `;`
* Run `grunt`
2013-07-26 11:08:27 -07:00
Mark Otto
e62e992b88
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
2013-07-26 10:44:46 -07:00
Mark Otto
d28b7913f6
Merge pull request #8619 from jholl/patch-2
...
align dropdown menu with .pull-right for .input-group-btn when btn on ri...
2013-07-26 10:35:20 -07:00
Mark Otto
caa5b4b718
Merge pull request #8624 from jholl/patch-2
...
Update typo css.html move double class .form-control from label in examp...
2013-07-26 10:31:20 -07:00
Mark Otto
099e970953
Merge pull request #8625 from liuyl/fixbtnbg
...
Fix #8623
2013-07-26 10:30:41 -07:00
Chris Rebert
2d91e91b85
Merge pull request #8626 from cowboy/3.0.0-wip
...
It's Grunt, not GruntJS :)
2013-07-26 09:17:59 -07:00
Ben Alman
102fad4ebd
It's Grunt, not GruntJS :)
2013-07-26 12:00:45 -04:00
Yulong Liu
e4300fa1bf
fix background of btn-link
2013-07-26 22:27:55 +08:00
Yulong Liu
a2f120a7aa
remove background:none
2013-07-26 21:59:50 +08:00
James Holland
0e7aad8b8d
Update typo css.html move double class .form-control from label in example mark up to input
...
missed the double class in label in recent commit #8621
2013-07-26 09:43:05 -04:00
James Holland
2e7593a40d
Update forms.less to remove .form-horizontal .row + .row
...
use .form-group to apply consistent vertical spacing on form rows
2013-07-26 09:04:39 -04:00
James Holland
6115f01adb
Update css.html in .form-horizontal
...
to use .row.form-group for horizontal spacing instead of .form-horizontal .row + .row
2013-07-26 08:58:47 -04:00
syed
1b8ba0d159
move things around :)
...
Moved pager, pagination, popovers, tooltip, progress bars & type
properties to variables.less
2013-07-26 17:04:15 +05:00
James Holland
f7a376569a
align dropdown menu with .pull-right for .input-group-btn when btn on right of input
2013-07-26 07:52:40 -04:00
Jordan Hess
cd23ae00dd
Added windows hint to jekyll documentation instructions.
2013-07-26 03:25:12 -06:00
Jordan Hess
fe095d17a2
Changed old reference to "grunt bootstrap" to "grunt dist"
2013-07-26 03:16:27 -06:00
Mark Otto
2a51ebf671
readme /cc @zdroid
2013-07-26 01:46:30 -07:00
Mark Otto
5b2b46fe28
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 01:43:53 -07:00
Mark Otto
5d766d9e2f
Mo betta placement of old docs callouts
2013-07-26 01:43:43 -07:00
Chris Rebert
2910e3cb5a
Merge pull request #8614 from cvrebert/grunt
...
Switch from `make` to `grunt`
Rebase of #7786 against soon-to-be 3.0.0-rc.1
2013-07-26 01:34:58 -07:00
Chris Rebert
2d58534519
Merge pull request #8616 from caouecs/patch-1
...
Small typo in less/mixins.less
2013-07-26 01:20:10 -07:00
Chris Rebert
a317f67c1c
re-integrate #8560 using @fat's code from the comment on #8614
2013-07-26 01:15:41 -07:00
Fred Delrieu
06980ae5a1
Small typo
2013-07-26 10:10:35 +02:00
Chris Rebert
292d8d6819
specify explicit ordering for grunt concat step
2013-07-26 01:07:56 -07:00
John-Philip Johansson
0d33455ef4
Replace Makefile with GruntJS
...
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess
Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat
995add132e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 00:22:48 -07:00
fat
91b6a43ed9
fix makefile error thing
2013-07-26 00:22:20 -07:00
Mark Otto
210ee63693
Fixes #8586 : add addional color text classes to apply all of branch colors easily
2013-07-26 00:18:18 -07:00
Mark Otto
d604052aa5
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-26 00:04:24 -07:00
Mark Otto
c23ba4d50b
Fuck a color purple
2013-07-26 00:04:15 -07:00
Mark Otto
b4f023f809
Make it so back to top link ain't broked no mo
2013-07-26 00:02:20 -07:00
fat
5588e14867
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 23:57:37 -07:00
fat
778f3a3df7
update docs a bit more for affix
2013-07-25 23:57:21 -07:00
fat
7ae8db8b7e
update the affix docs a bit
2013-07-25 23:53:34 -07:00
Mark Otto
1659ac6473
Fix up navbar forms
2013-07-25 23:32:12 -07:00
fat
f58827f24d
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 23:30:29 -07:00
fat
f5f04ae4a0
fix affix…
2013-07-25 23:30:13 -07:00
Mark Otto
ed4674a09a
Disable the customizer for rc1 for now
2013-07-25 23:29:43 -07:00
Mark Otto
8a7553aeda
Bump version of old docs in callout
2013-07-25 21:52:21 -07:00
Mark Otto
94202b2b29
Update docs to better indicate v3 RC1
2013-07-25 21:51:45 -07:00
Mark Otto
f79740b48a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 21:49:50 -07:00
fat
124d7e6279
fixes #8560
2013-07-25 21:49:19 -07:00
fat
0190128ebc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 21:34:02 -07:00
fat
15d9c82fc5
fix collapse event #8596
2013-07-25 21:33:26 -07:00
Jacob
f1ddf7681c
Merge pull request #8419 from hollensteiner/3.0.0-wip
...
Replace position() with offset() in scrollspy.js
2013-07-25 21:19:57 -07:00
Mark Otto
56404bc89b
Add .panel-title to panel component to mirror modals
...
/cc @leeaston
2013-07-25 21:16:43 -07:00
Mark Otto
ac4e7db17f
single include for old ads callout
2013-07-25 20:56:44 -07:00
Mark Otto
2a4a6fe0f0
Merge pull request #8611 from twitter/bs3_form_classes
...
Updated BS3 form classes
2013-07-25 20:31:11 -07:00
Mark Otto
35aad07456
Add comment about opacity mixin not being used
2013-07-25 19:56:04 -07:00
Mark Otto
27cedf71d5
Update form validation states
...
* Once again no longer applies to single inputs (this is a bit simpler,
but I'm open to new ideas) but the entire set of inputs, labels, and
help text within a particular element. However, the styles are not too
dependent on markup or layout, so they're super flexible.
* Simplified the markup in the validation docs examples to match latest
changes.
* Renamed `.form-state-validation` mixin to `.form-control-validation`
to match naming of prev commit.
2013-07-25 19:45:14 -07:00
Mark Otto
71d3d2c3f6
Spacing
2013-07-25 18:55:00 -07:00
Mark Otto
13bc74b636
Refactor forms styles
...
* Reorganize forms.less
* Change from attribute selectors to `.form-control`. Few lines, less
specific (meaning easier overrides as `element[type=""]` is more
specific than a class), less intrusive, and more performant.
* Add `.form-group` for basic spacing in vertical forms.
* Remove (unnecessary?) `margin: 0;` from `form` element (as far as I
can tell no browser sets that anyway).
2013-07-25 18:29:51 -07:00
Mark Otto
d242d536c4
Merge pull request #8603 from cvrebert/twbs
...
twbs ALL the links
2013-07-25 13:42:51 -07:00
Chris Rebert
90fb40b707
twbs ALL the links
2013-07-25 12:24:13 -07:00
Mark Otto
bc93a429a8
update docs to use buttons for tooltips
2013-07-25 11:55:12 -07:00
Mark Otto
c7995cf964
move some thing around
2013-07-25 10:50:59 -07:00
Mark Otto
0d2d65c8f1
run make on prev commits
2013-07-25 10:12:51 -07:00
Mark Otto
f94d9ce096
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into 3.0.0-wip
2013-07-25 10:11:30 -07:00
Mark Otto
768e7edabf
fixes #8571 completely: add better th support for table classes
2013-07-25 10:01:42 -07:00
Mark Otto
d4cd7efce6
make on prev commits
2013-07-25 09:58:28 -07:00
Mark Otto
4d42100a3e
Merge branch '3.0.0-wip' of https://github.com/tagliala/bootstrap into tagliala-3.0.0-wip
2013-07-25 09:57:49 -07:00
Mark Otto
f3aaba0be2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 09:57:40 -07:00
Mark Otto
72237acf52
fix #8584 : add readme callout for npm and node
2013-07-25 09:57:33 -07:00
Geremia Taglialatela
0017f7fca4
Navbar toggle is not vertically aligned (3.0.0-wip) with custom navbar height
...
When using navbar heights higher that default, the navbar-toggle button is not centered.
Fiddle demonstrating this issue (compiled with `@navbar-height: 60px;`): http://jsfiddle.net/tagliala/mRVMe/2/
Another fiddle with the proposed fix: http://jsfiddle.net/tagliala/mRVMe/3/
2013-07-25 17:09:12 +02:00
syed
a06afd8320
Moved navs inline properties to variables.less and customize.html & nav-customize.html
2013-07-25 12:43:14 +05:00
syed
f8d5a974bc
Moving navbar inline properties to variables.less and customize.html
2013-07-25 11:58:25 +05:00
Jacob Thornton
e9c83647af
fixes #8568 -- account for margins in offset
2013-07-24 20:57:26 -07:00
Jacob Thornton
aad910465c
fixes #8569
2013-07-24 20:21:23 -07:00
Jacob Thornton
a282dba58f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-24 20:10:51 -07:00
Jacob Thornton
eaefed517a
fixes #8399 w/ tests
2013-07-24 20:10:16 -07:00
Mark Otto
1f40da9676
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-24 16:53:34 -07:00
Mark Otto
51de38e5b9
make again
2013-07-24 16:52:47 -07:00
Mark Otto
61ac20ebb5
Merge branch '3.0.0-wip' of https://github.com/salman-javed-confiz/bootstrap into salman-javed-confiz-3.0.0-wip
2013-07-24 16:42:13 -07:00
Mark Otto
a36f444c25
Merge pull request #8583 from liuyl/disabled
...
set cursor to not-allowed for disabled elements
2013-07-24 16:32:25 -07:00
Mark Otto
3080104642
make footer border color use header border color in modals
2013-07-24 16:31:17 -07:00
Mark Otto
c63489def3
run make on prev commits
2013-07-24 16:28:34 -07:00
syed
2e6fcefc5c
Moved modals inline properties to variables.less
...
In this commit I moved modals.less inline properties to variables.less
and also added those variables to customize.html.
2013-07-24 18:43:21 +05:00
liuyl
7e9532dabe
set cursor to not-allowed for disabled elements
2013-07-24 17:10:27 +08:00
Salman Javed
0caab585f5
issues fixed for nav-justified on pills on android default browser.
2013-07-24 13:39:16 +05:00
Julian Thilo
7936f14780
Fix #8428 - Document tooltip/popover events
2013-07-24 09:08:19 +02:00
Jacob Thornton
930c75e5dd
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-23 23:51:18 -07:00
Jacob Thornton
217eb988b8
add placement auto for tooltips + tests… kinda sad about this doe
2013-07-23 23:50:23 -07:00
Mark Otto
8540515eeb
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-23 23:48:32 -07:00
Mark Otto
18157e9f39
Run make on prev commits
2013-07-23 23:48:17 -07:00
Mark Otto
9029b4c06c
Update forms vars
...
* Reorganize layout
* Add input group var
* Add legend border var
2013-07-23 23:25:46 -07:00
Mark Otto
a049cdd46e
Reorganize dropdown vars section
2013-07-23 23:22:13 -07:00
Mark Otto
398038c798
Update dropdown vars
...
* Update `.nav-divider` mixin to simplify to a 1px line (one value
instead of two in parametric mixin)
* Rename and consolidate dropdown caret vars
* Add vars to Customizer
2013-07-23 23:18:53 -07:00
Mark Otto
cdf6019e11
Update code vars
...
* Drop the `rgba()` border and fallback because fuck that noise
* Add vars to customizer
* Remove rogue `:`
2013-07-23 23:13:15 -07:00
Mark Otto
ba954db159
Update close vars
...
* Remove dupe hover color var (again, it's not necessary to have it's
own var here since we're controlling it via `opacity`)
* Add to customizer
2013-07-23 23:09:06 -07:00
Mark Otto
a5cc1300f6
Update carousel vars
...
* Remove `@carousel-control-hover-color` since that's just the same as
the default control color and all we change is `opacity` (it's required
for specificity).
* Add vars to customizer
* Update customizer nav to include new section
* Remove the `li` from the var names
* Consolidate and simplify `text-shadow` vars
2013-07-23 23:03:57 -07:00
Jacob Thornton
3cfa1c8a30
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/js/bootstrap.min.js
2013-07-23 22:59:33 -07:00
Jacob Thornton
6841c50968
fixes #7814
2013-07-23 22:59:09 -07:00
Mark Otto
b0dd2f902d
Update and add @btn-hover-color to Customize page
2013-07-23 22:53:30 -07:00
Mark Otto
1803b2f09e
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
2013-07-23 22:49:13 -07:00
Mark Otto
1d1bd62598
Fixes #8571 : allow table classes in thead and tfoot
2013-07-23 22:27:49 -07:00
Mark Otto
a346ea2a1a
make on prev commit
2013-07-23 21:23:13 -07:00
Mark Otto
2447f03758
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-23 21:22:52 -07:00
Jacob Thornton
faba6808b7
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-23 20:53:32 -07:00
Jacob Thornton
72d2661ff0
fixes #8232
2013-07-23 20:53:12 -07:00
Mark Otto
00976ff09a
Merge pull request #8576 from sfaxon/3.0.0-wip
...
update carousel js docs to reflect leading .glyphicon
2013-07-23 20:17:40 -07:00
Mark Otto
ced204c774
Clear up license FAQs by using "Bootstrap" as noun instead of "Twitter open source software"
2013-07-23 20:16:02 -07:00
Mark Otto
984a0d1c78
Update link to blog
2013-07-23 19:52:44 -07:00
Seth Faxon
13f2a68a23
update carousel js docs to reflect leading .glyphicon
...
https://github.com/twitter/bootstrap/pull/6342 icons section
mentions the change to using glyphicon base class
this adds it to the docs
2013-07-23 19:38:23 -07:00
Jacob Thornton
faa00629c4
add additional carousel test
2013-07-23 18:56:00 -07:00
Jacob Thornton
68e87183a0
fixes #8134
2013-07-23 18:54:00 -07:00
Jacob Thornton
f1009c19b3
revert collapse change + add emulateTransitionEvent to catch dead css transitions
2013-07-23 18:44:08 -07:00
Jacob Thornton
43e5e90a6d
shown.bs.modal fix
2013-07-23 17:32:20 -07:00
Jacob Thornton
7b12a0dcbc
fixes #7970
2013-07-23 17:23:02 -07:00
Mark Otto
e87508854e
Merge pull request #8572 from mohnish/patch-1
...
Use input type `password` for the password field in the CSS documentatio...
2013-07-23 14:23:17 -07:00
Mark Otto
29b4caf1d5
Merge pull request #8573 from cvrebert/patch-2
...
getting-started.html: add <code> around mention of `placeholder`
2013-07-23 14:22:59 -07:00
Chris Rebert
d8583a1064
getting-started.html: add <code> around mention of placeholder
2013-07-23 13:00:28 -07:00
Mohnish Thallavajhula
4629bed2c4
Use input type password for the password field in the CSS documentation.
2013-07-23 11:50:01 -07:00
Mark Otto
4cec956e0c
Drop rounded corners on .table-bordered
...
* Cuts close to 100 lines of CSS from the table CSS
* File size aside, this drastically simplifies CSS for folks looking to
build on top of the `.table-bordered` option as a starting point
2013-07-23 10:48:30 -07:00
Mark Otto
b5f2482a58
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-23 10:19:04 -07:00
Mark Otto
8aa3c375f0
No more left margin on dd elements, fixes #8567
2013-07-23 10:18:34 -07:00
Mark Otto
e7b0f4e81f
Merge pull request #8564 from frabrunelle/3.0.0-wip
...
@badge-bg should be @gray-light not #f5f5f5
2013-07-23 10:05:49 -07:00
Francis Brunelle
4b9cacae91
@badge-bg should be @gray-light not #f5f5f5
2013-07-23 00:05:45 -04:00
Mark Otto
0b1ddeb353
fixes #8559
2013-07-22 14:44:36 -07:00
Mark Otto
98ce40d0f6
Merge pull request #8549 from ggam/patch-2
...
Updated readme.md to reflect the latest changes in directory structure
2013-07-21 16:07:55 -07:00
Guillermo González de Agüero
abb1013f25
Updated readme.md to reflect the latest changes in directory structure
2013-07-21 21:57:41 +02:00
Mark Otto
12468c6103
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
dist/css/bootstrap.min.css
2013-07-21 08:52:25 -07:00
Mark Otto
582e9986a8
Merge pull request #8546 from jeroenvisser101/patch-1
...
Fixed typo
2013-07-21 08:50:12 -07:00
Mark Otto
e78ba0ff82
Merge pull request #8545 from liuyl/refactor-btngroups
...
refactor button-groups.less
2013-07-21 08:49:52 -07:00
Mark Otto
832fdf9a36
Merge pull request #8544 from liuyl/removeuseless
...
remove useless display:inline-block
2013-07-21 08:49:34 -07:00
Jeroen Visser
c926309371
Fixed typo
2013-07-21 14:20:21 +02:00
liuyl
f5fc6254c7
refactor button-groups.less
2013-07-21 20:03:59 +08:00
liuyl
be2693369d
remove useless display:inline-block
2013-07-21 19:44:30 +08:00
Mark Otto
a63db4d2f9
Update file input to remove height and line-height
...
This particular form control is wildly inaccurate across browsers, so
we're removing the `height` and `line-height`, but adding `display:
block` so it renders similarly to our other inputs.
2013-07-20 21:09:03 -07:00
Mark Otto
df851b40d1
Update docs on responsive images and elaborate on IE8 support using Respond.js
2013-07-20 20:58:23 -07:00
Mark Otto
d651c01e10
Update forms example to show sequential form inputs for later testing
2013-07-20 20:11:53 -07:00
Mark Otto
51dfa21009
Remove more commented out CSS from forms
2013-07-20 19:32:21 -07:00
Mark Otto
732e4196fb
Remove commented out CSS
2013-07-20 19:31:56 -07:00
Mark Otto
6952d655f4
Merge pull request #8538 from brentmulligan/3.0.0-wip
...
Update Normalize.css URL to new Github.io domain
2013-07-20 16:58:00 -07:00
Mark Otto
3d5e9f0318
Merge pull request #8536 from ggam/patch-1
...
Fixed breadcrumbs link in customize
2013-07-20 16:57:30 -07:00
Brent Mulligan
23015bc7c1
Update Normalize.css URL to new Github.io domain
2013-07-20 15:38:38 -04:00
Guillermo González de Agüero
faa9a22f74
Fixed breadcrumbs link
2013-07-20 14:38:10 +02:00
syed
330f40c864
moving forms, labels and list-group to variables.less
2013-07-20 13:38:27 +05:00
syed
1683e6767a
moving code and dropdowns to variables.less
2013-07-20 13:17:56 +05:00
syed
c2e37414d8
Move inline properties to variables.less
...
moved buttons.less, carousel.less & close.less in this commit
2013-07-20 12:56:20 +05:00
Mark Otto
453346262f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-20 00:11:02 -07:00
Mark Otto
e347fffb14
update headings and nav
2013-07-20 00:10:51 -07:00
Mark Otto
a1065a1ef8
undo change to config exclude
2013-07-20 00:07:04 -07:00
Mark Otto
4b7f63a3a2
Update vars for badges, breadcrumbs; update customize page
2013-07-20 00:03:08 -07:00
Mark Otto
72d913baeb
Move var in customize layout
2013-07-19 23:43:17 -07:00
Mark Otto
c2d3dad15b
Merge pull request #8533 from frabrunelle/bower-link
...
update links to bower
2013-07-19 21:42:30 -07:00
Francis Brunelle
0f8d6e3112
update links to bower
2013-07-19 21:28:21 -04:00
Mark Otto
7c5f7a4e82
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-19 17:36:16 -07:00
Mark Otto
b6238c5f20
Fixes #8385 : update carousel captions
...
* No longer hidden by default--up to users to figure that part out with
longer content
* Cleaned up styles and spacing
2013-07-19 17:36:03 -07:00
Mark Otto
8ab77191ce
Twerk callouts and fix an unstyled one
2013-07-19 17:17:52 -07:00
Mark Otto
6cce56061f
Better code snippets on mobile in docs
2013-07-19 17:09:39 -07:00
Mark Otto
dd3eefc0f9
Merge pull request #8530 from codeodor/3.0.0-wip
...
ignore .files for bower packaging
2013-07-19 16:54:22 -07:00
Mark Otto
95b9f44190
Fixes #8278 : fix on print
2013-07-19 16:49:38 -07:00
Mark Otto
f25d8c0080
hacky way of not showing ads or analytics in local dev
2013-07-19 14:08:16 -07:00
Mark Otto
4b0fa356f3
Variables reorganization and breadcrumbs update
...
* Place component vars alongside the rest of the component vars
* Redo some of the breadcrumbs code to add a var and remove
`text-shadow`
2013-07-19 11:44:35 -07:00
Mark Otto
b1819755b8
Merge branch '3.0.0-wip' of https://github.com/saas786/bootstrap into saas786-3.0.0-wip
2013-07-19 11:29:21 -07:00
Sammy Larbi
b8348416b0
ignore .files for bower packaging
2013-07-19 13:23:17 -05:00
syed
65ee36a7bf
Improved and followed pattern suggestions
2013-07-19 23:14:13 +05:00
Mark Otto
416fd9d19b
Merge pull request #8528 from dtmax/3.0.0-wip
...
typo fixed: highligted source code of second radio button was missing
2013-07-19 09:34:20 -07:00
syed
5e898fa2a1
move breadcrumb.less inline properties and also added @color-2 missed in last commit
2013-07-19 18:39:51 +05:00
syed
b37127e2fc
move badges inline properties to variables.less
2013-07-19 18:29:19 +05:00
syed
95be924926
Move accordion inline properties to variables.les
2013-07-19 18:18:01 +05:00
Max
6f9ed7efeb
typo fixed: highligted source code of second radio button was missing in css.html -> checkboxes & radios -> default section
2013-07-19 13:28:26 +03:00
Mark Otto
710dbb5260
Merge pull request #8524 from jholl/patch-1
...
fix typo / doc components.html responsive menu dropdowns now have ref to...
2013-07-18 21:07:34 -07:00
James Holland
bbe0d0d874
fix typo / doc components.html responsive menu dropdowns now have ref to .dropdown-header instead of .nav-header
2013-07-19 00:04:58 -04:00
Mark Otto
49f2f7fad9
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-18 19:53:53 -07:00
Mark Otto
e440ff4b3f
<input> and <select> sizing update
...
Restores `font-size` and more to the `<select>` element while also
changing from `min-height` to `height` for input sizing.
Fixes #8520 as opened by @ShaunR (would've merged that PR but I moved
everything around right before).
2013-07-18 19:53:32 -07:00
Mark Otto
e160b14223
Merge pull request #8521 from epicyclist/3.0.0-wip
...
Documentation updates.
2013-07-18 19:36:16 -07:00
Christopher Canipe
896d159987
Remove Mustache comment regarding contribution: it's going away.
2013-07-18 20:09:33 -06:00
Christopher Canipe
3e8b3a246a
Clean up tooltip's trigger description in the docs.
2013-07-18 19:41:42 -06:00
Mark Otto
0a3722112c
Add minified CSS to dist folder
2013-07-18 18:33:20 -07:00
Mark Otto
f771bf140d
Merge branch 'bs3_rc1' into 3.0.0-wip
2013-07-18 18:16:50 -07:00
Mark Otto
7bb8817947
finish flattening repo structure; add dist folder of compiled css/js
2013-07-18 18:14:49 -07:00
Mark Otto
a8005b3d0b
flatten docs dir back into root
2013-07-18 17:41:30 -07:00
Mark Otto
820558916f
Fixes #8516 : correct input-small and input-large on select elements
2013-07-18 15:36:41 -07:00
Mark Otto
7d9fb1dda7
Jankily fix input group wrapping with button groups in Firefox ( fixes #8321 , #8429 , and #8067 )
2013-07-18 15:28:38 -07:00
Mark Otto
1f48e83700
Merge pull request #8517 from cvrebert/gloss-unicode
...
add comments to gloss Unicode codepoint hex
2013-07-18 14:43:38 -07:00
Mark Otto
36188d0884
change download button label
2013-07-18 14:08:40 -07:00
Mark Otto
63f070096b
copy change to css page subheading
2013-07-18 14:06:13 -07:00
Mark Otto
5cb0d64686
relative url
2013-07-18 13:51:08 -07:00
Mark Otto
3abfe029ea
vertically center ad
2013-07-18 13:35:55 -07:00
Mark Otto
a34470ac5d
Merge branch 'bs3_old_docs_callout' into bs3_rc1
2013-07-18 13:07:49 -07:00
Mark Otto
9425382376
Merge branch 'bs3_add_ads' into bs3_rc1
2013-07-18 13:07:17 -07:00
Mark Otto
cc63096118
clarify IE support and rearrange getting started docs a bit
2013-07-18 13:05:53 -07:00
Chris Rebert
86efc140e2
add comments to gloss Unicode codepoint hex
2013-07-18 11:49:39 -07:00
Mark Otto
b372661a17
fixes #8206 : Use navbar height var to compute vertical padding on navbar-brand
2013-07-18 02:23:38 -07:00
Mark Otto
64efa86036
for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions
2013-07-18 02:19:13 -07:00
Mark Otto
3ed05f60fd
Quick pass at new touch and favicons
2013-07-18 02:05:41 -07:00
Mark Otto
898ee8f13b
twerk comment
2013-07-18 01:46:31 -07:00
Mark Otto
6e04925328
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41
Fixes #8374 : ensure navbar is always at least 50px
2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-18 01:08:19 -07:00
fat
4b40ee692d
cleaner way of preventing double click events + clean up tests for jshint
2013-07-18 01:07:11 -07:00
Mark Otto
181b276774
Fixes #8397 : better navbar padding with grid gutter stuff
2013-07-18 01:04:54 -07:00
fat
37e899d766
get button js working with actual form elements p cooll
2013-07-18 00:59:31 -07:00
Mark Otto
d87431a29e
spacing and local var rename
2013-07-18 00:56:36 -07:00
Mark Otto
0c45458fcc
Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1
2013-07-18 00:55:36 -07:00
Mark Otto
f757cf4cf3
run make on mixin changes from #8380
2013-07-18 00:50:57 -07:00
Mark Otto
02bddac091
Merge pull request #8380 from joeybaker/patch-1
...
Remove unneeded prefixes from some mixins
2013-07-18 00:50:15 -07:00
Mark Otto
8dc7807dcd
change characters
2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473
Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip
2013-07-18 00:43:48 -07:00
Mark Otto
e7bc9e1c3d
Vurrriables and shit
2013-07-18 00:23:35 -07:00
Mark Otto
79a10feb7a
Fixes #8452 : adds .active to table classes
2013-07-18 00:10:22 -07:00
Mark Otto
87adbf7aa4
make on collapse changes
2013-07-17 23:56:38 -07:00
Mark Otto
e6906040de
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 23:56:27 -07:00
Mark Otto
e5bfd8c00b
Fixes #8441 : remove @font-size-mini
2013-07-17 23:56:20 -07:00
Mark Otto
bc79f8a399
Bump tooltips to use @font-size-small (11px to 12px)
2013-07-17 23:55:58 -07:00
Mark Otto
e57758cbb4
Drop .nav-header for .dropdown-header
...
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
2013-07-17 23:54:09 -07:00
fat
2a4a0f70ef
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 23:52:55 -07:00
fat
b13eecaeec
fixes #7880
2013-07-17 23:52:29 -07:00
Mark Otto
3604b86806
fixes #8477 : use var for rounded image border-radius
2013-07-17 23:41:05 -07:00
Mark Otto
4d73aa60f9
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 23:34:31 -07:00
Mark Otto
d3a139622e
fixes #8491 : add vars for table padding
2013-07-17 23:34:04 -07:00
Mark Otto
ba0c6cd57c
make on prev js changes
2013-07-17 23:33:34 -07:00
fat
59f847e8ee
fixes #7777
2013-07-17 23:30:05 -07:00
fat
8cf04911db
fixes #7776
2013-07-17 23:25:26 -07:00
Mark Otto
d7d1c2a767
add ads to v3 docs
2013-07-17 23:22:28 -07:00
fat
451acb42db
fixes #7755
2013-07-17 23:15:50 -07:00
fat
5cb8bfd7da
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 23:02:15 -07:00
fat
57768d7ea9
fix #7660
2013-07-17 23:01:33 -07:00
Mark Otto
3ad0cf9e94
add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post
2013-07-17 22:58:49 -07:00
Mark Otto
9efba239b6
Merge pull request #8511 from twitter/bs3_remove_examples
...
BS3: Move examples to @twbs/bootstrap-examples
2013-07-17 22:17:30 -07:00
fat
6387d8d5cc
versioning perhaps for jquery i don't even know man
2013-07-17 21:38:52 -07:00
fat
18d23b892c
rebuild js + fixes #7583
2013-07-17 21:35:28 -07:00
fat
2cccc0889f
make sure triggering element is visible before focusing #7521
2013-07-17 21:30:38 -07:00
fat
a7a9a14379
fix @muan's unit test ;)
2013-07-17 21:17:39 -07:00
fat
102df4ff33
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
bf38241f0d
remove duh ugly
2013-07-17 21:10:33 -07:00
fat
eb3333a612
fix #7000
2013-07-17 21:08:50 -07:00
Mark Otto
0df791d1ac
fix link to grid example
2013-07-17 21:04:27 -07:00
Mark Otto
6be1f9d00f
remove colophon include because there's only one layout using it now
2013-07-17 21:02:50 -07:00
Mark Otto
97cdb4215a
link order
2013-07-17 20:44:55 -07:00
Mark Otto
f0d0718322
Merge branch '3.0.0-wip' into bs3_remove_examples
...
Conflicts:
docs/_includes/nav-getting-started.html
docs/examples/navbar-fixed-top.html
docs/examples/navbar-static-top.html
docs/examples/navbar.html
docs/getting-started.html
2013-07-17 20:44:27 -07:00
fat
0f64c21049
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 20:30:09 -07:00
fat
392bf0c9c9
fixes #6691
2013-07-17 20:29:41 -07:00
Mark Otto
bfebf0e490
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 20:18:03 -07:00
Mark Otto
7cc34ea547
fix broken docs callouts
2013-07-17 20:17:56 -07:00
fat
5396c40877
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-17 19:33:49 -07:00
Mark Otto
542e03ae3a
Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam
...
Conflicts:
docs/components.html
docs/css.html
docs/customize.html
2013-07-17 19:33:30 -07:00
fat
f97dd5af49
rebuild doe
2013-07-17 19:33:21 -07:00
fat
13cad5061d
maybe fix this old ass issue #5973
2013-07-17 19:28:43 -07:00
Mark Otto
06d47b0082
Fixes #8360 : Add mention of IE compatibility mode to docs
2013-07-17 19:26:37 -07:00
Mark Otto
f4b9938d8c
Move license FAQs to the docs, add link to side nav
2013-07-17 19:20:08 -07:00
Mark Otto
aa49c919c6
Fixes #8356 : Move browser compatibility from wiki into real docs
2013-07-17 19:08:08 -07:00
Mark Otto
e7be60fd4d
Update readme to point previous releases to GitHub project releases ( fixes #8508 )
2013-07-17 17:21:11 -07:00
Mark Otto
8a79590d05
Remove changelog in favor of GitHub releases
2013-07-17 17:20:47 -07:00
Mark Otto
cb9cc972ed
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-16 13:36:02 -07:00
Mark Otto
5967ef64a3
remove margin from left side of navs since it's no longer being set
2013-07-16 11:49:04 -07:00
Mark Otto
7dbcce30c1
Merge pull request #8498 from cvrebert/patch-1
...
Add missing backtick in comment
2013-07-16 11:27:33 -07:00
Mark Otto
522004e67a
remove webkit-overflow-scrolling from modal for now /cc #8495
2013-07-16 11:26:48 -07:00
Chris Rebert
76063ea739
Add missing backtick in comment
2013-07-16 10:49:59 -07:00
Mark Otto
ced641b107
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-15 12:00:10 -07:00
Mark Otto
6aec8f36fc
fix broken scrollspy example
2013-07-15 12:00:01 -07:00
Mark Otto
fb75ffca55
Merge pull request #8478 from juthilo/3.0.0-customizer
...
Update customizer
2013-07-14 16:56:56 -07:00
Julian Thilo
aab4c95cd2
Update customizer
...
Add all the new things to customizer:
* `@headings-font-family`
* `@container-*`
* darker `@btn-default-bg`
2013-07-14 12:50:14 +02:00
Mark Otto
89555cb61c
Merge pull request #8453 from cvrebert/retina-rename
...
rename .retina-image => .img-retina
2013-07-11 14:17:11 -07:00
Mark Otto
cb117c62eb
Merge pull request #8454 from bassjobsen/patch-2
...
Update forms.less
2013-07-11 14:16:58 -07:00
Mark Otto
9efab70c93
Merge pull request #8455 from cvrebert/control-group-dead
...
rm .control-group from docs since it's no longer in the LESS
2013-07-11 14:16:29 -07:00
Chris Rebert
5d9f51d496
rm .control-group from docs since it's no longer in the LESS
2013-07-11 12:57:44 -07:00
Bass Jobsen
3a17578a94
Update forms.less
...
All variables should be set in variables.less?
2013-07-11 21:24:06 +02:00
Chris Rebert
a41fd16da2
rename .retina-image => .img-retina
2013-07-11 12:07:35 -07:00
Mark Otto
606d6e81d4
Merge pull request #8426 from liuyl/simplify-type
...
simplify type.less
2013-07-09 12:43:15 -07:00
Mark Otto
b2fa51521f
Merge pull request #8430 from juthilo/3.0.0-docs-fixes
...
Dustin the docs again
2013-07-09 12:41:07 -07:00
Julian Thilo
88d76e386f
Dustin the docs again
...
* Fix alllll the links!
* Change all `*.js` in JS plugin docs (no mo `bootstrap-`)
* Fully remove `tr.info`
* Bring nav includes up to date
2013-07-09 15:32:28 +02:00
liuyl
0d5c3c2ecf
simplify type.less
2013-07-09 09:22:36 +08:00
Mark Otto
1045226544
Merge pull request #8415 from cvrebert/code.less-cleanup
...
code.less: cleanup styles that get immediately overriden later in the file
2013-07-08 06:57:37 -07:00
Mark Otto
f69afc1b23
Merge pull request #8414 from cvrebert/dropdowns-LESS-nesting
...
use LESS nesting more in dropdowns.less
2013-07-08 06:56:57 -07:00
Mark Otto
b2b09f679a
Merge pull request #8413 from cvrebert/misc-less-refactoring
...
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
2013-07-08 06:56:35 -07:00
Mark Otto
e0d1b83e25
Merge pull request #8412 from cvrebert/pagination-nesting
...
use nesting more in pagination.less
2013-07-08 06:55:50 -07:00
Mark Otto
46378c7ba3
Merge pull request #8411 from cvrebert/navbar-LESS-nesting
...
more nesting in navbar.less
2013-07-08 06:55:16 -07:00
Mark Otto
b13417525c
Merge pull request #8410 from cvrebert/buttons-nesting
...
more nesting in buttons.less
2013-07-08 06:54:39 -07:00
ClausH
0a72530429
Replace position with offset
2013-07-08 12:02:31 +02:00
Chris Rebert
e40aee9c9e
code.less: cleanup styles that get immediately overriden later in the file
2013-07-07 20:03:52 -07:00
Chris Rebert
7e154740f3
use LESS nesting more in dropdowns.less
2013-07-07 19:54:07 -07:00
Chris Rebert
dcf1b60f2b
refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
2013-07-07 19:46:20 -07:00
Chris Rebert
6bda16f6be
use nesting more in pagination.less
2013-07-07 19:30:51 -07:00
Chris Rebert
d9cd5e4e0c
more nesting in navbar.less
2013-07-07 19:22:18 -07:00
Chris Rebert
6e03639af2
more nesting in buttons.less
2013-07-07 19:16:38 -07:00
Mark Otto
084291aac7
Merge pull request #8408 from cvrebert/progress-bar-variant-mixin
...
extract .progress-bar-variant mix-in
2013-07-07 18:27:43 -07:00
Mark Otto
906d04a4aa
Merge pull request #8407 from cvrebert/label-variant-mixin
...
extract .label-variant mix-in
2013-07-07 18:26:54 -07:00
Mark Otto
65141338df
Merge pull request #8406 from cvrebert/navs-nesting
...
more nesting in navs.less
2013-07-07 18:26:26 -07:00
Mark Otto
03becfb9e3
Merge pull request #8405 from cvrebert/button-groups-nesting
...
more nesting in button-groups.less
2013-07-07 18:25:48 -07:00
Mark Otto
400e9b2a88
Merge pull request #8404 from cvrebert/alert-variant
...
extract .alert-variant mix-in
2013-07-07 18:25:17 -07:00
Chris Rebert
d2fb35d546
extract .progress-bar-variant mix-in
2013-07-07 15:44:18 -07:00
Chris Rebert
a7dd1088d2
extract .label-variant mix-in
2013-07-07 15:38:43 -07:00
Chris Rebert
15bd6eadf3
more nesting in navs.less
2013-07-07 15:31:18 -07:00
Chris Rebert
f12d6401f2
more nesting in button-groups.less
2013-07-07 15:27:06 -07:00
Chris Rebert
e757ddd60f
extract .alert-variant mix-in
2013-07-07 15:21:40 -07:00
Maurice Wahba
8a84da6341
Carousel no longer dependent on glyphicons
...
Used laquo/raquo for control buttons
Updated docs
2013-07-06 22:26:40 +04:00
Mark Otto
95655e7275
Remove more Glyphicons
2013-07-05 14:27:54 -05:00
Mark Otto
fffb37ecea
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:24:40 -05:00
Mark Otto
3279181f42
Merge pull request #8378 from liuyl/aftertosibling
...
optimize breadcrumb
2013-07-05 12:23:14 -07:00
Mark Otto
30c138c4bf
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:22:46 -05:00
Mark Otto
dd691b5c36
Merge pull request #8390 from liuyl/typeahead
...
delete typeahead style
2013-07-05 12:21:49 -07:00
Mark Otto
4f922d6e3f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:21:33 -05:00
Mark Otto
61823dbff1
Move hr to scaffolding.less (out of type.less) and simplify styles
2013-07-05 14:21:05 -05:00
Mark Otto
bc3c69e4e8
Merge pull request #8392 from liuyl/refactpagination
...
refactor pagination.less
2013-07-05 12:19:31 -07:00
Mark Otto
88a266b800
Add tfoot back (addresses more than #8387 )
2013-07-05 14:15:00 -05:00
Mark Otto
14056409c3
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-05 14:13:24 -05:00
Mark Otto
817972724a
Remove further mentions of Glyphicons
2013-07-05 14:11:12 -05:00
liuyl
969529c80e
refactor pagination
2013-07-05 20:18:57 +08:00
liuyl
3bd42511f4
refactor pagination
2013-07-05 20:17:20 +08:00
liuyl
e6529e9588
delete typeahead style
2013-07-05 15:09:16 +08:00
Mark Otto
d483e77553
Merge pull request #8370 from cvrebert/tables-nesting
...
refactor tables.less to use nesting more
2013-07-03 19:39:29 -07:00
Joey Baker
2d56997c61
Remove unneeded prefixes
...
Per caniuse, prefixes for transitions and transforms can be reduced to just `-webkit` and `-ms`. http://caniuse.com/#search=transform
http://caniuse.com/#search=transition
2013-07-03 08:11:28 -07:00
liuyl
5b69d34053
use sibling selector instead of pseudo selector
2013-07-03 20:37:36 +08:00
Chris Rebert
da072fff21
refactor tables.less to use nesting more
2013-07-02 11:42:37 -07:00
Mark Otto
749dc35328
comma for the guardian angel /cc @cvrebert
2013-07-01 20:18:44 -07:00
Mark Otto
a049dcb7f6
Merge branch '3.0.0-responsive-tables' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-responsive-tables
...
Conflicts:
less/mixins.less
2013-07-01 20:06:16 -07:00
Mark Otto
9ed9fba460
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-01 19:49:49 -07:00
Mark Otto
5b2d933524
Fixes #8350 : unfuck Chrome number input element cursor /cc @cvrebert @eintnohick
2013-07-01 19:49:29 -07:00
Mark Otto
526d1399c5
Merge pull request #8348 from Rowno/compiled-font-shorthand
...
Prevent the font shorthand from getting compiled as division
2013-07-01 19:43:15 -07:00
Mark Otto
08b3515fd7
fixes #8345 : use inline-block on .img-responsive
2013-07-01 19:42:43 -07:00
Mark Otto
f8eb9136eb
Merge pull request #8352 from liuyl/simplifytable
...
simplify tables.less
2013-07-01 18:23:17 -07:00
Mark Otto
9da90adb4c
fixes #8068 : add .help-block to form field state mixin
2013-07-01 18:21:19 -07:00
Mark Otto
c9df1db502
fixes #7367 : slightly larger carousel indicators
2013-07-01 18:16:59 -07:00
Mark Otto
7ad9fbef8b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-01 17:32:14 -07:00
Mark Otto
a27ecfccf3
Make more components mixin-friendly
2013-07-01 17:32:07 -07:00
Julian Thilo
fea69df80c
Fix responsive utilities for table elements
...
This change prevents situations where specificity causes some rules to
be overridden by the ones intended for mobile.
* Added mixin `responsive-invisibility()`
* Swapped out `display: none !important;` for new mixin
2013-07-01 21:13:57 +02:00
liuyl
e5e9d5916a
simplify tables.less
2013-07-01 20:29:41 +08:00
Roland Warmerdam
2e8752b26f
Prevent the font shorthand from getting compiled as division
2013-07-01 10:51:08 +12:00
Mark Otto
534eac5242
Merge pull request #8340 from JohnONolan/Fix-Broken-Docs-Links
...
Docs: Fix broken links to navbar component in examples pages
2013-06-29 17:29:19 -07:00
Mark Otto
eeaa70ab4a
Merge pull request #8341 from Quy/3.0.0-wip
...
Remove references to fonts
2013-06-29 17:29:01 -07:00
Mark Otto
3b5f4ed054
Merge pull request #8343 from frabrunelle/reset-left-padding
...
reset left padding for .media-list, .pagination and .pager
2013-06-29 17:28:06 -07:00
Francis Brunelle
6a20810ca4
reset left padding for .media-list, .pagination and .pager
2013-06-29 16:06:14 -04:00
Quy Ton
02351c0589
Remove references to fonts
2013-06-29 07:37:53 -07:00
John O'Nolan
4252dff850
Fixes broken links to navbar component in docs.
2013-06-29 13:21:16 +02:00
Mark Otto
2d2828d36c
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-28 09:25:02 -07:00
Mark Otto
0a92efce0c
Nuke hella things
...
* Any mentions of .btn-mini
* Old docs page that somehow found it's way back
2013-06-28 09:24:46 -07:00
Mark Otto
8ef3002153
Merge pull request #8336 from guilbep/3.0.0-wip
...
removing bootstrap-fonts rule in Makefile for bootstrap rule
2013-06-28 09:20:02 -07:00
Pierre Guilbert
37e4fbf9ca
removing useless space
2013-06-28 14:19:46 +02:00
Pierre Guilbert
a85c11eb45
removing bootstrap-fonts rule in Makefile for bootstrap rule
2013-06-28 14:09:46 +02:00
Mu-An Chiou
55fa1acbd6
Tooltip: apply position class before positioning
2013-06-28 11:05:38 +01:00
Mark Otto
09cdee2f03
Overall responsive img styles
...
`img`s are no longer responsive by default. Instead, use
`.img-responsive` as a class or mixin. Existing `.thumbnail > img` and
`.img-thumbnail` classes now make use of this as a mixin as well.
2013-06-28 00:09:10 -07:00
Mark Otto
1a09eada35
Run make on JS
2013-06-28 00:08:19 -07:00
Mark Otto
8e6d5be8e4
update close button example display
2013-06-27 23:26:04 -07:00
Jacob
d23800c828
Merge pull request #7424 from sody/3.0.0-wip
...
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
2013-06-27 22:36:33 -07:00
Mark Otto
88ece4fc59
fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly
2013-06-27 20:50:21 -07:00
Mark Otto
bf3c5e070e
remove submenus. for more context: http://www.youtube.com/watch?v=ggWyUEuGcWY&feature=youtu.be&t=48s
2013-06-27 20:49:29 -07:00
Mark Otto
89117ec6b2
run make on last commit
2013-06-27 20:18:16 -07:00
Mark Otto
0682068929
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-27 20:17:59 -07:00
Mark Otto
69b7c5a2af
Merge pull request #7995 from hrach/patch-3
...
Fixed mixin btn-pseudo-state background for [disabled] buttons
2013-06-27 20:17:48 -07:00
Mark Otto
d9a662ed1d
fixes #7977 : prevent some table bullshit on input groups
2013-06-27 20:15:44 -07:00
Mark Otto
5156234c23
update grid col mixin to use latest css from grid cols
2013-06-27 19:54:30 -07:00
Mark Otto
ca8ca2177f
fixes #4852 : popover carets fully functional in ie8 holy carp wtfbqq huge shoutout to @PumaOmaR
2013-06-27 19:36:56 -07:00
Mark Otto
6a2858f7bf
make on js i guess? /cc @fat
2013-06-27 19:36:35 -07:00
Mark Otto
81b5e74057
remove glyphicons from compiled css
2013-06-27 19:36:09 -07:00
Mark Otto
416cc6b2ee
fix broke js markup
2013-06-27 19:33:26 -07:00
Mark Otto
51093fde18
fix makefile
2013-06-27 19:27:44 -07:00
Mark Otto
2af67238a4
Merge pull request #8332 from twitter/bs3_remove_icons
...
BS3: Remove Glyphicons
2013-06-27 19:23:55 -07:00
Mark Otto
8cd5d0be71
add docs callout for glyphicons on homepage and CSS page
2013-06-27 19:22:11 -07:00
fat
b06ec345ce
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-27 19:19:57 -07:00
fat
b0da97588e
fixes #6982
2013-06-27 19:19:22 -07:00
Mark Otto
2981f0089f
remove glyphicons from demo component
2013-06-27 18:51:06 -07:00
Mark Otto
879d517cb3
delete icons in assets
2013-06-27 18:49:59 -07:00
Mark Otto
e5a9a1f5ff
remove icons from sidenav
2013-06-27 18:49:37 -07:00
Mark Otto
62f76ad33f
Merge branch '3.0.0-wip' into bs3_remove_icons
...
Conflicts:
docs/components.html
2013-06-27 18:49:05 -07:00
fat
94761c2216
use collapse in dropdown js example
2013-06-27 18:47:35 -07:00
Mark Otto
cb483b6758
Add parens so sublime picks up on syntax highlighting
2013-06-27 18:45:08 -07:00
Mark Otto
7636577681
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-27 18:43:54 -07:00
Mark Otto
c9ccbd2cf0
Fixes #8329 : add !important to .hidden
2013-06-27 18:43:29 -07:00
Mark Otto
cb29ed0751
Merge pull request #8307 from cvrebert/8287-docs-patch
...
Fix #8287
2013-06-27 18:38:34 -07:00
Mark Otto
5e29c42211
remove custom url in jekyll
2013-06-27 18:38:00 -07:00
Mark Otto
296b9d7293
Merge pull request #8313 from jholl/patch-1
...
typo: match doc text and example
2013-06-26 11:42:04 -07:00
Mark Otto
68792fc1f9
Merge pull request #8306 from cvrebert/styling-n-typo
...
Docs: fix 1 typo; use <code> in 1 place
2013-06-26 11:20:14 -07:00
Mark Otto
cd4f131c49
Merge pull request #8305 from cvrebert/copyedit
...
copyedit JS docs
2013-06-26 11:19:43 -07:00
Julian Thilo
b4e0e4fee6
Adjust info callout, add callouts to docs
...
* Adjust the background-color of bs-callout-info to match danger and
warning in tone
* Convert all the callouts
* Change some callouts to info/warning
* Add new callout
2013-06-26 15:59:33 +02:00
James Holland
2471b9d725
typo: match doc text and example
2013-06-26 08:27:12 -04:00
Chris Rebert
242d92e09c
Fix #8287
2013-06-25 20:18:30 -07:00
Chris Rebert
274a342657
Docs: fix 1 typo; use <code> in 1 place
2013-06-25 19:50:37 -07:00
Chris Rebert
694c650f8e
copyedit JS docs
2013-06-25 19:32:17 -07:00
Mark Otto
cc43ba35d7
Merge pull request #8301 from cvrebert/patch-3
...
Fix spelling in comment
2013-06-25 17:11:31 -07:00
Mark Otto
0f371d409f
Merge pull request #8300 from cvrebert/patch-2
...
Fix typo in comment
2013-06-25 17:11:20 -07:00
Mark Otto
2da485d6bb
Merge pull request #8299 from cvrebert/patch-1
...
Spelling in comment
2013-06-25 17:10:59 -07:00
Mark Otto
5c9bd469ae
Merge pull request #8303 from cvrebert/patch-4
...
Fix 2 typos
2013-06-25 17:10:34 -07:00
Mark Otto
ae9fde5cab
Merge pull request #8304 from cvrebert/patch-5
...
rm :invalid styling from docs
2013-06-25 17:09:52 -07:00
Chris Rebert
266bdfcaaa
rm :invalid styling from docs
...
It was removed from the code in 90d4343f66 :-/
2013-06-25 16:31:12 -07:00
Chris Rebert
d82941265c
Fix 2 typos
2013-06-25 17:07:51 -06:00
Bass Jobsen
321190535f
Update mixins.less
...
Add a the function .make-small-column. See also http://stackoverflow.com/a/17308128/1596547
2013-06-26 01:05:45 +02:00
Chris Rebert
8ee0e39ef9
Fix spelling in comment
2013-06-25 17:05:26 -06:00
Chris Rebert
d2b5f4e45c
Fix typo in comment
2013-06-25 17:03:57 -06:00
Chris Rebert
64a01f01cb
Spelling in comment
2013-06-25 17:01:46 -06:00
Mark Otto
ac90fbf4d8
Merge pull request #8297 from cvrebert/patch-1
...
rm pre{white-space:pre-wrap;} since redundant to Normalize
2013-06-25 14:57:41 -07:00
Mark Otto
73ec8e031b
Merge pull request #8298 from cvrebert/patch-2
...
rm fallback white-space for <code>
2013-06-25 14:57:17 -07:00
Chris Rebert
1bb159aa6f
rm fallback white-space for <code>
...
If my analysis is right, this should be unnecessary.
2013-06-25 15:53:48 -06:00
Chris Rebert
9b97d63188
rm pre{white-space:pre-wrap;} since redundant to Normalize.css
2013-06-25 14:48:57 -07:00
Julian Thilo
f00c885d4c
Docs: create new callout classes
2013-06-25 23:12:36 +02:00
Mark Otto
211d6831fc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-25 13:35:49 -07:00
Mark Otto
6ac063430f
Merge pull request #8290 from juthilo/3.0.0-docs-nothird
...
Add new callouts to docs
2013-06-25 13:34:03 -07:00
Mark Otto
534ba060be
Merge pull request #8292 from cvrebert/patch-1
...
fix "Data attributes" link in JS docs sidenav
2013-06-25 13:32:41 -07:00
Mark Otto
327a951ca3
Move mixin to mixins.less
2013-06-25 13:32:21 -07:00
Mark Otto
03e67e44f9
Merge pull request #8291 from cvrebert/refactor
...
refactor responsive-utilities slightly
2013-06-25 13:28:34 -07:00
Mark Otto
08ab44708d
Merge pull request #8294 from cvrebert/patch-2
...
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 13:26:14 -07:00
Julian Thilo
fe25ebc2af
Recess welcome
2013-06-25 22:22:23 +02:00
Chris Rebert
e46e63463a
fix ID of Normalize heading in docs so that the sidenav can find it
2013-06-25 14:16:39 -06:00
Chris Rebert
4be21c422a
fix "Data attributes" link in JS docs sidenav
...
`#js-data-attributes` => `#js-data-attrs`
2013-06-25 14:09:24 -06:00
Julian Thilo
a87ea9345b
Add IDs, adjust text
2013-06-25 21:59:34 +02:00
Chris Rebert
83c4073ec7
refactor responsive-utilities slightly
2013-06-25 12:23:56 -07:00
Julian Thilo
0f0e7fc376
Add a link to the mailing list for JS help
2013-06-25 21:19:19 +02:00
Julian Thilo
30e5e89fac
Add callout to docs: LESS compiler support
2013-06-25 21:01:13 +02:00
Julian Thilo
abb112173e
Add callout to docs: 3rd-party libs not supported
2013-06-25 20:52:49 +02:00
Mark Otto
e9951385b0
Merge pull request #8283 from luishdez/hotfix/add-on-breaks
...
Fix line breaks on add-ons with spaces
2013-06-25 09:37:56 -07:00
Luis Hdez
9ed5b5e653
Fix line breaks on add-ons with spaces
2013-06-25 14:34:57 +02:00
Mark Otto
5fe3de1cb3
Merge pull request #8270 from kylase/3.0.0-wip
...
Replaced <i> with <span> for glyphicon
2013-06-23 21:26:56 -07:00
Kyle
c455d92f9e
Replaced <i> with <span> for glyphicon
2013-06-24 11:27:05 +08:00
Mark Otto
55120d124c
Merge pull request #8268 from luishdez/hotfix/sidebar-overlap
...
Fix overlap sidebar for Tablets and up in docs
2013-06-23 15:16:25 -07:00
Mark Otto
573a197417
Move grid offsets to desktop only ( fixes #8229 )
2013-06-23 15:15:42 -07:00
Mark Otto
164e88781b
Make on previous commits
2013-06-23 15:05:58 -07:00
Mark Otto
b76d98eee3
Fixes #8211 : restore proper table grid class behavior
...
Needs work though—we shouldn't be setting this stuff with the attribute
selectors, but it's the easiest solution for now.
2013-06-23 15:05:50 -07:00
Luis Hdez
5af22ab89f
Fix overlap sidebar for Tablets and up in docs
2013-06-23 23:15:32 +02:00
Mark Otto
2a47037ab0
Fixes #8266 : remove unnecessary strong and em styles
2013-06-23 10:24:50 -07:00
Mark Otto
976322b2a6
run make on previous merge
2013-06-22 18:56:55 -07:00
Mark Otto
bd2295014d
Merge pull request #8261 from frabrunelle/patch-1
...
Reset left padding for .carousel-indicators
2013-06-22 18:56:20 -07:00
Francis Brunelle
7fd121fecb
Reset left padding for .carousel-indicators
2013-06-22 21:38:02 -03:00
Mark Otto
42f101d746
Merge pull request #8258 from aristath/navbar-fixes
...
Navbar fixes
2013-06-22 15:07:49 -07:00
Aristeides Stathopoulos
72183d9a45
Update variables.less
2013-06-22 18:45:25 +03:00
Aristeides Stathopoulos
aad76f21f6
Update navbar.less
2013-06-22 18:44:04 +03:00
Aristeides Stathopoulos
b51e1e0d8c
Update navbar.less
2013-06-22 14:41:31 +03:00
Aristeides Stathopoulos
2ba3b47dc6
Update navbar.less
...
navbar padding-left and padding-right should be calculated from the grid-gutter-width variable.
2013-06-22 14:34:17 +03:00
Aristeides Stathopoulos
9360a25abf
Merge pull request #10 from twitter/3.0.0-wip
...
3.0.0 wip
2013-06-22 04:26:09 -07:00
Mark Otto
b0e943399d
Improve alignment of navbar brand and fix up left padding on list groups
2013-06-21 17:21:44 -07:00
Mark Otto
eba9b4de6c
Reset padding on homepage links
2013-06-21 11:56:47 -07:00
Mark Otto
356100e74e
Merge pull request #8251 from acmetech/3.0.0-wip
...
Remove offcanvas from footer and change placeholder in css.html
2013-06-21 09:11:54 -07:00
Tom Pietschker
9d43fbb57e
Remove the offcanvas js from the footer
...
This was moved inline in 65ad52060e
2013-06-21 10:03:28 -04:00
Tom Pietschker
8ef3df418f
Rename class name in placeholder
...
applies 2535e060a4 to css.html. Wasn't
docs.html removed a while ago?
2013-06-21 09:59:34 -04:00
Mark Otto
2535e060a4
Merge pull request #8244 from Quy/3.0.0-wip
...
Rename class name in placeholder
2013-06-20 22:55:11 -07:00
Quy Ton
ac1058e435
Rename class name in placeholder
2013-06-20 18:44:19 -07:00
Mark Otto
ef8e5853cb
Fixes #8154 : enforce full width .navbar-nav.pull-right in mobile
...
Prevents an odd alignment issue in mobile views by forcing the nav
links to be full width without undoing the float.
2013-06-20 17:15:09 -07:00
Mark Otto
82f9de9459
Fixes #8159 : Be more specific about disabled inputs to avoid iOS bug
...
Attached disabled styles to the exact input types rather than all
inputs and reseting the checkbox/radios. If setting `background-color:
transparent;`, iOS renders no background on the disabled control.
2013-06-20 17:02:10 -07:00
Mark Otto
90d4343f66
Fixes #8093 : Removes invalid focus styles on inputs
2013-06-20 16:42:05 -07:00
Mark Otto
4db90244c4
run make on previous commit
2013-06-20 16:27:39 -07:00
Mark Otto
2aec6dae59
Fixes #7730 : Better hiding of empty titles in popovers
...
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.
/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Mark Otto
2fccf927c5
Run make on last commit
2013-06-20 16:02:05 -07:00
Mark Otto
eee719f608
Merge pull request #8193 from mediafreakch/3.0.0-wip
...
Fixes broken layout for .input-group-addons within .input-large. Follows...
2013-06-20 15:44:08 -07:00
Mark Otto
f64fe29003
Move Glyphicons into their own repo
...
Removes the icon fonts and associated docs and LESS code from the core
repo and into twbs/bootstrap-glyphicons.
2013-06-20 15:40:37 -07:00
Mark Otto
1b89a63a48
Use @font-family-base for headings font-family variable
2013-06-20 15:38:18 -07:00
Mark Otto
3c60645ec0
Merge pull request #8237 from luishdez/feature/var-heading-family
...
Add heading font family variable
2013-06-20 15:36:49 -07:00
Mark Otto
c5fb401a62
Move examples out of the main repo to twbs/bootstrap-examples
...
While examples are phenomenally useful and awesome for folks getting
started with Bootstrap, they don't really shine as well being buried in
the main docs. Moreover, having anything that's not core HTML, CSS, JS,
or documentation in the main repo seems to just get in the way.
Therefore, examples gets its own repo.
Specifically, we're doing the following:
* Deletes all example screenshots
* Deletes example layout
* Deletes example files
* Updates Getting Started docs to include only the template and a link
to the new examples project
All the examples and their history will be preserved in the switch.
2013-06-20 12:36:27 -07:00
Mark Otto
8383209521
run make on @nextgenthemes last commit
2013-06-20 09:58:21 -07:00
Mark Otto
175e4676dd
Merge pull request #8241 from nextgenthemes/3.0.0-wip
...
rename '.navbar .nav' to '.navbar-nav'
2013-06-20 09:57:18 -07:00
nextgenthemes
110fc88601
rename '.navbar .nav' to '.navbar-nav'
2013-06-20 19:40:30 +03:00
Luis Hdez
cd09f3213b
Add heading font family variable
2013-06-20 12:50:30 +02:00
Mark Otto
65ad52060e
Offcanvas example update
...
* Remove plugin file and put JS inline
* Update grid layout to use tablet columns
* Switch from LESS to CSS for transition
* Pad footer sides for better mobile rendering
* Spacing cleanup
2013-06-19 20:31:03 -07:00
Mark Otto
b0bece66f2
Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumbitta-offcanvas-example
2013-06-19 19:13:38 -07:00
Mark Otto
5fcdf1229d
Fixes #8001 : add IDs for example inputs
2013-06-19 19:02:29 -07:00
Mark Otto
badececcdf
Merge pull request #8233 from zurt/patch-1
...
Add missing property to form-horizontal docs
2013-06-19 18:02:47 -07:00
Kurt MacDonald
98a8eaffc0
Add missing property to form-horizontal docs
2013-06-19 17:08:14 -06:00
Mark Otto
546d40a143
Add support for tr, th, and td to responsive utilities
2013-06-18 19:16:50 -07:00
Mark Otto
112dabb3c2
run make on last commit
2013-06-18 19:16:50 -07:00
Mark Otto
986c22a5c6
Merge pull request #8210 from cvrebert/backticks
...
docs/javascript.html: backticks -> <code>
2013-06-18 14:40:13 -07:00
Chris Rebert
7b60d04f0c
docs/javascript.html: backticks -> <code>
2013-06-18 14:35:37 -07:00
Edgar Schnueriger
6a79f53899
Use correct font-size to calculate input-heights
2013-06-18 21:43:34 +02:00
Mark Otto
4b4079b224
Addresses #8199 : darker default button
2013-06-18 11:16:43 -07:00
Mark Otto
c6c3009dd0
Add note about Jekyll version per #8195
2013-06-17 21:36:03 -07:00
Mark Otto
4130a1093d
Merge pull request #8182 from karelvuong/3.0.0-wip
...
3.0.0-wip - Fixed 'Running Doc. Locally" Link
2013-06-17 21:34:31 -07:00
Mark Otto
bcc3af4b2a
Fixes #7599 : Improved print styles for a few key components
...
* Updates `.table` to always enforce a solid white background
* Update button groups and dropdowns to always use black carets
* Add a 1px solid black border to labels (in the future we should add a
border to these perhaps for better printing)
2013-06-17 20:56:02 -07:00
Mark Otto
37f4a25be4
Better clearing on .dl-horizontal for empty dd elements
...
Instead of clearing the entire `.dl-horizontal`, we've moved the
clearfix mixin to the `dd` level to solve two problems in one: empty
`dd`s mid-list, and empty `dd` as the last child.
Addresses a few old issues, including #2824 , #3819 , #3821 , #4062 ,
#6707 , and #7180 .
Sorry that took so long :D.
2013-06-17 14:21:16 -07:00
Mark Otto
4436e727ed
Properly unstyle the .list-unstyled class by switching from margin to padding
...
Also add better comments
2013-06-17 14:21:16 -07:00
Mark Otto
84c0dc13ba
Remove explicit, unncessary line-height on li elements
2013-06-17 14:21:16 -07:00
Mark Otto
731cbb302e
Better base ul and ol styles
...
Turns out we were nixing the default browser spacing for bullets and
numbers, so this reverts that and instead just twerks the top/bottom
`margin`.
2013-06-17 14:21:16 -07:00
Edgar Schnueriger
b0d202455d
Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed
2013-06-17 18:56:17 +02:00
Mark Otto
5f3f73c620
Merge pull request #8184 from FLOKER/3.0.0-wip
...
redundant lines removed
2013-06-16 20:48:27 -07:00
Mark Otto
abfcde4de2
Merge pull request #8189 from cvrebert/patch-2
...
components docs: backticks ==> <code>
2013-06-16 20:45:20 -07:00
Chris Rebert
5c63883062
components docs: backticks ==> <code>
2013-06-16 21:40:50 -06:00
Mark Otto
1555992e35
Merge pull request #8187 from imsky/3.0.0-wip
...
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 20:39:11 -07:00
Mark Otto
ce17746302
Merge pull request #8188 from cvrebert/patch-1
...
CSS docs page: backticks ==> <code>
2013-06-16 20:38:31 -07:00
Chris Rebert
50df5de14f
CSS docs page: backticks ==> <code>
2013-06-16 21:36:56 -06:00
Ivan Malopinsky
c1655e6cbd
upgrade holder to 2.0, update thumbnail examples in docs to fit inside containers
2013-06-16 23:16:56 -04:00
FLOKER
125e472d6f
redundant lines removed
2013-06-16 22:18:46 +02:00
Mark Otto
ac3521fef4
Remove WebKit overflow scrolling for now
2013-06-16 10:56:30 -07:00
Karel Vuong
0b7b40e281
Fixed link.
2013-06-15 22:23:09 -04:00
Mark Otto
6ce154c7ed
Fixes #8175 : Update input min-height vars to fix FF21 input rendering
2013-06-15 11:46:13 -07:00
Mark Otto
258e1d62fb
Fix up broken input group example layouts
2013-06-15 11:37:59 -07:00
Mark Otto
ecf9b020dd
Merge pull request #8168 from marsuboss/patch-2
...
Duplicate ID navbar-example
2013-06-13 13:41:23 -07:00
Mark Otto
ab162fe64e
Merge pull request #8166 from liuyl/package
...
change version of recess to 1.1.7
2013-06-13 13:41:04 -07:00
Mark Otto
c14f23192a
Merge pull request #8167 from marsuboss/patch-1
...
Duplicate ID drop5
2013-06-13 13:40:40 -07:00
Mark Otto
d363d96f4b
Merge pull request #8169 from marsuboss/patch-4
...
Fix
2013-06-13 13:39:11 -07:00
marsuboss
1421a0e9bb
Fix
2013-06-13 15:50:06 +03:00
marsuboss
436cffdaaf
Duplicate ID navbar-example
2013-06-13 15:36:52 +03:00
marsuboss
c6f51d0919
Duplicate ID drop5
2013-06-13 14:29:34 +02:00
liuyl
2c00a2fe2f
change version of recess to 1.1.7
2013-06-13 19:27:26 +08:00
Mark Otto
949c7cca00
Merge pull request #8156 from baer/toggle-button-fix
...
Docs Customize toggle button used incorrect selectors
2013-06-12 16:59:40 -07:00
Mark Otto
47f8ba98f3
Merge pull request #8158 from baer/download-button-fix-proper
...
Docs "Customize and Download" button didn't send the correct parameters
2013-06-12 16:59:22 -07:00
Eric Baer
6771be1ced
Docs Customize "Customize and Download" button not working properly
2013-06-12 14:01:59 -06:00
Eric Baer
7f8703ef86
Docs Customize toggle button used incorrect selectors
2013-06-12 12:51:10 -06:00
Mark Otto
40751305f8
Merge pull request #8124 from eins78/3.0.0-wip-fix-json
...
fix JSON syntax error in composer.json
2013-06-10 16:37:29 -07:00
Max F. Albrecht
3a02d07aca
fix JSON syntax error in composer.json
2013-06-10 14:59:42 +02:00
Ivan Khalopik
e138b0df3a
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
2013-06-10 10:31:51 +03:00
Mark Otto
d74a9634b0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-09 23:45:23 -07:00
Mark Otto
9fac2c0467
Update docs JS to prevent clicks on links with hash hrefs
2013-06-09 23:45:14 -07:00
Mark Otto
9ba11ba60a
No more need for grid column highlighting, so nuke that
2013-06-09 23:44:14 -07:00
Mark Otto
0a18d33d2c
Redo grid documentation
...
* Update example sections to include basic, mobile-desktop, and mobile-tablet-desktop implementations
* Add more examples to the grid example page
* Red columns instead of gray for more Bootstrapy aesthetic
2013-06-09 23:43:43 -07:00
Mark Otto
8b136f5b66
Merge pull request #8080 from mladenplavsic/patch-2
...
Update css.html
2013-06-08 20:53:37 -07:00
Mark Otto
254eba37b2
Merge pull request #8097 from burnsra/3.0.0-wip-addons
...
Set validation states also for addons
2013-06-08 20:15:30 -07:00
Mark Otto
eb21410cc8
add new grid subnav link
2013-06-08 18:36:29 -02:30
Mark Otto
441bbe1998
Another grid update
...
* Update docs to include table of grid levels and behaviors
* Change from .col-md to .col-sm to match existing size variables we use elsewhere
* Keep .col-lg as-is though for simplicity as we won't likely add a fourth level of the grid
* Combine responsive .container breakpoints with grid breakpoints in grid.less
* Other misc docs updates
2013-06-08 18:34:16 -02:30
William Ghelfi
df5ddeb7cc
Set validation states also for addons
2013-06-06 21:00:32 -04:00
Mladen Plavsic
232c03dc2f
Update css.html
...
Missing word "in" in "Someone famous in Source Title"
2013-06-05 13:59:13 +03:00
Mark Otto
b1cc11cd98
reverse order of grid column examples for dual grid section
2013-06-04 21:55:59 -07:00
Mark Otto
567b8b5631
fix docs highlighting of grid
2013-06-03 21:58:58 -07:00
Mark Otto
245ebda651
nuke the .col
2013-06-03 21:57:51 -07:00
Mark Otto
45c5b4e45c
restore .col-*-12 classes for now
2013-06-03 21:51:35 -07:00
Mark Otto
286955167a
prep for less 1.4 with double parens in functions
2013-06-03 21:48:52 -07:00
Mark Otto
a05f6d4cea
fixes #8066 : add missing % functions to grid less code
2013-06-03 11:58:38 -07:00
Mark Otto
e5bdb2497e
fixes #8062 : correct link to editorconfig website
2013-06-03 11:55:55 -07:00
Mark Otto
1b8cd2d8eb
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 15:51:35 -07:00
Mark Otto
2f70477621
fixes #8059 : update navbar responsive break variable
2013-06-02 15:51:28 -07:00
Mark Otto
21441f1292
Move the grid offset, push, and pull classes to be tablets-up instead of desktop-up
2013-06-02 15:33:42 -07:00
Mark Otto
e787e5fc68
Merge pull request #8058 from burnsra/3.0.0-wip-navbar-toggle
...
Fix navbar toggles
2013-06-02 15:30:28 -07:00
Mark Otto
4e4e75d4ac
homepage url change to go with it for v3
2013-06-02 15:26:10 -07:00
Mark Otto
05be4de8b8
fixes #7915 : add issues link to composer
2013-06-02 15:25:19 -07:00
Mark Otto
56d6fea45e
fixes #7018 : authors, not author, in composer
2013-06-02 15:22:53 -07:00
Robert Burns
97e6e5f150
Fix navbar toggles
2013-06-02 17:51:36 -04:00
Mark Otto
4fa1e729f0
Merge pull request #8050 from sindresorhus/patch-1
...
Rename component.json to bower.json
2013-06-02 14:40:42 -07:00
Mark Otto
bd170e8366
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 14:08:50 -07:00
Mark Otto
ddf95c91db
Merge pull request #8057 from burnsra/3.0.0-wip-getting-started
...
Fix layout for examples in getting-started
2013-06-02 14:08:21 -07:00
Mark Otto
b5095d3e8a
Merge pull request #8046 from burnsra/3.0.0-wip-carousel
...
Fix for carousel indicators
2013-06-02 13:48:18 -07:00
Mark Otto
19d0726609
Grid updates
...
- Removed mixins for generating grid classes
- Thus, we manually declare every grid class, from 1-11 (12th unit is
excluded as that's the same as no grid columns)
- No more need for `.col` base class (yay!)
- Negative indent the rows at tablets and above once again (ugh, still
working through this part)
- Add support for `.col-md` for tablet-specific grid columns
- Still need to figure out offsets, pushes, and pulls on other
devices—right now only available on desktop
2013-06-02 13:38:45 -07:00
Robert Burns
19ce707a00
Fix layout for examples in getting-started
2013-06-02 15:52:51 -04:00
Mark Otto
b62fa23d9a
Merge pull request #8006 from aristath/3.0.0-wip
...
using screen-size variables for grids
2013-06-02 11:58:30 -07:00
Mark Otto
75db70a6c2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-06-02 11:57:28 -07:00
Sindre Sorhus
ab6dd6e76e
Rename component.json to bower.json
...
That's the new name of the Bower metafile.
2013-06-01 22:59:13 +02:00
Robert Burns
cc684750e5
Fix for carousel indicators
2013-06-01 08:15:40 -04:00
Mark Otto
a4c1248ca0
Merge pull request #8022 from ecentinela/3.0.0-wip
...
Remove form-actions-bg
2013-05-30 13:49:53 -07:00
Javier Martinez Fernandez
c89a6edf09
Remove form-actions-bg
...
If form-actions has been removed, this variable is no needed anymore.
2013-05-29 22:09:33 +03:00
fat
f5ce66177b
fix event binding in modal.js
2013-05-29 11:24:00 -04:00
Mark Otto
8899c30f16
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-27 19:23:17 -07:00
Aristeides Stathopoulos
6fda25b4c1
Adding variables for container sizes
2013-05-27 23:00:39 +03:00
fat
a7a87c8e8c
rebuild
2013-05-27 12:48:16 -07:00
fat
9257bdc097
fixes #7163
2013-05-27 12:45:13 -07:00
Aristeides Stathopoulos
2b088ef44e
using screen-size variables for grids
2013-05-27 19:33:14 +03:00
Ivan Khalopik
3285f4c306
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
...
Conflicts:
js/bootstrap-collapse.js
2013-05-27 11:06:31 +03:00
Jan Škrášek
33b5c32c8c
Fixed mixin btn-pseudo-state background for [disabled] buttons
2013-05-26 18:14:25 +02:00
Mark Otto
60575dfb46
Gradients refactor
...
* Add start and end support to the horizontal gradient as well
* Change all variables from camelCase to use-dashes
* Better comments in the gradients mixins area
* Update current uses of gradients in dropdowns and carousel to specify only two values by direct assignment of variables
2013-05-25 13:16:15 -07:00
Jacob Thornton
7cbb1c0452
add data-ride=carousel support for starting carousel on load
2013-05-25 00:16:52 -07:00
Jacob Thornton
e424b3879c
fixes #4781
2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
2013-05-24 23:15:04 -07:00
Mark Otto
5ea070bdf6
Merge branch '3.0.0-wip' of https://github.com/hppycoder/bootstrap into hppycoder-3.0.0-wip
2013-05-24 21:18:07 -07:00
Mark Otto
f820de4b32
Merge pull request #7980 from burnsra/3.0.0-wip
...
Use base padding for input-group-addon class
2013-05-24 20:55:58 -07:00
Robert Burns
79666385f7
Use base padding for input-group-addon class
2013-05-24 08:14:11 -04:00
Mark Otto
3160bd872e
rearrange customizer content
2013-05-23 21:34:32 -07:00
Mark Otto
371d14e217
Remove commented out code and properly nest CSS again for .collapse
2013-05-23 21:06:02 -07:00
Mark Otto
a3cba92edd
rejigger the customizer layout
2013-05-22 23:45:12 -07:00
Mark Otto
acc0875259
fix up customizer js and classes; turn buttons into real buttons
2013-05-22 23:34:28 -07:00
Mark Otto
432d417ade
fixes #6898 : typo in modal test
2013-05-22 23:17:39 -07:00
Mark Otto
9868d9403c
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-22 21:51:54 -07:00
Mark Otto
cdcc3e8768
delete customize layout since it's no longer in use
2013-05-22 21:50:25 -07:00
Mark Otto
41d2b707ed
Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into 3.0.0-wip
2013-05-22 21:48:35 -07:00
Julian Thilo
52a348aa3f
Bring the customizer up to speed
...
I reworked the customizer to match the new docs layout and include all
newly added variables, etc.
Would be glad to keep an eye on Customize and update it as v3 changes.
Help blocks in my new version need some more work, too, so this is just
a basis.
2013-05-23 02:30:58 +02:00
fat
e7b4fedee8
remove 3rd arg from $.each call
2013-05-22 15:18:30 -07:00
Mark Otto
bb9d867cf8
remove make gh-pages command
2013-05-21 19:56:25 -07:00
Jacob Thornton
7cbec6e89a
remove jszip files
2013-05-21 19:33:57 -07:00
Jacob Thornton
ccfa989898
upgrade jshint to 2.1.2 for anton <3
2013-05-21 19:31:51 -07:00
Mark Otto
59010184cb
Merge pull request #7945 from AJ-Acevedo/fix
...
Fixed broken Customizer link for docs
2013-05-21 14:44:29 -07:00
Mark Otto
ddbfe4af7a
Fixes #7943 : typo in makefile
2013-05-21 14:43:12 -07:00
Chad Smith
c47d9932cb
Found editor spacing issues with tabs instead of spaces, formatting to fit the entrance criteria
2013-05-21 16:29:35 -04:00
Chad Smith
230d6de88a
Vertical gradients now can have percentages passed in as arguments to allow finer control over the backgrounds it produces
2013-05-21 16:25:59 -04:00
AJ Acevedo
9a2218dd38
Fixed broken Customizer link for docs
2013-05-21 02:23:19 -04:00
Mark Otto
930913e0a0
Back to getbootstrap.dev for jekyll
2013-05-20 10:45:01 -07:00
Mark Otto
554c24d9ae
Update contributing file
...
* Remove notes on repo section
* Update hirearchy of coding standards sections
2013-05-20 00:33:08 -07:00
Mark Otto
13a4fb678b
Refactor readme to include directions on running jekyll locally
2013-05-20 00:25:41 -07:00
Mark Otto
0c167a1d9d
Fixes #7474 : Use @input-height-base in .navbar-vertical-align() for .navbar-form
2013-05-19 22:12:48 -07:00
Mark Otto
35573db810
Fixes #7611 : fix optgroup formatting for Firefox
2013-05-19 22:06:10 -07:00
Mark Otto
5f7352a6fe
Better grid template; link color change in docs navbar
2013-05-16 22:11:31 -07:00
Mark Otto
5fbb9e9f5d
More row change ups:
...
* No more negative side margins
* However, keep the negative margin for nested rows
2013-05-16 21:03:56 -07:00
Mark Otto
e94e5e8b40
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:54:14 -07:00
Mark Otto
c0f5a0775d
Run make on latest JS
2013-05-16 20:54:06 -07:00
Mark Otto
9762f95bde
Change up link alerts
...
* No more children selectors to set all links in alerts as a special color because buttons and more wrongly inherited color
* Adds .alert-link for easy styling in any alert
2013-05-16 20:53:59 -07:00
fat
abc49c729b
update js docs
2013-05-16 20:42:31 -07:00
Mark Otto
0f4b4acce1
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:32:37 -07:00
Mark Otto
8a3e982305
Fix broke dropdown navbar example
2013-05-16 20:29:50 -07:00
fat
2433a076ac
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 20:20:27 -07:00
fat
140ef2320b
change namespace back to dot notation and someother js shizzle
2013-05-16 20:19:51 -07:00
Mark Otto
5dd6dbd624
Nuke rem font-size mixin
2013-05-16 20:18:03 -07:00
Mark Otto
1983ca03ec
Form validation and horizontal row update
...
* changed .row-label to .control-label as used elsewhere already
* changed .formFieldState mixin to .form-field-validation
2013-05-16 20:17:42 -07:00
Mark Otto
55a1416789
remove prettyprint js mention
2013-05-16 20:07:48 -07:00
Mark Otto
af0b9cb41a
Simple responsive utilities test css
2013-05-16 20:07:41 -07:00
Mark Otto
e5d6a40a77
Redo the responsive utilities stuff
...
* Update docs language
* Enforce display: block; on all utilities for now
* Fix up docs CSS for the tests
2013-05-16 19:13:58 -07:00
Mark Otto
bdd5022833
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 18:46:19 -07:00
Mark Otto
c73588b313
Drop .form-actions
2013-05-16 18:46:12 -07:00
fat
5ab72f7687
fix tooltip defaults
2013-05-16 18:45:53 -07:00
Mark Otto
d2b588b10e
nuke unfinished readme section
2013-05-16 18:38:09 -07:00
Mark Otto
94dec1bbd2
Update readme link to Bower per #7790
2013-05-16 18:37:00 -07:00
fat
e74110bf4a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-16 18:35:18 -07:00
fat
c072b6b2fc
remove dumb assets update makefile wassup
2013-05-16 18:34:51 -07:00
Mark Otto
d8b749a4d3
Fix z-index of carousel indicators
2013-05-16 18:29:53 -07:00
fat
b239542a5e
carousel bug with data
2013-05-16 18:21:42 -07:00
fat
f37b351288
only overlay dropdowns for mobile
2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a
fix tests
2013-05-16 17:44:50 -07:00
fat
19de2e8603
add bs- prefix to tooltip
2013-05-16 17:19:23 -07:00
fat
149ecd21bf
straight trash wang
2013-05-16 17:18:15 -07:00
Mark Otto
53bc93282f
nuke that docs _site folder
2013-05-16 13:46:12 -07:00
fat
92245e8bc7
change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click
2013-05-16 12:50:06 -07:00
fat
bdbd268cb9
update collapse js style
2013-05-16 11:20:18 -07:00
fat
a4c16155a2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
Makefile
docs/_site/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.min.js
docs/customize.html
docs/docs.html
2013-05-16 11:08:46 -07:00
fat
14651035de
a bunch javascript junk
2013-05-16 11:06:30 -07:00
Mark Otto
f3d8577734
Run make on previous commit; twerk box shadow back to commented out version
2013-05-15 10:16:11 -07:00
Mark Otto
bae9d8adf0
Merge pull request #7897 from voodoom/outline-fix
...
#7896 : Outline fix
2013-05-15 10:14:21 -07:00
Mark Otto
6307dc40d7
Fixes #7898 : ensure button type
...
Sets `type="button"` on all buttons in the docs
2013-05-15 10:01:09 -07:00
m.seegmüller
6289e24f66
Fixed ugly outline in select fields
...
Removes .tab-focus() on select-fields
2013-05-15 16:14:44 +02:00
m.seegmüller
7780133c1c
Fixed ugly outline
...
Removes outline (especially on select-elements in firefox)
2013-05-15 15:44:28 +02:00
Mark Otto
31dcb91189
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/assets/css/docs.css
2013-05-14 23:28:09 -07:00
Mark Otto
57856e6cfb
Merge pull request #7877 from burnsra/3.0.0-wip-form-inline
...
Cleanup form-inline examples in docs
2013-05-14 23:26:35 -07:00
Mark Otto
fcb7c9da6f
Fixes #7878 : .col-span-* mentions to .col-lg-*
2013-05-14 23:24:29 -07:00
Mark Otto
28a081cb20
Overhaul form control and button sizing, and some type styles
...
* New padding approach with separate horizontal and vertical padding
variables
* Improved sizing in large and small buttons and form controls
* Dropped the `.btn-mini` (since we have no `.input-mini` to match, and
holy fuck those were small buttons)
* Dropped the `.pagination-mini` as well because once again, to hell
with such small components
* Changed `@line-height-headings` to `@headings-line-height`
* Removed the `@headings-font-family` because it was honestly kind of
useless
2013-05-14 23:21:30 -07:00
Mark Otto
a41d566d5e
margin on bottom of navbar nav by default, also round links in mobile views (unround in desktop)
2013-05-14 22:08:56 -07:00
Mark Otto
e56c809492
refined navbar styles in docs
2013-05-14 22:08:32 -07:00
Mark Otto
7e674efa22
outdent the file list
2013-05-14 22:00:08 -07:00
Mark Otto
0ac1af13d3
Merge pull request #7882 from juthilo/3.0.0-wip
...
Cleaning the navbar docs
2013-05-14 19:43:59 -07:00
Mark Otto
e23f661f3f
Fixes #7885 and #7886 : only right align horizontal form labels when above 768px
2013-05-14 18:59:13 -07:00
Mark Otto
1d8ff36afa
Add .panel-footer
2013-05-14 18:55:37 -07:00
Julian Thilo
cd2d7b5d17
add detail to navbar component alignment section
...
* The search form has been deprecated.
* Using pull-* on a list item won't have any effect.
2013-05-14 22:42:06 +02:00
Julian Thilo
9af88380c4
.navbar docs: update -fixed-* callouts, fix -link
...
* The navbar is now always 50px high, so no need for that nasty padding
code block anymore.
* The new proposed body padding value also reflects the default navbar's
margin-bottom.
* Fixed the navbar-link example positioning (missing .navbar-text).
2013-05-14 22:31:15 +02:00
Robert Burns
45f62f9589
Cleanup form-inline examples in docs
2013-05-14 08:33:49 -04:00
Mark Otto
8544ef8734
Merge pull request #7874 from burnsra/3.0.0-wip-form-examples
...
Fix glyphicon in "Dropdown in a button group" example
2013-05-13 19:15:05 -07:00
Robert Burns
da9cf1009b
Fix glyphicon in "Dropdown in a button group" example
2013-05-13 21:40:48 -04:00
Mark Otto
5ebd6a4966
Merge pull request #7872 from burnsra/3.0.0-wip-caret
...
Fix caret position
2013-05-13 17:21:05 -07:00
Robert Burns
a38a3429fc
Fix caret position
2013-05-13 20:03:53 -04:00
Mark Otto
8ae6256262
Merge pull request #7866 from marsuboss/patch-3
...
Fix
2013-05-13 12:02:32 -07:00
marsuboss
4eeebe7e06
Fix
2013-05-13 15:50:02 +03:00
Mark Otto
37898d5e19
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-13 00:09:35 -07:00
Mark Otto
2c6e854eea
fix broken responsive utilities table
2013-05-12 23:54:10 -07:00
Mark Otto
dd7bb71554
spacing
2013-05-12 21:00:37 -07:00
Mark Otto
2093635de1
Merge branch '3.0.0-wip' of https://github.com/rvinay88/bootstrap into rvinay88-3.0.0-wip
2013-05-12 20:57:07 -07:00
Mark Otto
e9f42ecfda
Merge pull request #7861 from burnsra/3.0.0-wip
...
Couple of fixes for docs and examples
2013-05-12 19:20:55 -07:00
Robert Burns
d4546cbcc2
Fix buttons within examples
2013-05-12 22:04:22 -04:00
Robert Burns
046d82f0ef
Fix invalid input within docs
2013-05-12 22:04:01 -04:00
Mark Otto
79a4269430
Fix navbar button docs
2013-05-12 16:34:12 -07:00
Mark Otto
41a76e8e7a
Less specific dropdown styles, change up navbar dropdown styles
2013-05-12 16:30:54 -07:00
Mark Otto
09098a7923
run make on last commit
2013-05-12 16:13:51 -07:00
Mark Otto
da4e7ab15c
fix broke example
2013-05-12 16:13:39 -07:00
Mark Otto
37c1122ded
Consolidate active dropdown toggle styles and comment out the rest
2013-05-12 16:12:13 -07:00
Mark Otto
2d10d61fde
Restore commented out dropdown styles, get open dropdown state working again
2013-05-12 16:03:56 -07:00
Mark Otto
92adcfabb5
Start some nav and dropdown cleanup
...
* Remove border-radii on top of tab dropdown menus
* Remove the .dropdown and .dropup styles and instead place on all
* Use on dropdown carets intead of separately applying margin with a top alignment
* Some other misc cleanup
2013-05-12 15:47:18 -07:00
Vinay Raghu
ca5685c1f8
Timestamp correction 2
2013-05-12 12:25:56 +05:30
Vinay Raghu
3b6b9b3fa6
Timestamp correction
2013-05-12 12:25:47 +05:30
Vinay Raghu
23b32fec65
Recompiled using makefile recess
2013-12-05 01:36:19 +05:30
Mark Otto
184018837b
Merge pull request #7851 from blakeembrey/input-group-btn-radius
...
[v3] Fix the selectors for the .input-group-btn class
2013-05-11 12:25:46 -07:00
Blake Embrey
60c24ddd97
Fix the selectors for the .input-group-btn selector.
2013-05-11 09:38:48 -07:00
Vinay Raghu
9880f7c803
Changed Responsive utilities section in docs/css.html
2013-05-11 19:34:59 +05:30
Vinay Raghu
5e13f57870
Changed Screen Notations on responsive-utilities.less and recompiled the stylesheet
2013-05-11 19:28:59 +05:30
Mark Otto
8051695c87
Merge pull request #7838 from blakeembrey/btn-group-radius
...
Remove the overrides and resets from button groups
2013-05-10 16:35:25 -07:00
Mark Otto
76ecfdfdc1
Font-size and line-height tweaks
...
* Use 1.428 for line-height instead of 1.5
* Use function for full pixel values instead of decimals
2013-05-10 10:33:35 -07:00
Mark Otto
8261866ff2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-10 10:31:52 -07:00
Mark Otto
758cb9d186
twerk nested nav links
2013-05-10 10:29:54 -07:00
Mark Otto
6dee7d5abe
Merge pull request #7845 from aricketson/3.0.0-wip
...
Fix component margin and padding values to use @line-height-computed
2013-05-10 10:05:58 -07:00
Mark Otto
231318e757
Merge pull request #7843 from burnsra/3.0.0-wip
...
Fix link to examples
2013-05-10 10:04:32 -07:00
Aaron
94cc333553
Fix component margin and padding values to use @line-height-computed
2013-05-10 09:21:27 -06:00
Robert Burns
3af1dd1dc8
Fix link to examples
2013-05-10 07:37:14 -04:00
Mark Otto
e34abd02cc
redo docs footer a bit
2013-05-09 17:36:02 -07:00
Mark Otto
562483b907
more nav twerks for getting started page
2013-05-09 17:32:39 -07:00
Mark Otto
dbbd48f7bc
remove duplicate text scaling
2013-05-09 17:29:07 -07:00
Mark Otto
90e4ff73d2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
less/forms.less
2013-05-09 17:22:48 -07:00
Mark Otto
a19fda699d
update reference to value of base line-height
2013-05-09 17:21:18 -07:00
Mark Otto
6fba68eb8b
Unitless line-height
...
* Instead of 20px as @line-height-base, use 1.5
* Update typographic scale for headings to use unitless as well--required some twerking of decimals a bit and some rounding
* Introduce new @line-height-computed value, which takes base font-size and multiplies it by 1.5, for use in padding and margin on components
2013-05-09 17:20:46 -07:00
Blake Embrey
579d566299
Update button groups to use not selector and remove redundant CSS.
2013-05-09 16:53:28 -07:00
Mark Otto
7b6352d2cf
Fix up navbar forms by using inline form as a mixin; fix docs for those
2013-05-09 16:41:35 -07:00
Mark Otto
3c72b1e9a0
remove the input from an example
2013-05-09 16:31:10 -07:00
Mark Otto
1fdfee8de0
Merge pull request #7837 from blakeembrey/input-group-radius
...
Remove input-group border radius resets
2013-05-09 16:30:48 -07:00
Mark Otto
293a3baca3
More forms overhaul
...
* Refactor the .forms-horizontal code--much simpler now and built on the Bootstrap grid system instead
* Remove all the margins on form controls for simpler styling everywhere else--was overriding that way too often
* Drop .help-inline, but keep .help-block
* Drop the unused input grid class overrides
2013-05-09 15:05:06 -07:00
Blake Embrey
9716b73f67
Make the border-radius on input-groups to be overrides instead of resets on every size.
2013-05-09 14:48:27 -07:00
Mark Otto
7a7971d6db
subnav for icons section
2013-05-09 14:08:06 -07:00
Mark Otto
8f9cc5ae81
Merge pull request #7836 from blakeembrey/icon-antialias
...
Make icons antialiased on Webkit browsers
2013-05-09 13:59:18 -07:00
Blake Embrey
4a03d45651
Make icons antialiased on Webkit browsers.
2013-05-09 13:48:02 -07:00
Mark Otto
d5e6bbba27
fix some broke buttons on the js page
2013-05-09 13:28:05 -07:00
Mark Otto
ec39bed94f
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-09 13:19:38 -07:00
Mark Otto
1d6971dc2b
Merge pull request #7835 from blakeembrey/progress-bars
...
Remove backface-visibility from progress bars
2013-05-09 13:18:39 -07:00
Mark Otto
88a4712540
fix broken buttons on css docs
2013-05-09 13:12:40 -07:00
Blake Embrey
cc5e6619b4
Remove backface-visibility from progress bars.
2013-05-09 13:09:33 -07:00
Mark Otto
7fa6ae578b
Update getting started page
2013-05-09 11:40:39 -07:00
Mark Otto
25b6df9944
rename welcome to getting started
2013-05-09 11:20:15 -07:00
Mark Otto
7c94f5ef64
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-09 09:22:58 -07:00
Mark Otto
751eb0bdcc
Fixes #7823 : add mention of container to CSS page; build out CSS overview subnav
2013-05-09 09:22:49 -07:00
Mark Otto
217ac7b7b7
Merge pull request #7824 from burnsra/3.0.0-wip-examples
...
Fix form in navbar
2013-05-09 09:14:31 -07:00
Mark Otto
d731690352
remove lingering typeahead reference in makefile
2013-05-09 09:09:44 -07:00
Robert Burns
3a539abbd2
Fix form in navbar
2013-05-09 07:21:22 -04:00
Mark Otto
766be659c1
.bs-docs-sidenote to .bs-callout
2013-05-08 22:58:54 -07:00
Mark Otto
526dfb7735
.bs-docs-tooltip-examples to .bs-example-tooltips
2013-05-08 22:57:42 -07:00
Mark Otto
09c3a4b3bc
.bs-docs-example to .bs-example
2013-05-08 22:56:29 -07:00
Mark Otto
ac28ad81d0
.bs-docs-footer to .bs-footer; nuke .bs-docs-container css; remove .bs-docs-container from footer
2013-05-08 22:55:17 -07:00
Mark Otto
705063c73a
.bs-docs-social-* to .bs-social-*
2013-05-08 22:54:25 -07:00
Mark Otto
22f212379f
nuke stuff from customizer
2013-05-08 22:53:31 -07:00
Mark Otto
3c3e56ca50
.bs-docs-top to .bs-top
2013-05-08 22:52:48 -07:00
Mark Otto
e5e5f6616c
.bs-docs-header to .bs-header
2013-05-08 22:51:44 -07:00
Mark Otto
67b7a2fc34
docs css reorg
2013-05-08 22:50:41 -07:00
Mark Otto
d7acf4e82d
more work on the sidenav, including small css refactor and new classes
2013-05-08 22:42:42 -07:00
Mark Otto
f09b07dc2a
more navbar and header tweaks
2013-05-08 22:31:49 -07:00
Mark Otto
fa4d4e8d88
new docs page headers
2013-05-08 22:29:53 -07:00
Mark Otto
241d342363
red navbar for docs
2013-05-08 22:24:07 -07:00
Mark Otto
65289bb1ea
make restored top navbar collapsable
2013-05-08 22:17:26 -07:00
Mark Otto
feeaaa6feb
refactor homepage jumbotron masthead doodad
2013-05-08 22:13:56 -07:00
Mark Otto
07aed1abc3
move social buttons to separate include
2013-05-08 22:07:28 -07:00
Mark Otto
edb733ebc7
Super massive docs overhaul
...
* Bring back the navbar up top
* Pull the docs content back into separate pages because a 6.6k line docs file is just crazy
* Recenter the page content and bring back affixed side nav (needs work)
2013-05-08 21:56:08 -07:00
Mark Otto
88dd9de9ba
Drop typeahead.js--instead try Twitter's typeahead plugin
2013-05-08 20:04:54 -07:00
Mark Otto
54561f1121
hide entire navbar in print views
2013-05-08 19:57:42 -07:00
Mark Otto
1cb880b4f1
Fixes #7816 : revert negative margin on .navbar-nav
2013-05-08 19:55:20 -07:00
Mark Otto
509f2244da
Merge pull request #7809 from twitter/bs3_adding_btn_default
...
BS3: Require .btn-default for all standard buttons
2013-05-08 11:47:43 -07:00
William Ghelfi
7090eb0061
Merge branch 'offcanvas-example' of github.com:trumbitta/bootstrap into offcanvas-example
2013-05-08 14:26:55 +02:00
William Ghelfi
9013ff002a
add offcanvas layout example based on bradfrost/this-is-responsive
2013-05-08 14:25:37 +02:00
Mark Otto
f03d337151
indentation fix
2013-05-07 23:43:51 -07:00
Mark Otto
c459c657f8
Update forms
...
* Overhaul the form control sizing section to only show sizing via grid columns as parents, not as classes on inputs
* Restore the inline-form option
* Restore the bottom margin on form controls and make them block level instead of inline-block
* More misc docs cleanup for forms
2013-05-07 21:56:55 -07:00
Mark Otto
c0e23ad27b
nuke the unused navbar that was leftover
2013-05-07 20:48:37 -07:00
Mark Otto
86598cac6b
Fixes #7796 : change @list-group-active-text to @list-group-active-color
2013-05-07 20:01:57 -07:00
Mark Otto
d7f84d1220
Require .btn-default for regular buttons
...
* Instead of , use for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
2013-05-07 18:07:06 -07:00
Mark Otto
ad5f88e1c5
Update config after updating to jekyll 1.0.1
2013-05-07 18:03:32 -07:00
Mark Otto
79dac4b77a
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-07 10:33:49 -07:00
Mark Otto
f06294d80f
Outdent nav links a bit more so they line up in navbar
2013-05-07 10:33:41 -07:00
Mark Otto
bb307243de
Merge pull request #7806 from koenpunt/patch-1
...
Updated URL for jekyll installation
2013-05-07 09:13:48 -07:00
Koen Punt
739ef39050
Updated URL for jekyll installation
2013-05-07 15:20:28 +03:00
Ivan Khalopik
3c7a43a1f3
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
...
Conflicts:
js/tests/unit/bootstrap-collapse.js
2013-05-07 15:16:45 +03:00
Mark Otto
b352f98f32
Merge pull request #7798 from mediafreakch/3.0.0-wip
...
fixed not working example code for modals
2013-05-06 23:44:12 -07:00
William Ghelfi
01d0cf22ab
add offcanvas layout example based on bradfrost/this-is-responsive
2013-05-06 15:58:18 +02:00
Edgar Schnueriger
240305321f
fixed not working example code for modals
2013-05-06 09:48:05 +02:00
Mark Otto
716c869b89
correct right nav in navbar examples
2013-05-04 15:00:59 -07:00
Mark Otto
49da7d8020
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-04 13:11:31 -07:00
Mark Otto
dcf7cc084d
Fixes #7783 : nuke bottom margin on fixed-bottom-navbar
2013-05-04 13:11:20 -07:00
Mark Otto
d0e79a36d5
Merge pull request #7782 from cvrebert/patch-1
...
use @screen-small var in grid.less
2013-05-04 13:09:53 -07:00
Chris Rebert
e0b9b86d32
use @screen-small var in grid.less
...
Per comment by @nextgenthemes on/in cd06c5baac
2013-05-03 17:38:58 -07:00
Mark Otto
c3b9ac4676
Merge pull request #7621 from jeremydenoun/patch-1
...
Fix flickering on progress bar width update
2013-05-03 17:32:54 -07:00
Mark Otto
7d41a38769
Fixes #7511 : add support for nested button groups so you can use dropdowns in your button groups
2013-05-03 16:16:26 -07:00
Mark Otto
ee0789ff8f
Fixes #7721 : change @navbar-text to @navbar-color, along with inverse options
2013-05-03 15:29:32 -07:00
Mark Otto
a6f7f96a93
recompile after last justified nav tweaks
2013-05-03 15:29:10 -07:00
Mark Otto
4357ed72e0
Update justified nav CSS for proper selectors
2013-05-03 15:18:27 -07:00
Mark Otto
747e108e0b
Merge pull request #7670 from DarDar/3.0.0-wip
...
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-03 15:05:29 -07:00
Mark Otto
af4a33f8c0
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-03 14:57:07 -07:00
Mark Otto
e1d947f53e
Scope .table-bordered styles to immediate children only
2013-05-03 14:56:57 -07:00
Mark Otto
9d9fd5e0d1
remove .fade from static modal example, but include in code snippet
2013-05-03 14:46:09 -07:00
Mark Otto
0959a78ff1
Merge pull request #7769 from holic/3.0.0-sticky-footer
...
Use padding instead of #push with box-sizing: border-box
2013-05-03 14:29:11 -07:00
Mark Otto
7cceaa6956
Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
...
Conflicts:
docs/docs.html
2013-05-03 14:13:06 -07:00
Mark Otto
14861e9cc3
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-03 14:11:23 -07:00
Mark Otto
b5d68f59c2
Add cursor: pointer; to .checkbox and .radio and their inline counterparts
2013-05-03 11:56:00 -07:00
Mark Otto
b0bd5899c5
Merge pull request #7762 from sethlilly/3.0.0-wip
...
Corrected typo in carousel.html
2013-05-03 11:21:13 -07:00
Mark Otto
77102dd2e4
Merge pull request #7770 from holic/3.0.0-input-border-transition
...
Fix input border flicker in Chrome
2013-05-03 10:59:52 -07:00
Mark Otto
1587b8948f
run make on previous commits
2013-05-03 10:53:26 -07:00
Mark Otto
e1c67b149f
More navbar CSS and docs cleanup
...
* Rearrange sections
* Add code snippets for text and links in navbars
* Add .navbar-link back in
* Add mention of .navbar-text, but it still needs to be re-implemented
* Update nav to reflect new order
2013-05-02 23:13:43 -07:00
Mark Otto
94792b9dae
Improve buttons in navbars
...
* Add top margin, calculated by subtracting height of an input from height of a navbar, and dividing by two
* Uses the same method as .navbar-form
* To use, add .navbar-btn to any button outside a form element
* Also add section to docs detailing buttons in navbars, and add more ids for the other unlinked and unmentioned sections in the side nav
2013-05-02 23:05:09 -07:00
Mark Otto
23ae6405f5
delete lingering navbar dividers code since we nuked that awhile back
2013-05-02 22:58:30 -07:00
Mark Otto
bec8c90fd7
Cleanup .navbar-form styles
...
* Nuke the commented out navbar forms code that's not currently needed
* Add a few more examples to the .navbar-form docs section
* Remove (for now at least) top padding on checkbox and radios
2013-05-02 22:54:14 -07:00
Mark Otto
a4f2c9e156
add customizer link to docs homepage
2013-05-02 22:44:43 -07:00
Kevin Ingersoll
08fea3304a
Fix input border flicker in Chrome from @garoevans, closes #7689
2013-05-03 15:33:12 +12:00
Kevin Ingersoll
07117f97b6
Use padding instead of #push with box-sizing: border-box
2013-05-03 15:23:10 +12:00
Seth Lilly
a62e97091c
Corrected typo in carousel.html
...
Changed text from "First featurette headling" to "First featurette heading" in the first `h2.featurette-heading` tag.
2013-05-02 14:03:54 -03:00
DarDar
9cd3a92713
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-02 08:05:00 +02:00
Mark Otto
c63b793a0d
Merge pull request #7750 from hppycoder/3.0.0-wip
...
Updating the README.md to fix the link to Bower
2013-05-01 11:50:29 -07:00
Chad Smith
9237b25300
Updating the README.md to fix the link to Bower
2013-05-01 13:47:52 -04:00
Mark Otto
f8fd524def
add the fade class to the default modal docs
2013-04-30 19:55:02 -07:00
Mark Otto
47155e8aa3
outdent the rows for tablets and above
2013-04-30 19:35:52 -07:00
Mark Otto
0780faad45
make that left/right padding, not top/bottom on navbar
2013-04-30 19:20:41 -07:00
Mark Otto
69f5447afa
add back bottom margin to navbars
2013-04-30 19:12:48 -07:00
Mark Otto
e8b7318646
no need for zero padding on navbar top/bottom; better comment
2013-04-30 19:07:28 -07:00
Mark Otto
6dd4cbd20b
no units on 0 values
2013-04-30 19:06:30 -07:00
Mark Otto
0f17f9b7f7
Fixes #7744 : update grid mixin to use latest grid styles
2013-04-30 13:03:10 -07:00
Mark Otto
e67d3818ed
nuke line numbers
2013-04-30 11:32:11 -07:00
Mark Otto
26bc36107e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 22:46:10 -07:00
Mark Otto
e13d05317e
single colon pseudo element for ie8
2013-04-28 22:45:56 -07:00
Mark Otto
0cb1188a9c
Merge pull request #7718 from burnsra/3.0.0-wip-breadcrumbs
...
Cleanup breadcrumb divider last item
2013-04-28 20:14:26 -07:00
Mark Otto
57564cf64c
Merge pull request #7719 from burnsra/3.0.0-wip-grid-examples
...
Update examples after grid changes
2013-04-28 20:05:15 -07:00
Robert Burns
62afdd0176
Update examples after grid changes
2013-04-28 22:22:33 -04:00
Robert Burns
447be1b326
Cleanup breadcrumb divider last item
...
Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion
2013-04-28 21:51:02 -04:00
Mark Otto
cd06c5baac
Merge pull request #7704 from twitter/bs3_moar_grid_changes
...
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Mark Otto
781692ffa2
Merge pull request #7716 from burnsra/3.0.0-wip-navbar
...
Fix navbar-toggle after commit bbee78b30b
2013-04-28 18:42:20 -07:00
Robert Burns
c087e383ed
Fix navbar-toggle after commit bbee78b30b
...
The following commit introduced an issue with the navbar toggle placement:
https://github.com/twitter/bootstrap/commit/bbee78b30b40ff0b1473a06ea7ecf5a42d51b614
2013-04-28 20:45:42 -04:00
Mark Otto
5edfdc02f2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 14:27:58 -07:00
Mark Otto
bbee78b30b
derp on navbar toggle and docs positions
2013-04-28 14:27:48 -07:00
Mark Otto
227c4639e4
Merge pull request #7713 from burnsra/3.0.0-wip-navs-overhaul
...
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 14:26:10 -07:00
Mark Otto
1a28d50b33
Merge pull request #7712 from burnsra/3.0.0-wip-navs
...
Update examples after navbar overhaul
2013-04-28 14:24:49 -07:00
Robert Burns
3326e1b21e
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 10:09:57 -04:00
Robert Burns
ddc0e98716
Update examples after overhaul of navbar navs
2013-04-28 09:10:01 -04:00
Mark Otto
8b3a1702d4
Overhaul navbar navs
...
* Switch from to to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Mark Otto
2ffa0e4409
Add maximum bounds variables for so our responsive utilities don't overlap
2013-04-27 11:55:45 -07:00
Kevin
9ce7f22e99
Adding media queries breakpoints variables
2013-04-27 18:47:47 +02:00
Mark Otto
efd3b0c171
Back to two grid classes, .col and .col-lg-*
2013-04-26 23:59:51 -07:00
Mark Otto
8ae9c6ab34
Fixes #7688 : move font-weight for glyphicons to before pseudo element
2013-04-26 23:14:06 -07:00
Mark Otto
aa146582d6
Redo the getting started section to mention BootstrapCDN
2013-04-26 20:51:48 -07:00
Mark Otto
57ba494409
running make
2013-04-26 10:44:44 -07:00
Mark Otto
1fc0d2c0f1
Merge pull request #7641 from Fowowski/3.0.0-wip
...
more nested less rules - labels component
2013-04-25 14:51:41 -07:00
Artur Kwiatkowski
270db6f55e
- changed comments
...
- added hover and focus state for [href] color variations
2013-04-24 14:38:53 +02:00
Stephen Edgar
8311ad513f
'docs' folder .editorconfig code guide updates
2013-04-24 14:38:51 +02:00
Stephen Edgar
f40ea21a6c
'js' folder .editorconfig code guide updates
2013-04-24 14:38:50 +02:00
Stephen Edgar
22a1a7273a
'less' folder .editorconfig code guide updates
2013-04-24 14:38:49 +02:00
Stephen Edgar
75ccaadae0
'root' folder .editorconfig code guide updates
2013-04-24 14:38:49 +02:00
Mark Otto
8a3b212043
shoutout to editorconfig in readme
2013-04-24 14:38:48 +02:00
Mark Otto
da4a08754a
explicit callout in readme for building static assets; fixes #7632
2013-04-24 14:38:47 +02:00
Chris Rebert
159105dad3
Fixes #7661
2013-04-24 14:38:46 +02:00
Stephen Edgar
ec7f2cf2b6
'root' repo end 'insert_final_newline = true'
2013-04-24 14:38:46 +02:00
Stephen Edgar
67fdb27518
Use* global rules with exceptions as needed
2013-04-24 14:38:44 +02:00
Stephen Edgar
dd7249c0f1
Refined .editorconfig
2013-04-24 14:38:44 +02:00
Stephen Edgar
2eb9053d4a
Include .editorconfig
...
http://editorconfig.org/
2013-04-24 14:38:43 +02:00
Mark Otto
3e02d127b3
Merge pull request #7664 from ntwb/editorconfig-3.0.0-wip
...
Editor Config (.editorconfig) Code Guide Update
2013-04-23 08:58:23 -07:00
Stephen Edgar
1a6dbc371e
'docs' folder .editorconfig code guide updates
2013-04-23 17:40:41 +10:00
Stephen Edgar
1b132ddcb4
'js' folder .editorconfig code guide updates
2013-04-23 17:34:27 +10:00
Stephen Edgar
7ebfc17028
'less' folder .editorconfig code guide updates
2013-04-23 17:30:22 +10:00
Stephen Edgar
36ed570b7d
'root' folder .editorconfig code guide updates
2013-04-23 17:27:29 +10:00
Mark Otto
c81f0b5af2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-22 23:04:24 -07:00
Mark Otto
a4f896ef1a
shoutout to editorconfig in readme
2013-04-22 23:02:57 -07:00
Mark Otto
dea134d6ee
explicit callout in readme for building static assets; fixes #7632
2013-04-22 23:01:11 -07:00
Mark Otto
73793637d1
Merge branch 'ntwb-editorconfig' into 3.0.0-wip
2013-04-22 22:58:33 -07:00
Mark Otto
10a1a0af86
Merge pull request #7662 from cvrebert/less-1.4-fixes
...
Fixes #7661
2013-04-22 20:38:14 -07:00
Chris Rebert
269b8aa761
Fixes #7661
2013-04-22 16:11:11 -07:00
Artur Kwiatkowski
55bbb9ffd7
Nuked local .a() mixins and simplified the nesting
2013-04-22 15:34:23 +02:00
Artur Kwiatkowski
b7dcefea83
Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip
2013-04-22 15:21:55 +02:00
Stephen Edgar
08de413608
'root' repo end 'insert_final_newline = true'
2013-04-22 17:19:56 +10:00
Stephen Edgar
4e9c8880f7
Use* global rules with exceptions as needed
2013-04-22 17:10:59 +10:00
Mark Otto
e0d60b1325
Fixes #7617 : lowercase and dash gray color vars
2013-04-21 19:35:36 -07:00
Mark Otto
364f8330a1
Fixes #7648 : Thumbnail caption should use @text-color variable. Also adds other thumbnail vars
2013-04-21 18:29:06 -07:00
Mark Otto
af63a4405d
typo
2013-04-21 18:25:49 -07:00
Mark Otto
30d6e0530e
Fixes #7577 : Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly
2013-04-21 14:50:44 -07:00
Stephen Edgar
7c41b31801
Refined .editorconfig
2013-04-21 16:52:32 +10:00
Mark Otto
4b3a43e381
Fixes #7591 : add .make-small-column() mixin
2013-04-20 15:54:44 -07:00
Mark Otto
2d5ab9a2de
Make alerts use variables better
2013-04-20 15:47:07 -07:00
Mark Otto
dc4436dbc9
Only use .danger for alerts, no more .error
2013-04-20 15:36:11 -07:00
Mark Otto
0c9b161bb8
Fixes #7093 : more consistent scrollspy docs
2013-04-20 15:32:16 -07:00
Mark Otto
510c9a6ad8
First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic
2013-04-20 12:33:09 -07:00
Mark Otto
04d782efab
correct grid class in example code
2013-04-20 12:29:12 -07:00
Mark Otto
70f8d77012
correct grid class mention in docs
2013-04-20 12:28:36 -07:00
Mark Otto
a956a3258b
Alternate docs mention of breadcrumbs separator, as called out in #7601
2013-04-20 12:23:27 -07:00
Mark Otto
e60c07327b
Merge branch 'reversefold-master' into 3.0.0-wip
...
Conflicts:
README.md
2013-04-20 12:13:05 -07:00
Mark Otto
ba7d928c37
Merge pull request #7645 from burnsra/3.0.0-wip-docs
...
Fix carousel examples within docs
2013-04-20 12:11:35 -07:00
Mark Otto
afdab35aca
Fixes #7640 : only reset margin on last-child p within blockquotes
2013-04-20 12:09:08 -07:00
Mark Otto
90b195872e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-20 12:02:43 -07:00
Robert Burns
ce719925af
Fix carousel examples within docs
2013-04-20 13:26:18 -04:00
Artur Kwiatkowski
3861e3f5d5
replaced parametric .is() mixin with non-parametric .a() to simplify usage
2013-04-20 15:54:48 +02:00
Stephen Edgar
322fc9a6c4
Include .editorconfig
...
http://editorconfig.org/
2013-04-20 14:28:50 +10:00
Artur Kwiatkowski
39bb8146f8
more nested labels component
2013-04-19 21:31:55 +02:00
Mark Otto
61ea1ae909
Merge pull request #7598 from wangshishuo/3.0.0-wip
...
change nav's #tables-hover to #tables-hover-rows
2013-04-18 19:48:17 -07:00
Mark Otto
5c9bd1a221
Merge pull request #7608 from Fowowski/3.0.0-wip
...
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Mark Otto
f47aa08bad
Merge pull request #7629 from Boulox/dupe-table-rule
...
Remove dupe css rule of table element
2013-04-18 19:45:56 -07:00
Fabien
7b5fcc2c9a
Remove dupe css rule of table element
...
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Mark Otto
a8391da414
Update mixins to remove Opera prefixes on gradients; reorder rules for consistency
2013-04-18 12:46:31 -07:00
Jeremy Denoun
d3e0d4a7ba
update docs
2013-04-18 17:05:50 +02:00
jeremydenoun
cc15c0e769
Fix flickering on progress bar width update
...
Issue visible on lastest version of Chrome Browser (if you update progress bar width from 100% to 0%) -> flickering appears
Fixed with addition of .backface-visibility(hidden) mixins
2013-04-18 17:44:46 +03:00
Artur Kwiatkowski
4bd6abaff2
applied @pagination-bg for .disabled state instead of hardcoded color in hex
2013-04-17 19:47:23 +02:00
Artur Kwiatkowski
67a5d8ce74
more nested pager.less
2013-04-17 17:32:48 +02:00
wangshishuo
5892cea207
change nav's #tables-hover to #tables-hover-rows
2013-04-17 12:27:30 +08:00
Justin Patrin
496f1933bb
watchr should be lower-case
2013-04-16 13:07:05 -07:00
Mark Otto
da35a6b437
Merge pull request #7590 from Fowowski/3.0.0-wip
...
more nested less rules - navs component
2013-04-16 11:32:53 -07:00
Artur Kwiatkowski
dc97a1967b
more nested navs
2013-04-16 16:45:51 +02:00
Mark Otto
5b38a1a357
Merge branch 'bs3_homepage' into 3.0.0-wip
2013-04-15 00:16:40 -07:00
Mark Otto
5471ce8ea3
Fixes #5256 : Use > selector for better nesting of tables
2013-04-14 20:33:54 -07:00
Mark Otto
ab7070bb49
change var from @table-border to @table-border-color
2013-04-14 19:45:32 -07:00
Mark Otto
02eba5e5fc
center
2013-04-14 16:31:52 -07:00
Mark Otto
7dca242b5e
nuke all the assets
2013-04-14 15:33:48 -07:00
Mark Otto
8d9106f2c5
nuke hidden homepage content
2013-04-14 15:32:52 -07:00
Mark Otto
0b3e9ced54
Merge branch '3.0.0-wip' into bs3_homepage
2013-04-14 13:45:10 -07:00
Mark Otto
526534f337
more copy edits to sidenotes
2013-04-14 13:01:00 -07:00
Mark Otto
ccb6ac570f
lighter .highlight in sidenotes as well
2013-04-14 13:00:53 -07:00
Mark Otto
0a84a7c43d
shorter copy
2013-04-14 12:56:21 -07:00
Mark Otto
32761b3303
use spaces for indenting, not tabs /cc @juthilo
2013-04-14 12:54:56 -07:00
Mark Otto
f78945ccc9
More contrast with code snippets in sidenotes
2013-04-14 12:54:02 -07:00
Mark Otto
5f88887c7e
redo all the things
2013-04-14 12:49:35 -07:00
Julian Thilo
2b228bae60
More work on the sidenotes
...
* Convert more inline advices (compatibility, dependencies, ...) to
sidenotes
* Add sidenotes for:
** Note on plugin dependencies in general
** Required padding for navbar-fixed- (incl. code snippet)
* Fixed text for the small tag
2013-04-14 18:36:11 +02:00
Mark Otto
f226463b05
Restore on links in dropdowns as they are randomly breaking onto new lines
2013-04-13 23:54:51 -07:00
Mark Otto
86bb3b8126
IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1 )
2013-04-13 23:17:39 -07:00
Mark Otto
eefddb1eab
more indenting
2013-04-13 22:49:21 -07:00
Mark Otto
20259e2350
fixes #7191 and cleans up indenting some
2013-04-13 22:48:44 -07:00
Mark Otto
fc8b9fb07d
swap all bold p tags in sidenotes for h4s
2013-04-13 22:10:34 -07:00
Mark Otto
382a86f46e
Merge branch '3.0.0-docs1' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs1
2013-04-13 21:50:17 -07:00
Mark Otto
5fbe66307f
more specific comment, better placement of code
2013-04-13 21:45:21 -07:00
Julian Thilo
d7bc89b433
Sidenotes instead of alerts
...
* I propose: make the docs rely more heavily on the new design language,
replace alerts (not the .alert examples) by sidenotes.
* Remove alert-heading class, which no longer exists in CSS.
2013-04-14 04:04:01 +02:00
Paul Tyng
bec5679264
update docs bootstrap.css
2013-04-13 17:13:14 -03:00
Paul Tyng
811a79e16c
override normalize.css override
2013-04-13 16:46:17 -03:00
Mark Otto
ae98f1803f
add modal variables and tweak padding for min-height on modal title
2013-04-12 20:56:19 -07:00
Mark Otto
a96dd1bd28
Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip
2013-04-12 20:45:10 -07:00
Mark Otto
96f332578c
ignore local ruby version files
2013-04-12 20:43:41 -07:00
Mark Otto
58c8c770d8
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-11 20:18:22 -07:00
Mark Otto
b3bb89520d
add comma; more accurate code snippet
2013-04-11 20:16:20 -07:00
Mark Otto
5b7596a5b3
Merge branch '3.0.0-wip' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-wip
2013-04-11 20:12:53 -07:00
Mark Otto
991a353a26
Merge pull request #7539 from lucaflisi/3.0.0-wip
...
Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
2013-04-11 20:10:00 -07:00
Mark Otto
7acadc09db
Merge pull request #7546 from CoffeeAndCode/3.0.0-wip
...
fixed typo in typography documentation
2013-04-11 19:54:17 -07:00
Mark Otto
f05befff6d
Merge pull request #7537 from ntwb/patch-1
...
Fix docs.html Table Row Danger CSS Class
2013-04-11 19:45:46 -07:00
Jonathan Knapp
0d70b3c54e
fixed typo in typography documentation
2013-04-11 16:02:29 -03:00
lucaflisi
43b0a1287a
Remove BOOTSTRAP_RESPONSIVE_LESS in css compile
...
No more needed in Bootstrap 3
2013-04-11 14:01:23 +02:00
Stephen Edgar
3dc8be74fe
Fix docs.html Table Row Danger CSS Class
2013-04-11 20:24:13 +10:00
Mark Otto
a35b9b7d0c
Merge pull request #7528 from acolchado/3.0.0-wip
...
[3.0.0-wip] Reordering variables that were being used before they were declared. Fixes compiler crashes.
2013-04-10 22:51:41 -07:00
Julian Thilo
78d64e97e9
Dusting the docs
...
* Fix some typos, grammar, sentence structure
* Fix left-over error tr class
* Remove uneditable inputs section
* Make compatibility sections stand out as sidenotes
* Make modal example scrollable on big screens, too
* Make some examples more self-explanatory
2013-04-10 19:18:04 +02:00
Agustin Colchado
7fb1c1cb89
Reordering variables that were being used before they were declared. Under some compilers (dotless & sublime 2 package), this would cause the compile to break. Variables in question were:
...
@dropdown-link-active-bg
@navbar-link-color
@navbar-inverse-link-color
2013-04-10 02:27:11 -07:00
Mark Otto
78df99c8bd
Merge pull request #7523 from juthilo/3.0.0-wip
...
Fully update docs to col-...-* schema
2013-04-09 22:43:30 -07:00
Julian Thilo
ece78ff086
cololol
...
Correct all span, push, pull, offset classes to col- schema
Fix a typo
2013-04-10 00:04:44 +02:00
Mark Otto
24f8d9e137
don't use table for label variatons
2013-04-09 10:43:37 -07:00
Mark Otto
1a546278b9
make back to top and big headings only for tablets and up
2013-04-09 10:20:50 -07:00
Mark Otto
dd533aaaf0
better buttons on mobile
2013-04-09 10:16:37 -07:00
Mark Otto
5b04985722
Merge pull request #7504 from acmetech/3.0.0-wip
...
variable update - fixed
2013-04-08 10:16:15 -07:00
Tom Pietschker
09b97a3b95
hopefully fixed messed up stylesheet...
2013-04-08 08:46:12 -04:00
Tom Pietschker
bd789ed158
Merge remote-tracking branch 'upstream/3.0.0-wip' into 3.0.0-wip
2013-04-08 08:39:22 -04:00
Mark Otto
c2a35f1ec8
Merge pull request #7148 from retlehs/3.0.0-wip
...
Remove -webkit-backface-visibility on skew mixin
2013-04-07 23:01:28 -07:00
Mark Otto
92977fb13e
fixes #7503 : don't do dat
2013-04-07 22:58:16 -07:00
Tom Pietschker
a05ff7e507
rename btn bg variables so that they are consistent with the other variables
2013-04-07 17:52:12 -04:00
Tom Pietschker
c4d8aa2b0f
rename the navbar-inverse-brand variables for consistency
2013-04-07 17:47:53 -04:00
Mark Otto
cfea6d295e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-07 11:49:53 -07:00
Mark Otto
fedf4c5677
Merge pull request #7500 from JamieKnight/patch-3
...
Update docs to add warning about accessibility implications of using icons without any text
2013-04-07 11:46:23 -07:00
Mark Otto
7ff40635d4
fixes #7497 : use var for jumbotron border radius
2013-04-07 11:44:17 -07:00
Jamie Knight
c78c66527d
Update docs.html
...
Added heads up regarding lone icons providing accessibility issues for screen readers.
2013-04-07 16:25:00 +02:00
Mark Otto
647e930e49
Merge pull request #7495 from philfreo/3.0.0-wip
...
Fix typo in docs
2013-04-06 22:33:44 -07:00
Phil Freo
06a4bb38c0
Fix typo in docs
2013-04-06 21:02:24 -07:00
Garvin
05710e10f7
Added min-height to modal-header for modals with no header text
2013-04-06 21:48:53 -04:00
Mark Otto
330e9b16c2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-05 11:47:12 -07:00
Mark Otto
7a8d071735
use font-size-base var
2013-04-05 11:42:29 -07:00
Mark Otto
b99c170ef7
Merge pull request #7469 from apotropaic/3.0.0-wip
...
updated docs, changed out span* for col-span-*
2013-04-03 11:51:42 -07:00
Andrew Scofied
c1ab200985
updated docs, changed out span* for col-span-*
2013-04-03 09:48:39 -07:00
Mark Otto
eadfa59d92
Add small grid for phones and tablets
2013-04-02 19:40:43 -07:00
Mark Otto
610eb8fb78
sidenote edit under customization section
2013-04-02 18:02:53 -07:00
Mark Otto
c570ae49ef
fix that sidenav
2013-04-02 16:22:42 -07:00
Mark Otto
0ac711059b
refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first
2013-04-02 16:17:04 -07:00
Mark Otto
0f51a750a8
Merge branch 'example-fix' of https://github.com/Boulox/bootstrap into Boulox-example-fix
2013-04-02 14:49:42 -07:00
Mark Otto
2cd34a1a85
Fixes #7462 : add radial-gradient spec to mixin
2013-04-02 14:48:45 -07:00
Mark Otto
54b2a0b541
Merge pull request #7453 from burnsra/3.0.0-wip-nav
...
Fix responsive view for inverted navbar example
2013-04-02 08:44:25 -07:00
Fabien
e56461fbd7
Improve responsiveness for tablet and below of navbar in carousel example
...
- Remove margin-top of navbar-wrapper
- Remove border radius of navbar
- Space out the carousel
2013-04-02 13:39:04 +02:00
Fabien
8f99692f56
remove unused img from previous commit
2013-04-02 13:31:15 +02:00
Fabien
e0bce6af12
Replace png img by holder.js in carousel example
2013-04-02 13:30:13 +02:00
Fabien
aa51a36686
Fix corss link for sticky footer
2013-04-02 13:26:35 +02:00
Fabien
9ecc43d21a
Fix link to navbar doc
2013-04-02 13:22:31 +02:00
Robert Burns
3233155bb4
Fix responsive view for inverted navbar example
2013-04-01 22:02:35 -04:00
Mark Otto
7e31bea114
run make
2013-04-01 13:25:51 -07:00
Mark Otto
12f043f1bb
Merge branch '3.0.0-wip-carousel' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-carousel
2013-04-01 13:17:31 -07:00
Mark Otto
292734d7f3
Docs examples update
...
* Remove unused fluid image
* Add image, link, and description for new grid example
* Update sign in example image
2013-04-01 13:14:39 -07:00
Mark Otto
eac987c0d2
only negative indent nested grid rows; add new grid example
2013-04-01 12:55:48 -07:00
Mark Otto
a0726e605f
add type attr
2013-04-01 12:10:53 -07:00
Mark Otto
e6d6fcffb0
button for navbar toggle
2013-04-01 12:09:49 -07:00
Mark Otto
93db7c2c74
more link fixing
2013-04-01 11:14:11 -07:00
Mark Otto
c231dba7ee
updated links on homepage
2013-04-01 11:10:56 -07:00
Robert Burns
89bbeec898
Additional cleanup to responsive navbar
2013-04-01 12:58:40 -04:00
Robert Burns
1816483baa
Add carousel indicators to example
2013-04-01 09:29:43 -04:00
Robert Burns
e183dd46a2
Update carousel-caption btn styles
2013-04-01 09:27:49 -04:00
Mark Otto
19d5e61668
clearer separation with section headers; simpler customizing copy
2013-04-01 00:34:58 -07:00
Mark Otto
7bee10a5ef
oops, restore customizer
2013-04-01 00:11:47 -07:00
Mark Otto
9df6dc81b5
bring in customizing bootstrap section from old gist
2013-04-01 00:02:51 -07:00
Mark Otto
d8b3e48e14
add proper markup to list group in panels section
2013-03-31 22:58:01 -07:00
Mark Otto
2f8deea95a
add .panel-primary
2013-03-31 22:22:52 -07:00
Mark Otto
0fbfa167e1
fix text class in docs
2013-03-31 19:55:05 -07:00
Mark Otto
3365d4a06a
Merge branch '3.0.0-wip-fixes' of https://github.com/burnsra/bootstrap into burnsra-3.0.0-wip-fixes
2013-03-31 19:28:27 -07:00
Mark Otto
c69310153e
Fixes #7438 : remove max-height from justified nav tabs with some CSS wankery
2013-03-31 19:26:40 -07:00
Robert Burns
d299ff4fce
Fix image paths and carousel controls for carousel example
2013-03-31 21:47:02 -04:00
Mark Otto
4c49458336
remove text-rendering optimizeLegibility from headings
2013-03-31 18:40:07 -07:00
Mark Otto
8e59357bc5
Merge branch 'SBoudrias-patch-1' into 3.0.0-wip
...
Conflicts:
less/type.less
2013-03-31 18:39:49 -07:00
Mark Otto
db284a97d6
more consistent navbar vars
2013-03-31 17:56:31 -07:00
Mark Otto
4cbefa1179
remove unused responsive navbar vars
2013-03-31 17:37:28 -07:00
Mark Otto
0441bbba42
more consisten dropdown vars
2013-03-31 17:36:23 -07:00
Mark Otto
896ee79473
more consistent forms vars; drop search border radius since no more search form
2013-03-31 17:33:55 -07:00
Mark Otto
8b9d488377
more consistent btn vars
2013-03-31 17:32:45 -07:00
Mark Otto
b7fa0d3434
-background to -bg for body and table vars
2013-03-31 17:29:05 -07:00
Mark Otto
d6f37f3c56
@link-color-hover to @link-hover-color
2013-03-31 17:27:22 -07:00
Mark Otto
376bd20b3a
-background to -bg on wells vars
2013-03-31 17:25:52 -07:00
Mark Otto
52e4148302
better grid var comments
2013-03-31 17:25:27 -07:00
Mark Otto
626189dbfc
@state-*-background to @state-*-bg vars
2013-03-31 17:24:06 -07:00
Mark Otto
d5fa1d80bb
use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg
2013-03-31 17:22:12 -07:00
Mark Otto
996ec4ca69
-background to -bg on pagination vars
2013-03-31 17:20:16 -07:00
Mark Otto
f2e5c32936
-background to -bg on jumbotron vars
2013-03-31 17:19:47 -07:00
Mark Otto
6b23a66c29
-background to -bg on tooltip and popover vars
2013-03-31 17:19:12 -07:00
Mark Otto
cf843c5cad
-background to -bg on labels vars
2013-03-31 17:18:07 -07:00
Mark Otto
b56371b145
active item on list group should use @component-active-bg
2013-03-31 17:17:25 -07:00
Mark Otto
c5042e050e
fix nav divider
2013-03-31 17:17:10 -07:00
Mark Otto
388a4c878d
remove lingering rem
2013-03-31 13:20:54 -07:00
Mark Otto
5c601e7ac2
new @component-active-bg variable
2013-03-31 12:16:16 -07:00
Mark Otto
674768b177
restore px unit on @font-size-base
2013-03-31 12:00:04 -07:00
Mark Otto
a2145df7c4
run make after that breadcrumbs tweak
2013-03-31 11:58:25 -07:00
Mark Otto
42b6934930
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-31 11:58:08 -07:00
Mark Otto
b018513aa5
lingering nav-list use
2013-03-31 11:58:00 -07:00
Mark Otto
e62f2901d0
Merge pull request #7431 from burnsra/3.0.0-wip-fixes
...
Cleanup items for 3.0.0
2013-03-31 11:55:48 -07:00
Mark Otto
fc16e37aaa
Remove the handful of rem font-sizes
2013-03-31 11:26:13 -07:00
Mark Otto
b96ab36d38
add some container padding for examples
2013-03-31 11:24:31 -07:00
Robert Burns
74e06cb279
Add styles for tooltip and popover examples
2013-03-31 09:59:02 -04:00
Robert Burns
a1587e2629
Remove breadcrumb divider after last element
2013-03-31 09:12:02 -04:00
Mark Otto
6c1ed5638b
actually readd the padding and set it to smaller amount for narrow viewports
2013-03-30 22:54:31 -07:00
Mark Otto
70ba9a880e
remove padding form sign in form example
2013-03-30 22:53:35 -07:00
Mark Otto
40f671a531
add basic back to top link via affix
2013-03-30 18:41:26 -07:00
Mark Otto
e560c41ed1
simpler nav links
2013-03-30 17:06:59 -07:00
Mark Otto
6edd5f291a
not quite #fff on .list-group-item-text
2013-03-30 17:00:11 -07:00
Mark Otto
1683669eaa
Remove .nav-list given new .list-group
2013-03-30 16:56:49 -07:00
Mark Otto
2a9604fdd2
add list group component
2013-03-30 16:07:50 -07:00
Mark Otto
731903a175
panels subnav and links
2013-03-30 14:16:30 -07:00
Mark Otto
9fff2d3fb6
Change error to danger for all classes; add panels component
2013-03-30 14:15:18 -07:00
Mark Otto
aee25786a7
fuck everything about .clear_float() -- restore .clearfix() as mixin
2013-03-30 13:23:18 -07:00
Mark Otto
8d8f4e0cdd
Merge pull request #7375 from thomas-mcdonald/fix-filter-gradient
...
Fix horizontal-three-colors to a horizontal filter gradient
2013-03-30 13:17:45 -07:00
Mark Otto
62df38586a
navbar links in sidenav
2013-03-30 13:16:34 -07:00
Mark Otto
171c7feae2
navs nav links
2013-03-30 13:14:04 -07:00
Mark Otto
e9dd1826be
fix brok btn-dropdowns links
2013-03-30 13:12:03 -07:00
Mark Otto
9336a827c6
fix submenu docs height given border-box
2013-03-30 13:11:15 -07:00
Mark Otto
bd69269426
more component nav updates
2013-03-30 13:09:56 -07:00
Mark Otto
7c3c5ed7cc
Merge branch 'pickypg-patch-1' into 3.0.0-wip
...
Conflicts:
less/dropdowns.less
2013-03-30 12:54:16 -07:00
Mark Otto
906ff98601
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-30 12:12:28 -07:00
Mark Otto
6ba341b2d5
Merge pull request #7428 from burnsra/3.0.0-wip-fixes
...
Fix path to examples to account for new layout
2013-03-30 12:11:33 -07:00
Robert Burns
501dfbe8ae
Fix path to examples to account for new layout
2013-03-30 10:10:51 -04:00
Mark Otto
a4901e2da8
mention responsive image and google maps
2013-03-30 01:55:39 -07:00
Mark Otto
1dcadede36
fix broke grid classes
2013-03-30 01:09:30 -07:00
Mark Otto
af470f4c7b
more content and nav twerks
2013-03-30 01:06:50 -07:00
Mark Otto
361c776e2b
whitespace and taglines for main sections
2013-03-30 00:27:50 -07:00
Mark Otto
49ebf542a2
reorder docs
2013-03-30 00:19:05 -07:00
Mark Otto
601013ca04
drop .muted for .text-muted
2013-03-30 00:11:38 -07:00
Mark Otto
3359b8d5f6
nav change to go with that
2013-03-29 23:37:55 -07:00
Mark Otto
21d6a5933a
fix buttons links
2013-03-29 23:37:43 -07:00
Mark Otto
8814125259
Add subnav support to CSS section
2013-03-29 23:33:08 -07:00
Mark Otto
23d7215dbe
Modify scrollspy to add .active to all parent li items /cc @fat
2013-03-29 23:32:47 -07:00
Mark Otto
4dfc4e1022
clarify small docs
2013-03-29 22:40:42 -07:00
Mark Otto
f367090671
countypo
2013-03-29 22:38:25 -07:00
Mark Otto
4ce9203f2c
Merge branch '3.0.0-wip' into bs3_new_nav
2013-03-29 14:21:03 -07:00
Mark Otto
9f59648702
add link to github project on getting started section
2013-03-29 14:04:11 -07:00
Mark Otto
2ebc060795
mo padding on side nav links
2013-03-29 13:43:37 -07:00
Mark Otto
d3fe506f04
clearer js instructions on how to include plugins
2013-03-29 13:43:30 -07:00
Mark Otto
3055f09a90
dat red
2013-03-29 10:45:00 -07:00
Ivan Khalopik
41c7825677
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class on accordion heading links
2013-03-29 19:17:03 +03:00
Mark Otto
e25ad912e2
correct page title and nuke liquid description
2013-03-28 17:20:17 -07:00
Mark Otto
384926a1d6
remove nonexistant example
2013-03-28 17:19:41 -07:00
Mark Otto
b844d5dd2f
Merge pull request #7409 from andriijas/3.0.0-wip-formactions
...
Make sure form actions are properly aligned with form-horizontal
2013-03-28 10:46:23 -07:00
Andreas Cederström
090545ffdf
Make sure form actions are properly aligned with form-horizontal
2013-03-28 11:33:18 +01:00
Mark Otto
3278c40631
move nav into partial; rejigger content some more
2013-03-28 03:06:00 -07:00
Mark Otto
df35e26142
rejigger some content and start exploring section headings
2013-03-28 01:34:42 -07:00
Mark Otto
ba46d859e3
none of that
2013-03-28 01:12:07 -07:00
Mark Otto
4b8b8d2e46
holy crap new docs layout separate from home, no more top navbar
2013-03-28 01:08:14 -07:00
Mark Otto
081c061281
new subnav on all pages
2013-03-28 00:21:21 -07:00
Mark Otto
fe414d8566
turn docs navbar into left navbar
2013-03-27 23:33:45 -07:00
Mark Otto
6696ff5d92
clarify docs on unstyled lists
2013-03-27 15:54:17 -07:00
Mark Otto
f0f33eb9a3
Refactor .list-inline and .list-unstyled
...
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
2013-03-27 15:42:11 -07:00
Mark Otto
5b298a2aaf
docs fixes with new .bs-docs-container; fixing some lingering grid classes
2013-03-26 23:54:17 -07:00
Mark Otto
d5303906bd
Remove grid example; update grid classes in examples
2013-03-26 17:17:39 -07:00
Mark Otto
ca31f060a8
New grid classes
2013-03-26 17:12:17 -07:00
Mark Otto
1e9be3644c
remove .navbar-inner from starter template
2013-03-26 12:31:03 -07:00
Mark Otto
954dcc0dc5
Merge branch '3.0.0-wip' of https://github.com/psylabs/bootstrap into psylabs-3.0.0-wip
...
Conflicts:
less/tests/navbar-fixed-top.html
less/tests/navbar-static-top.html
less/tests/navbar.html
2013-03-26 12:28:00 -07:00
mo
ab09fb25b9
Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"
2013-03-25 18:13:13 -07:00
mo
a9e9d9d544
Fixed all the .brand in navbar to .navbar-brand
2013-03-25 17:46:44 -07:00
Thomas McDonald
f8b9e428f0
Give horizontal-three-colors a horizontal filter gradient
...
Previously the filter had GradientType=0, which would render a vertical
gradient rather than the horizontal one implied by name
2013-03-23 19:21:37 +00:00
Mark Otto
3c82ccaa2b
color border in table contextual classes
2013-03-17 17:26:02 -07:00
Simon Boudrias
cae90f3010
Remove text-rendering
2013-03-17 17:22:26 -03:00
Mark Otto
3aee2adb4b
Fixes #7297 : add support for .success, .error, and .warning on td and th elements in tables
2013-03-17 12:10:58 -07:00
Mark Otto
28cdc8dc5f
incorporate print utilities classes into responsive docs; rejigger some content
2013-03-17 11:57:00 -07:00
Mark Otto
160ff23c85
Merge branch 'jfroom-2.3.1-jfroom-wip' into 3.0.0-wip
2013-03-17 11:45:21 -07:00
Mark Otto
8d5a9371be
update readme to resolve conflict
2013-03-17 11:45:13 -07:00
Mark Otto
4aba489cfd
Remove all #font mixins; replace single instance of its use in Bootstrap with the @font-family-monospace variable
2013-03-17 11:34:27 -07:00
Mark Otto
6012d8221b
Exploring rems as font-size unit
...
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto
47f69c0d9e
mixin, not copypasta
2013-03-17 11:15:04 -07:00
Mark Otto
ef4898990f
convert to preboot's retina mixin
2013-03-16 17:19:05 -07:00
Mark Otto
71d4b5b6e7
Merge branch '3.0.0-wip' of https://github.com/dannykeane/bootstrap into dannykeane-3.0.0-wip
2013-03-16 17:06:20 -07:00
Mark Otto
68dfd322f4
fixes #7140 : hide navbar toggle in print
2013-03-16 16:17:32 -07:00
Mark Otto
fe2658ed61
Fixes #7150 : colorize links in alerts
2013-03-16 15:31:03 -07:00
Mark Otto
7e933db2dd
comment
2013-03-16 15:03:22 -07:00
Mark Otto
070c77a960
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-16 14:59:43 -07:00
Mark Otto
1d94d777c3
Merge pull request #7258 from acconrad/patch-1
...
Update buttons.less to disable btn pointer events
2013-03-16 14:59:33 -07:00
Mark Otto
e0de08c389
typo
2013-03-16 14:49:21 -07:00
Mark Otto
8c9e9e28cf
Fix vertical button groups
2013-03-16 13:03:31 -07:00
Mark Otto
efbf8373a5
Use form elements in checkbox and radio button groups
...
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto
be8f992c94
remove inner shadow from .highlight
2013-03-16 12:09:26 -07:00
Mark Otto
f77dc548a1
update pygments highlighting with customizations from preboot
2013-03-16 12:07:00 -07:00
Mark Otto
bb38fa5286
Overhaul the grid system and its docs
...
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot )
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Mark Otto
145eb054d9
begin to rewrite the grid docs
2013-03-15 21:57:16 -07:00
Mark Otto
2a0fb08fad
getting started as navbar link label
2013-03-15 21:23:59 -07:00
Mark Otto
ecfdecea00
Use translucent box shadow on hr elements; colorize hr elements within alert components
2013-03-14 23:01:23 -07:00
pickypg
812b99263f
Fix dropdown (and therefore typeahead) wrap
...
I have recently been experimenting with a lot of Typeahead controls, and I ran into a situation where my Typeahead was too wide for my screen, particularly on mobile devices, and it was not wrapping as I had expected it to do.
http://jsfiddle.net/Mtxkn/3/
Changing the CSS for `.dropdown-menu > li > a` to `white-space: normal` causes it to wrap in every scenario that I have seen, whereas leaving it as `nowrap` never does what I want when the text is too long for a given row.
It's possible that this has ramifications for other dropdown menus, but honestly I expect that even those would prefer to wrap than to extend the screen horizontally. If that is not the case, then it would work to change the typeahead version of this only:
```css
.typeahead > li > a {
white-space: normal;
}
```
2013-03-15 02:54:24 -03:00
Mark Otto
4c0719ea5f
fix derpy linenos in pygments for thumbnails component
2013-03-14 22:34:20 -07:00
Mark Otto
7e07c89b8b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-03-14 22:25:53 -07:00
Mark Otto
37d0a30589
Merge pull request #7287 from waynn/patch-1
...
fix pluralization since "a" is in front for issue #6342
2013-03-14 22:21:06 -07:00
Mark Otto
ed7fe0e5ba
unfuck misaligned main container
2013-03-14 21:45:31 -07:00
Mark Otto
8f04096205
Merge pull request #7285 from stilliard/patch-1
...
Additional heading font-size classes
2013-03-14 20:55:43 -07:00
Mark Otto
4247008e23
more readme copy
2013-03-14 20:55:23 -07:00
Mark Otto
b375283597
readme copy
2013-03-14 20:54:53 -07:00
Mark Otto
2b9c936a3a
start listing other bootstrap powered starter doodads in the readme
2013-03-14 19:19:06 -07:00
Andrew Stilliard
706dd8c045
Additional heading font-size classes
...
This relates to changes in issue #7284
2013-03-15 02:11:37 +00:00
Mark Otto
c9bfcfcfd5
underp license maybe
2013-03-14 19:08:09 -07:00
Mark Otto
45606ae6a0
herp derp, spelling booboo
2013-03-14 19:06:47 -07:00
Mark Otto
8f20a5ac91
Rename license to license.md; point readme to it via link
2013-03-14 19:05:54 -07:00
Mark Otto
85e5d40099
fix example navbar brand
2013-03-14 18:54:43 -07:00
Mark Otto
3cd6d00cc4
use the proper selector
2013-03-14 18:53:46 -07:00
Mark Otto
b5eca07be1
modify copy
2013-03-14 18:23:08 -07:00
Mark Otto
d8234b38cb
Merge branch '3.0.0-wip' of https://github.com/addyosmani/bootstrap into addyosmani-3.0.0-wip
2013-03-14 13:34:48 -07:00
Mark Otto
224296f695
Fixes #7281 : make tables super specific for hovers and striping to avoid nesting issues
2013-03-14 13:29:43 -07:00
Mark Otto
00169b48bd
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
less/grid.less
2013-03-14 13:25:59 -07:00
Mark Otto
7bff231ea5
Merge pull request #7227 from parndt/patch-1
...
Fix minor grammatical problem
2013-03-14 13:04:50 -07:00
Addy
0c65a0e1ee
Added bower install to download/install options in getting started guide
2013-03-14 10:58:16 +00:00
Adam Conrad
e488e709a0
Update buttons.less to disable btn pointer events
...
Buttons that are disabled are still clickable and can still fire click events (such as hopping up to the top of the page if your anchor href points to "#"). Adding the pointer-events:none property will truly disable the button so situations like this don't happen.
2013-03-12 17:58:41 -03:00
Mark Otto
d0e1b56603
Merge pull request #7181 from lukeapage/3.0.0-wip
...
make less files compile with strict maths in 1.4.0
2013-03-11 01:16:08 -07:00
Mark Otto
d344ca4475
Merge pull request #7208 from benilovj/3.0.0-wip
...
fix grammatical mistakes in carousel docs
2013-03-10 23:32:13 -07:00
Philip Arndt
086e8a5b3c
Fix minor grammatical problem
...
"check out" makes more sense here.
2013-03-11 12:07:52 +13:00
Mark Otto
d219b8b964
Set border-box globally instead
2013-03-10 13:24:07 -05:00
Mark Otto
e0a740ca9a
Merge pull request #7220 from jooag/patch-1
...
Fix Typo sucess to success
2013-03-10 10:40:00 -07:00
Ufuk Avcu
33913e4586
Fix Typo sucess to success
...
Mini typo fix in the docs...
2013-03-09 21:04:09 +01:00
Jake Benilov
d5c3307ffa
fix grammatical mistakes in carousel docs
2013-03-08 00:13:56 +00:00
Waynn Lue
1c7fe5d887
fix pluralization since "a" is in front
2013-03-06 22:01:21 -08:00
Luke Page
5054c17ab8
make less files compile with strict maths in 1.4.0
2013-03-06 16:38:20 +00:00
Ben Word
ee5c7d7ece
Remove -webkit-backface-visibility on skew mixin
...
Ref #5319 - This rule is causing pixelated edges on iOS. Removing
it makes everything smooth across all OS's, browsers, and devices.
2013-03-04 13:03:05 -06:00
Mark Otto
6e8ee02421
tweak icons alignment
2013-03-03 23:41:16 -08:00
Mark Otto
bfdc6f8607
Remove support for .uneditable-input
2013-03-03 23:31:09 -08:00
Mark Otto
6239094ca6
Nuke the gallery, punt it to the new http://expo.getbootstrap.com
2013-03-03 19:40:47 -08:00
Mark Otto
b83fc82aed
fix row change at breakpoint
2013-03-03 18:19:31 -08:00
Mark Otto
6e0815bf4e
Merge pull request #6968 from twitter/bs3_makefile_separated_done
...
More accurate makefile step confirmation
2013-03-01 14:11:24 -08:00
Mark Otto
1f160d4c12
Merge branch '3.0.0-wip' into bs3_makefile_separated_done
...
Conflicts:
Makefile
2013-03-01 13:53:21 -08:00
Mark Otto
e0647e8273
nuke commented out unused var
2013-03-01 12:37:36 -08:00
Mark Otto
a70c50d1f7
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
package.json
2013-03-01 12:37:21 -08:00
Mark Otto
77e8e2aee9
Fix alignment of .navbar-brand
2013-03-01 00:50:08 -08:00
Mark Otto
492c249537
improve navbar toggle and hide code snippets on mobile devices for now
2013-03-01 00:18:10 -08:00
Mark Otto
2e3ba4afe6
redo the buttons examples
2013-03-01 00:04:41 -08:00
Mark Otto
ba633949dc
customize navbar in docs
2013-02-28 23:36:54 -08:00
Mark Otto
38ba057dee
Fixes #6998 : disabled background color properly on pagination
2013-02-28 23:23:05 -08:00
Mark Otto
5a30e52aac
Fixes #6995 : Add disabled navbar nav link support
2013-02-28 23:20:58 -08:00
Mark Otto
4418c82888
Fixes #6954 : properly reset grid classes within tables
2013-02-28 22:47:32 -08:00
fat-kun
eb24718add
Merge pull request #7111 from twitter/2.3.1-wip
...
2.3.1 wip
2013-02-28 21:24:27 -08:00
Mark Otto
bfc4aaf6e8
Holy fucking shit fix that input group with buttons rounded corner noise
2013-02-28 21:19:02 -08:00
fat
6b2a010357
update changelog
2013-02-28 21:16:08 -08:00
fat
839b0c893f
shiiiit
2013-02-28 21:15:33 -08:00
fat
0992a85932
woops that should stay 2.3.0
2013-02-28 21:00:21 -08:00
fat
3469339068
2.3.1
2013-02-28 20:55:14 -08:00
fat
cec434a4c3
rebuild
2013-02-28 20:48:48 -08:00
fat
2f27d9851c
whitespace
2013-02-28 20:48:02 -08:00
fat
a61322c2fb
WHOOPS ( >_>)
2013-02-28 20:46:51 -08:00
fat
01e0f8c653
only pass unique options through to child nodes in tooltips
2013-02-28 20:39:07 -08:00
fat
cf998040ec
rebuild
2013-02-28 19:49:08 -08:00
fat
ef80765726
pass true to cycle
2013-02-28 19:47:01 -08:00
Mark Otto
b19eb88b5a
Fixes #6935 : Use standard decimal points for .opacity() mixin
2013-02-28 19:46:49 -08:00
Mark Otto
0dea8b0c74
Fixes #6897 : Print styles get own .less file
2013-02-28 19:42:51 -08:00
fat
40b7a909a6
le sigh
2013-02-28 19:37:30 -08:00
Mark Otto
9d763e805b
Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting
2013-02-28 19:34:02 -08:00
Mark Otto
877d64dd77
remove auto regen
2013-02-28 19:32:39 -08:00
Mark Otto
81a0306cce
add new example thumbnails; update links to point to new windows
2013-02-26 00:56:06 -08:00
Mark Otto
ea01e8bbc4
nuke remaining less/tests/ files and move grid over to examples dir
2013-02-26 00:49:21 -08:00
Mark Otto
e2e5580c0e
nuke glyphicons changes in buttons for now because it's whack
2013-02-26 00:44:15 -08:00
Mark Otto
5b3b11c02a
moved examples added
2013-02-26 00:42:24 -08:00
Mark Otto
91660a0489
Move navbar examples to /examples directory
2013-02-26 00:37:59 -08:00
Mark Otto
e1bb94c383
try out new table-based type example
2013-02-24 01:29:19 -08:00
Mark Otto
16111a5e45
Merge pull request #6967 from twitter/readme_npm_fix
...
Update readme npm instructions
2013-02-21 13:10:21 -08:00
Mark Otto
c6343a9d4a
Merge pull request #6990 from acmetech/3.0.0-wip
...
Additional minor updates to the docs
2013-02-19 16:09:18 -08:00
Tom Pietschker
1780873173
forgot navbar-fixed-bottom in the commit
2013-02-19 14:54:56 -05:00
Tom Pietschker
ba7b1e8234
tweak the position of the fixed to top/bottom navbars to remove double border
2013-02-19 14:50:44 -05:00
Tom Pietschker
ec9b01e691
remove the search-query class and increase the width
2013-02-19 14:40:05 -05:00
Tom Pietschker
62b54605a7
replace navbar-search with navbar-form
2013-02-19 14:35:48 -05:00
Tom Pietschker
3b7e5214e3
remove navbar-inner
2013-02-19 14:32:28 -05:00
Mark Otto
a1913cbe7e
Merge pull request #6979 from acmetech/3.0.0-wip
...
Minor fixes to docs
2013-02-18 18:26:26 -08:00
Tom Pietschker
722ba5f227
added missing slash in the src for Gather Content
2013-02-18 21:03:52 -05:00
Tom Pietschker
4c00f290f2
fix incorrect section id for labels
2013-02-18 20:57:54 -05:00
Mark Otto
023568fe3d
Navbar realignment:
...
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto
f51862f158
remove unused include
2013-02-18 01:27:08 -08:00
Mark Otto
acdffe696c
Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems
2013-02-17 22:20:49 -08:00
Mark Otto
f6ec2c5dac
Drop the recently added .counter class for .badge
2013-02-17 21:06:20 -08:00
Mark Otto
d3cc8f79f4
remove old todo comment
2013-02-17 20:26:44 -08:00
Mark Otto
53091be6d2
remove unnecessary select border reset
2013-02-17 20:26:21 -08:00
Mark Otto
e2d829e511
fix inaccurate text classes code
2013-02-17 20:23:31 -08:00
Mark Otto
82d059de87
fix broken marketing section with updated class
2013-02-17 20:18:29 -08:00
Mark Otto
159167041f
forgot about those quotes
2013-02-17 19:15:09 -08:00
Mark Otto
56e60d0468
fix the docs include logic
2013-02-17 19:12:30 -08:00
Mark Otto
9b3262cb15
more narrow jumbotron example fixes in the mobile first arena
2013-02-17 19:04:38 -08:00
Mark Otto
c6f341bd17
Refactor some common classes from docs css and examples, then prevent examples from using docs.css
2013-02-17 18:58:40 -08:00
Mark Otto
dba9eea98d
revamp narrow jumbotron to avoid conflicts with docs .masthead
2013-02-17 18:48:00 -08:00
Mark Otto
36aec5e484
decrease top/bottom padding a bit in mobile fixed navbars
2013-02-17 18:47:44 -08:00
Mark Otto
ee9a0f4b94
css to go with it
2013-02-17 18:46:49 -08:00
Mark Otto
13ff3aced0
Add class to body for special styles to avoid conflict with examples
2013-02-17 18:46:30 -08:00
Mark Otto
c0ea077fb4
Revert the statis navbar in mobile views--they're back to being fixed all the time
2013-02-17 18:33:55 -08:00
Mark Otto
4cbb663d9d
Update some links and rename #gridsystem to #grid-system
2013-02-17 18:10:29 -08:00
Mark Otto
f59e4fdba3
remove duplicate done text; change label on docs prep step
2013-02-17 16:58:43 -08:00
Mark Otto
9134fa4eda
correct version
2013-02-17 16:56:57 -08:00
Mark Otto
6663a35562
Resolve conflicts
2013-02-17 16:56:30 -08:00
Mark Otto
e6a6fd2585
Backport v3's readme update on npm install to 2.3
2013-02-17 15:36:24 -08:00
Mark Otto
077b70112f
add note to readme about fubared npm installs
2013-02-17 13:54:47 -08:00
Mark Otto
e2fabe2317
clarification on readme makefile
2013-02-17 13:42:31 -08:00
Mark Otto
6ccf588a8e
Restore submenu support
2013-02-17 13:35:14 -08:00
Mark Otto
fdeb7f5743
restore auto regen of docs
2013-02-17 13:35:08 -08:00
Jeff Froom
ba8ba1fe72
Added Development > build: "make bootstrap" notes.
2013-02-16 21:37:08 -06:00
Mark Otto
5fecb4a9f4
add visibility note to docs about captions
2013-02-16 02:49:12 -08:00
Mark Otto
6dce3f63d8
Scrach that: carousel caption is always left aligned, but still hidden for mobile views
2013-02-16 02:47:48 -08:00
Mark Otto
6d048471c4
Re-add carousel captions as optional
...
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto
e74fb39080
Nuke the fluid example since it's no longer applicable
2013-02-16 01:43:23 -08:00
Mark Otto
401d4fabd1
Nuke the old_docs.css file
2013-02-16 01:39:09 -08:00
Mark Otto
b6ec72a3a2
Nuke @mdo's photos from the repo since we're using holder.js for carousel demo
2013-02-16 01:38:32 -08:00
Mark Otto
ce21926704
All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star
2013-02-16 01:26:43 -08:00
Mark Otto
d8e2668c1d
Overhaul carousel a bit more:
...
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
2013-02-16 01:22:15 -08:00
Mark Otto
b688d8dcd4
More accurate padding for fixed navbars at >768px
2013-02-16 00:20:20 -08:00
Mark Otto
f38e50cdf1
Don't affix the fixed navbars in mobile views
2013-02-16 00:19:17 -08:00
Mark Otto
d1aae5f82b
twerk gallery examples to stay at 400px or less for proper retinafying
2013-02-15 17:27:05 -08:00
Mark Otto
3d041096ba
Update gallery examples on homepage; make all gallery entries open in new tabs
2013-02-15 17:21:41 -08:00
Mark Otto
6789a30a3d
fix #6950 : use var for font-family
2013-02-15 16:51:16 -08:00
Mark Otto
866c8d60e9
restore jekyll-based css.html to docs
2013-02-15 12:22:26 -08:00
Mark Otto
64ae9e5bd8
Merge pull request #6944 from canburak/3.0.0-wip
...
Fixed typo on JavaScript documentation
2013-02-15 12:17:27 -08:00
Can Burak Cilingir
a77cd6cb5d
Fix typo on JavaScript documentation
2013-02-15 18:47:34 +08:00
Mark Otto
e44f8cc560
Fixes #6941 : add alt attribute to images
2013-02-14 23:55:04 -08:00
Mark Otto
bcb6dd5ee6
fix spelling as pointed out by @jodytate that got nuked in the merge
2013-02-14 23:51:35 -08:00
Mark Otto
0c25546e1c
rearrange readme
2013-02-14 23:48:29 -08:00
Mark Otto
5ac2f304a8
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
...
Conflicts:
docs/examples/sticky-footer-navbar.html
docs/examples/sticky-footer.html
2013-02-14 23:44:50 -08:00
Mark Otto
ae525258af
Merge branch 'bs3_jekyll' into 3.0.0-wip
...
Conflicts:
docs/css.html
docs/templates/pages/css.mustache
2013-02-14 23:42:47 -08:00
Mark Otto
aa5f090371
Make example pages use Jekyll; add sticky footer navbar image to examples
2013-02-14 23:38:00 -08:00
Mark Otto
41ef649aa3
no need for scrollspy in example template
2013-02-14 23:07:36 -08:00
Mark Otto
b1d4c589c5
Update makefile
2013-02-14 22:57:25 -08:00
Mark Otto
979ca4ea7a
Convert JS page to pygments; nuke prettify assets
2013-02-14 22:33:26 -08:00
Mark Otto
37becbab8c
convert components code examples to pygments
2013-02-14 21:42:33 -08:00
Mark Otto
0ff7fb0d05
pygmentize the rest of the css page
2013-02-14 16:43:50 -08:00
Mark Otto
edfee83ac2
Specify new local URL
2013-02-14 16:17:16 -08:00
Mark Otto
dc09979b51
Merge pull request #6936 from jodytate/3.0.0-wip
...
minor update to sticky-footer examples
2013-02-14 13:59:05 -08:00
jody tate
f273170f16
Update docs/examples/sticky-footer.html
...
again, "it's" to "its" for grammar fun!
2013-02-14 13:30:22 -08:00
jody tate
33a529f398
Update docs/examples/sticky-footer-navbar.html
...
contraction "it's" to possessive "its", aka pedantic grammar fix
2013-02-14 13:26:52 -08:00
Mark Otto
6b14de292a
pygmentize grid section; update bs-docs-example corners
2013-02-14 00:43:43 -08:00
Mark Otto
7e6211e244
twerk dat manni pygment style
2013-02-14 00:39:32 -08:00
Mark Otto
5f0ecb740a
Start pygmentizing css.html; add new theme for pygments
2013-02-14 00:23:23 -08:00
Mark Otto
d709dba284
Start using some includes; test out some pygments highlighting
2013-02-13 23:37:08 -08:00
Mark Otto
b12ff91d48
update readme to point to getting started page; twerk link
2013-02-13 22:01:34 -08:00
Mark Otto
0c1142f6fb
readme improvements
2013-02-13 20:02:00 -08:00
Mark Otto
2b05b335b0
update readme to reflect jekyll docs and local npm install method
2013-02-13 12:51:25 -08:00
Mark Otto
d3c458c7d8
make same css docs fix from upstream
2013-02-13 12:32:29 -08:00
Mark Otto
96953c2072
update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg
2013-02-13 12:30:56 -08:00
Mark Otto
b57c20a057
Restore gallery page, add active nav class jankitude, auto regenerate docs on file save
2013-02-13 11:48:22 -08:00
Mark Otto
b1e7010bfc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-02-13 11:28:00 -08:00
Mark Otto
e45f12ad42
rearrange jekyll and docs
2013-02-12 12:44:41 -08:00
Mark Otto
8174705be8
update makefile to work given nuked docs dir
2013-02-12 12:27:18 -08:00
Mark Otto
8b9733b288
nuke what we don't need for jekyll
2013-02-12 12:25:05 -08:00
Mark Otto
5de8557398
convert to jekyll
2013-02-12 12:16:32 -08:00
Mark Otto
1f5f23f869
nuke dat extend docs page
2013-02-11 21:38:44 -08:00
Danny Keane
e8dc036d25
Added retina image support mixin
2013-02-11 18:23:21 -08:00
Mark Otto
1dda3c395a
Merge pull request #6863 from devknoll/fix-css-docs
...
Fix the Star glyphicon in the CSS docs
2013-02-08 23:28:18 -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
8c7f9c66a7
Merge branch '2.3.0-wip'
2013-02-07 22:13:13 -08:00
Mark Otto
c4d47fb1ea
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-07 22:08:13 -08:00
Mark Otto
30fd4be093
add 2.3 changelog section
2013-02-07 22:08:04 -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
52581839c7
remove modal test file
2013-02-07 19:34:23 -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
c8874ff285
Merge pull request #6813 from Yohn/patch-12
...
don't remove title attribute for tooltips for 2.3-wip
2013-02-06 13:19:50 -08:00
Yohn
60c9ff4364
unit tests
2013-02-06 06:20:05 -05:00
Yohn
beb60309d1
dont remove title attribute part 2
2013-02-06 06:17:48 -05: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
fat
5e4db94c24
Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip
2013-02-05 22:10:41 -08:00
fat-kun
6a9cd513c0
Merge pull request #6783 from joprice/popoverOptionsOverride
...
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
fat-kun
042bb9b515
Merge pull request #6780 from agatronic/2.3.0-wip
...
less: Move to new selector interpolation, supported from 1.3.1
2013-02-05 21:29:59 -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-kun
ee91afba63
Merge pull request #6481 from pseidemann/patch-1
...
don't remove title attribute for tooltips
2013-02-05 20:13:57 -08:00
fat-kun
566380b257
Merge pull request #6488 from nanek/dropdowns-remove-touchstart
...
Remove touchstart from bootstrap-dropdown.js.
2013-02-05 20:08:42 -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
31fdb2e25e
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-05 19:59:25 -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
9443eb6e21
restore comma between selectors
2013-02-05 19:40:32 -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
fat-kun
31b9240dd0
Merge pull request #6737 from openwide-java/fix-tooltip-positioning-for-ie8
...
Fix tooltip positioning for IE8 broken in 2.3.0
2013-02-05 19:22:34 -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
cb0fed6693
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-04 11:25:46 -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
Joseph Price
4b86a91e53
fix typo
2013-02-04 09:10:48 -05:00
Mark Otto
7ec817ea46
Merge pull request #6638 from GeoffYoung/2.3.0-wip
...
Update package.json to current Recess version
2013-02-02 19:53:22 -08:00
Mark Otto
9480eb89cb
Revamp button mixins and pseudo states
...
* Remove .darken-button-states and .buttonBackground mixins (latter wasn't being used anyway)
* Create new .btn-pseudo-states mixin for setting button background and border colors for default and pseudo states
2013-02-02 19:16:15 -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
d6048031ed
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-02 18:58:08 -08:00
Mark Otto
b1f1d7871f
Add changelog file to repo instead of relying on the wiki
2013-02-02 18:57:24 -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
Joseph Price
1fe4ed8823
reordered access of options in tooltip and popover to allow overriding data attrs from js
2013-02-02 18:58:56 -05: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
Luke Page
6b9bb547bf
Move to new selector interpolation, supported from 1.3.1
2013-02-02 07:58:27 +00: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
0bfbf1446d
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2013-02-01 21:44:35 -08:00
Mark Otto
8f0bc9e79b
Merge branch 'dospuntocero-master' into 2.3.0-wip
2013-02-01 21:41:13 -08:00
Mark Otto
d2ea2cdedd
add horizontal-three-color gradient test
2013-02-01 21:41:02 -08:00
Mark Otto
d53af49afe
Refactor colors and progress bars
...
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Mark Otto
f328ebbc73
Merge pull request #6776 from ndabas/fix-inline-lists-ie7
...
Fix inline lists for IE7
2013-02-01 13:04:17 -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
fe5150d5dc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-01-31 18:07:07 -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
Gil Barbara
e69912c163
Update line-height and padding for input sizes
2013-01-31 19:00:22 -02: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
ed2cf5b3e3
its not dyslexic being easy.
2013-01-31 11:04:12 -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
135e834bf4
Merge branch 'baslr-master' into 2.3.0-wip
2013-01-30 18:22:11 -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
Mark Otto
d44acb7f88
Merge pull request #6750 from nextgenthemes/3.0.0-wip
...
Update less/carousel.less
2013-01-30 12:44:10 -08:00
nextgenthemes
72da31e028
Update less/carousel.less
...
lessified .carousel-caption
2013-01-30 18:14:22 +01:00
pseidemann
c4eea3abde
don't remove title attribute for tooltips
...
fixes #6445
2013-01-29 22:54:00 +01:00
Guillaume Smet
b7764d8a33
Fix tooltip positioning for IE8
...
IE8 defines a placeholder object getBoundingClientRect which breaks the new getPosition() method
2013-01-29 19:50:13 +01:00
Mark Otto
ab0c055bc6
Merge pull request #6728 from fredsa/2.3.0-wip
...
Fix `form-actions` documentation
2013-01-28 10:35:16 -08:00
Fred Sauer
d6e3b6b5a4
Fix form-actions documentation
2013-01-28 10:01:59 -08:00
Guillaume Gautreau
ee71fb492f
No semicolumns
2013-01-27 10:56:01 +01:00
Guillaume Gautreau
5b0f956a60
Arrow replacement
2013-01-26 21:45:21 +01:00
Guillaume Gautreau
d9a0abaa06
works with fixed test
2013-01-26 21:39:49 +01:00
Guillaume Gautreau
db9ec13ce4
Test for replacing tooltip when resized
2013-01-26 21:39:05 +01:00
Guillaume Gautreau
e5be883bb9
lint + wrong comparison
2013-01-26 14:31:33 +01:00
Guillaume Gautreau
929598784f
Unit test for replacing tooltip inside window
2013-01-26 14:06:58 +01:00
Guillaume Gautreau
6803ff70f9
Tooltip positionning on special cases
2013-01-26 13:50:26 +01:00
baslr
6afb1055e3
.icon-folder-close same width as icon-folder-open
...
.icon-folder-close same width as icon-folder-open. this prevents
buttons from wobbling if the icon changes from closed folder
to open folder
2013-01-26 01:01:10 +01:00
Francisco arenas
2428904b4b
Update less/mixins.less
...
horizontal three color gradient added
2013-01-24 03:37:52 -02: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
Geoff Young
f3268db4b4
Update Recess version
2013-01-19 16:27:10 -05: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
Vickash Mahabir
27ff51dae6
Fix that thing with disabled buttons changing color on hover
2013-01-18 11:55:17 -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
01b465928e
overhaul alerts section of tests
2013-01-17 12:24:16 -08:00
Mark Otto
bbb3c0a0e6
Merge branch 'ravage84-patch-2' into 2.3.0-wip
2013-01-17 12:21:34 -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
ravage84
650c77ddb9
Update less/tests/css-tests.html
...
Extended css-tests with alerts (alerts and alert-blocks)
2013-01-17 11:34:00 +01: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
Mark Otto
38c5c13d38
Merge pull request #6591 from Quy/2.3.0-wip
...
Add text alignment classes info to docs
2013-01-16 10:24:13 -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
c34ef69100
add text alignment classes from 3.0
2013-01-15 10:15:02 -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
Nicolas Dudebout
6512c5a5bc
Changes some more commands to use the local npm install.
2013-01-14 09:02:25 -05:00
Nicolas Dudebout
915ebf9f30
Allows the user to set different source and destination in Makefile.
...
A user can use the following command to determine where to copy the resulting css file:
$ BOOTSTRAP=<my-path> make
2013-01-14 09:01:19 -05:00
Nicolas Dudebout
10a83b1e62
Modifies the Makefile to use local npm install **when available**
...
The change introduced in 5bd8cdca9 was:
- partial, as not all the command were translated
- preventing the use of a global npm installation
2013-01-14 09:01:19 -05:00
Nicolas Dudebout
2a151d9e2f
Moves one @printf statement to be more accurate.
2013-01-14 08:58:47 -05:00
Nicolas Dudebout
25803a966b
Replaces some @echo recipes by @printf.
...
The echo command does not understand the -n argument on Mac OS X.
This is due to the fact that:
- Makefile calls /bin/sh to execute a command
- in Mac OS X, /bin/sh is a link to bash
- in Mac OS X, bash is compiled with --enable-strict-posix-default
Therefore, the echo command does not have the -n argument.
printf on the other hand is a builtin function that works well on Mac OS X and Linux.
2013-01-14 08:58:16 -05:00
Nicolas Dudebout
5204f206b9
Splits the progress @echo statements in the Makefile.
2013-01-14 08:57:44 -05: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
Mark Otto
5ae1df617f
Merge pull request #6568 from Yohn/patch-12
...
Updating docs -> popover to show container option
2013-01-14 00:03: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
fb4fc323a2
remove font-sizes from button group btn sizes
2013-01-12 17:54:30 -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
e195457728
Merge pull request #6472 from RWOverdijk/patch-1
...
Update composer.json
2013-01-12 00:21:08 -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
7b3f74311e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-01-11 20:27:00 -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
0f34666f07
Merge pull request #6550 from Boulox/font-variable-fix
...
Add glyphicons font path variable
2013-01-11 11:11:32 -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
Fabien
c91bf424b0
Add glyphicons font path variable
2013-01-11 18:32:00 +01: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
1d87bcc9f5
Merge branch 'aronwoost-patch-1' into 2.3.0-wip
2013-01-09 21:37:11 -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
Aron Woost
aeb0e85151
replaced tabs with spaces
2013-01-09 10:15:15 +01:00
Kenan Shifflett
b5ad50686c
Removed touchstart from bootstrap-dropdown.js.
2013-01-07 20:13:28 -05:00
Wesley Overdijk
bf3dea668f
Update composer.json
...
target-dir is not needed. All it does, is nest everything another level deeper. It should only be used for completing psr-0 paths.
2013-01-06 16:43:41 +01:00
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
Mark Otto
6f8e315b1d
Merge branch 'sparanoid-transition-duration' into 2.3.0-wip
...
Conflicts:
docs/assets/img/bootstrap-docs-readme.png
2012-12-28 13:08:49 -06:00
Tunghsiao Liu
3096a377a2
Add transition-duration mixin
2012-12-28 16:19:12 +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
0da31ceb51
Cleanup spacing in variables file
2012-12-26 14:06:21 -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
Yohn
9835549faf
made container option be false
2012-12-24 18:59:37 -05:00
Yohn
e867ae7b60
removed the length check
...
updated it to @fat's suggestion
2012-12-24 18:07:41 -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
fat-kun
90cdef8dfe
Merge pull request #6380 from Yohn/patch-10
...
promote using data-toggle instead of rel for tooltip and popover
2012-12-23 19:22:51 -08:00
fat-kun
0a7c840173
Merge pull request #6375 from tkawachi/tooltip-events-2.3.0
...
Tooltips fires show, shown, hide, hidden events
2012-12-23 19:19:58 -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
Yohn
b6960d8cf9
Update js/tests/unit/bootstrap-tooltip.js
2012-12-23 04:21:02 -05:00
Yohn
d594d6377a
adding container option to tooltips
2012-12-23 04:18:16 -05:00
KAWACHI Takashi
defe85bb51
Assign event variables at declarations
2012-12-23 15:17:41 +09:00
KAWACHI Takashi
7a3a88acc6
Tooltips fires show, shown, hide, hidden events
...
It is re-worked from #3691 .
2012-12-23 14:42:13 +09:00
fat-kun
48211ad9f5
Merge pull request #6374 from whyisjake/2.3.0-wip
...
Update docs/templates/pages/javascript.mustache
2012-12-22 21:18:36 -08: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-kun
d09b46fe37
Merge pull request #6349 from Yohn/patch-6
...
Fixes #5753 with tooltip('toogle')
2012-12-22 14:53:24 -08:00
fat
effba9e55c
add data-api namespace to dropdown
2012-12-22 14:22:45 -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
a9e661a2b5
read data options in constructor for collapse
2012-12-22 13:48:16 -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
442012f0f5
Smaller image update to readme
2012-12-21 19:02:33 -08:00
Mark Otto
5a2966a2c2
Downsize image
2012-12-21 18:59:51 -08:00
Mark Otto
d23006a6bd
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-21 18:59:14 -08:00
Mark Otto
ccafc8a010
Explore adding icon to readme
2012-12-21 18:58: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
82a758344d
add direction prop to carousel slide event
2012-12-21 17:31:54 -08:00
fat
e194c3e4f4
rebuild
2012-12-21 17:25:31 -08:00
fat
5da30ee5fb
Merge branch 'marcelkorpel-master' into 2.3.0-wip
2012-12-21 17:24:45 -08:00
fat
d5345f806c
Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master
2012-12-21 17:19:36 -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
704dfb2f1d
Merge pull request #6360 from Quy/2.3.0-wip
...
Miscellaneous changes to docs
2012-12-21 00:28:07 -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
5d4e718446
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2012-12-20 20:56:00 -08:00
Mark Otto
5508d3d5b3
Remove reset.less now that Normalize 2 is fully integrated
2012-12-20 20:52:43 -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
d6d828154a
Merge pull request #6354 from cvrebert/3.0.0-wip
...
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
2012-12-20 15:33:52 -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
69f6149489
Normalize indentation from 4 to 2 spaces
2012-12-20 14:11:40 -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
Chris Rebert
30f72e69e3
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
2012-12-20 11:00:47 -08:00
Yohn
a6705246d0
Update js/tests/unit/bootstrap-tooltip.js
2012-12-20 04:36:57 -05:00
Yohn
e21b6459ad
fixes tooltip('toggle')
2012-12-20 04:34:28 -05: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
3f493f0d0d
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
2012-12-20 01:30:43 -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
fat
5abe33f5d8
reset carousel in the case that it is reinstantiated twice
2012-12-20 01:13:03 -08:00
fat
6b67a83631
Merge branch '2.2.3' into 2.3.0-wip
2012-12-20 01:05:55 -08:00
fat
2c9f43f685
if carousel element already open, don't reopen it duh bruh bruh
2012-12-20 01:05:07 -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
ec623c176b
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2012-12-19 21:03:43 -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
Mark Otto
ac20a08281
Use @border-radius-base var for nav tabs
2012-12-17 10:11:33 -08:00
Mark Otto
cdff0a0ca8
Merge pull request #6267 from valorin/composer-fix
...
Removing "target-dir" option to stop extra nesting
2012-12-15 18:45:50 -08:00
Stephen Rees-Carter
2183ab63b7
Removing "target-dir" option to stop extra nesting
...
There is no valid reason to set this since it causes extra nesting:
./vendor/twitter/bootstrap/twitter/bootstrap/
2012-12-14 16:38:09 +11: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
e324a1beb0
Simplify syntax of nesting with inline lists
2012-12-10 10:28:18 -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
165729254b
squash new line
2012-12-10 10:13:04 -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
Mark Otto
9f29785783
Merge pull request #6195 from nathanb/example-carousel-nav-fix
...
lowered carousel beneath the nav (in carousel example)
2012-12-10 00:21:35 -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
Mark Otto
b9292ff90c
Merge pull request #6165 from Quy/2.2.2-wip
...
Apply code tag to data attribute on javascript page
2012-12-08 12:17:46 -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
10e72e158d
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2012-12-07 17:50:34 -05:00
fat
91fbadad5b
remove slide from carousel constructor #5579
2012-12-07 17:49:05 -05:00
billy gates
c362e72660
Merge pull request #5862 from pmclanahan/issue-5806-typeahead-keyboard-nav
...
Fix issue with double move event firing in typeahead.
2012-12-07 14:16:51 -08:00
fat
66b70016d0
rebuild and only select visible dropdown items
2012-12-07 17:14:49 -05:00
billy gates
2526c3fdbe
Merge pull request #6118 from godric7/master
...
scrollSpy - add parent scrollTop to offset calculation
2012-12-07 14:11:18 -08: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
Mark Otto
2877f84579
Merge pull request #6143 from Quy/2.2.2-wip
...
Escape ×
2012-12-07 09:41:17 -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
Godric
8b959cacbc
Update js/bootstrap-scrollspy.js
...
Fix for Bootstrap issue #6013 "scrollSpy - offset calculation"
https://github.com/twitter/bootstrap/issues/6013
2012-12-04 01:21:07 +01: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
Mark Otto
d470fb72da
nuke comments
2012-12-03 09:23:02 -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
eca23e9b0f
add source attribution for IE10 fix
2012-12-02 21:01:53 -08: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
439ff09701
herpderp
2012-12-02 18:15:40 -08:00
Mark Otto
c8862d91bc
Readme reorg
...
* Consolidate quick start options into easier to read list
* Consolidate social and community options into a list
* Add link to Code Guide for contributions section
2012-12-02 13:14:49 -08:00
Marcel Korpel
0dece7a71f
Set focus back to input field after clicking an item
...
Test 'focus is still set' added
Fixes issue #5933
2012-12-02 12:35:33 +01: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
85c57c6ba8
Merge branch 'Moveo-master' into 2.2.2-wip
2012-12-02 01:32:13 -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
dbb244cb97
Merge pull request #6097 from blakeembrey/modal-body-relative
...
Add relative positioning to .modal-body
2012-12-01 17:45:33 -08:00
Blake Embrey
fbec803b55
Add relative positioning to .modal-body - Fixes #5991
2012-12-02 09:53:05 +10: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
51c418d468
alignment
2012-11-30 15:34:35 -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
030a058174
Remove .navbar-inner from navbar tests
2012-11-30 12:36:55 -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
8d09e7c24d
remove some unhelpful comments
2012-11-30 00:26:02 -08:00
Mark Otto
4fd164d45b
consolidate font resets into scaffolding
2012-11-30 00:24:17 -08:00
Mark Otto
71d8bebfbc
remove from form styles
2012-11-30 00:21:44 -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
721b568303
update comment
2012-11-29 23:27:09 -08:00
Mark Otto
c5173cdb92
Merge branch 'idavemm-patch-1' into 2.2.2-wip
2012-11-29 23:26:22 -08:00
Mark Otto
52e669d619
Merge branch '2.2.2-wip-holder' into 2.2.2-wip
2012-11-29 21:35:57 -08:00
Mark Otto
38c546c785
upgrade to holder 1.6
2012-11-29 21:35:45 -08:00
Mark Otto
12aa060efd
Merge branch 'jblotus-patch-1' into 2.2.2-wip
2012-11-29 21:06:20 -08:00
Mark Otto
e9c32fdf6d
Merge branch 'patch-1' of https://github.com/jblotus/bootstrap into jblotus-patch-1
2012-11-29 21:06:11 -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
fa6a6dbb92
Merge pull request #6057 from ph-One/patch-3
...
Update Makefile's UglifyJS commands
2012-11-28 18:41:36 -08:00
Mark Otto
78390d12af
Fix the carousel after we scoped selectors
2012-11-28 15:40:51 -08:00
Mark Otto
cb69aa976f
Merge branch 'trsteel88-master' into 2.2.2-wip
2012-11-28 15:35:16 -08:00
Kyle A. Matheny
fe8df5022b
Update Makefile
...
Fixed both instances of uglifyjs usage.
2012-11-28 23:33:05 +00: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
Zulfiqar Ali
693fd0db2a
help-block margin-top should also apply after a span.uneditable-input
2012-11-28 16:47:59 +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
Swaagie
e6e4d93d5e
leave it to the developer to decide how to use the content of the popover
2012-11-27 15:07:31 +01:00
Zulfiqar Ali
701f871e7d
help-block margin-top should also apply after a span.input
2012-11-27 07:30:54 +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
8b417c39e7
Merge pull request #5954 from tony/patch-2
...
Fix typo in reset.less
2012-11-19 15:31:14 -08:00
Tony Narlock
ace6dc0c25
Fix typo in reset.less
2012-11-19 16:49:47 -05:00
Mark Otto
a10d68f291
Fixes #5937 : Border radius vars in button groups
2012-11-18 12:30:35 -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
Trent Steel
4d593618e0
add composer.json
2012-11-16 17:01:21 +10: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
Mark Otto
cd1f72f484
Merge pull request #5894 from amid2887/patch-3
...
Update less/tables.less ( typing, use variable, add border-radius reset )
2012-11-14 01:20:20 -08:00
Mark Otto
303767350c
Merge pull request #5874 from tacomanator/2.2.2-wip
...
fixes #5873 : @navbarInverseBrandColor not used
2012-11-14 01:18:11 -08:00
Paul McLanahan
6ec7c72e5b
Fix issue with double move event firing in typeahead.
...
Fix test to catch issue.
Fix #5806 .
2012-11-13 11:00:34 -05:00
amid2887
41889f74d0
Update less/tables.less
...
Possible typing.
Add @baseBorderRadius as value for some rules.
Add border-radius clearing for first and last td in the last tbody for table with tfoot.
2012-11-13 17:49:33 +07: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
f2bbee2075
remove * line-height
2012-11-08 23:56:29 -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
Mark Otto
02c0b788cd
Merge pull request #5795 from globocom/missing-i18n-customize-and-download
...
insert missing i18n tag at customize and download string
2012-11-05 17:47:45 -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
34880e3ef5
Fixes #5596 : switch vars in .size mixin
2012-11-04 19:59:50 -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
Mark Otto
2f39f86bd7
Merge pull request #5777 from bradly/change-example-emails-in-docs
...
Change example email addresses to use RFC 2606 reserved example domain.
2012-11-03 13:12:02 -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
David
46d38b10b8
Prevent IE8 from misplacing imgs
...
Fixed imgs in a nav that were misplaced on IE8.
2012-11-02 15:04:34 +01: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
46347fff01
fixes #5692 : add version # to readme
2012-10-31 11:17:01 -07:00
Ninir
be03a53086
Replaced hardcoded CSS rules with mixins
2012-10-31 11:09:44 -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
b5af762ef5
Merge branch '2.1.2-wip'
...
Conflicts:
js/bootstrap-dropdown.js
2012-10-29 22:01:58 -07:00
fat
68cfedb34a
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-29 21:55:07 -07:00
fat
f1136228a7
add note about js style
2012-10-29 21:54:51 -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
a6968c4934
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-29 21:30:45 -07:00
Mark Otto
9352fe1750
add a ton of the new vars to the customizer
2012-10-29 21:30:39 -07:00
fat
f595e146d6
http link
2012-10-29 21:29:05 -07:00
fat
31c1eba51b
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
...
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
2012-10-29 21:28:17 -07:00
fat
92e7f166e7
remove haunt, remove bootstrap dir, add bower support
2012-10-29 21:27:34 -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
billy gates
7426ced0fb
Merge pull request #5323 from artiz/master
...
Please check my fix for #4550
2012-10-17 22:50:52 -07:00
billy gates
24b5e6cb14
Merge pull request #5366 from Sinetheta/2.1.2-wip
...
Fix for #5362
2012-10-17 22:30:40 -07:00
Jacob Thornton
a2fc01444e
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-10-17 22:27:00 -07:00
Jacob Thornton
edc3eee5ea
fix carousel event
2012-10-17 22:26:44 -07:00
billy gates
21f29a7682
Merge pull request #5389 from frntz/2.1.2-wip
...
Update js/bootstrap-tooltip.js
2012-10-17 22:15:48 -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
0a3e034891
Merge pull request #5524 from martinstein/fix-tooltip-delegate-click
...
Fix tooltip not working in delegate events on click-trigger
2012-10-17 21:34:01 -07:00
billy gates
97bf02d787
Merge pull request #5531 from dmitriybudnik/carousel-js-typo-fix
...
Fixed copy/paste caused typo
2012-10-17 21:25:21 -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
b06724a1a4
Merge pull request #5508 from bradly/fix-readme-link
...
Updating README link about Less compilation.
2012-10-16 20:36:12 -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
Dmitriy Budnik
ae0ba0686e
set spesific assertions count for test
2012-10-16 11:16:38 +03:00
Dmitriy Budnik
cd55963930
fixed test
2012-10-16 09:49:26 +03:00
dmitriybudnik
432eaff29c
Fixed copy/paste caused typo
2012-10-15 22:35:32 +03:00
Mark Otto
0048446db9
improve spacing in carousel example
2012-10-15 13:57:09 -05:00
Martin Stein
6b017b9bea
fixed reference to this.tip() so it works in delegate events
2012-10-15 15:17:59 +02:00
Bradly Feeley
fda641fb6c
Updating README link about Less compilation.
2012-10-13 18:38:34 -07:00
Bradly Feeley
ed5c5994a7
Fixing typo in docs.
2012-10-13 18:31:41 -07:00
James Fuller
d19ca23f8f
Update package.json
...
when building using Makefile, dependency for hogan.js needs to be installed
2012-10-11 21:30:04 -03: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
df9a1c29f4
Merge branch '2.1.2-wip' of https://github.com/twitter/bootstrap into 2.1.2-wip
2012-10-10 10:29:55 -07:00
Mark Otto
31007c01d8
fixes #5478 : remove double background color on dropdown links
2012-10-10 10:29:22 -07:00
Mark Otto
5af5c2ed36
fixes #: remove double background color on dropdown links
2012-10-10 09:51:13 -07:00
Mark Otto
b18c009051
fixes #5473 : use baselineheight var for input bottom margin
2012-10-10 09:47:08 -07:00
Kevin Attfield
48a8dd2a23
Added test to fix for #5362
2012-10-08 22:29:44 -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
d76c305cbb
remove 'at twitter' part of readme
2012-10-06 14:42:07 -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
630a88d3ce
Merge pull request #5281 from GotenXiao/pagination-active-background
...
Use paginationActiveBackground var to finish fixing #4295
2012-10-02 15:23:59 -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
frntz
b892a37320
Update js/bootstrap-tooltip.js
...
Avoid loosing events attached on Jquery object if added via function in popover content
2012-10-02 18:26:55 +03: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
7763cab608
Merge branch '2.1.2-wip' of https://github.com/advancedrei/bootstrap into advancedrei-2.1.2-wip
2012-10-01 16:15:26 -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
d36e37214b
fixes #5319 : add backface-visibility for webkit skewing
2012-10-01 15:26:17 -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
c77d4266c0
Merge pull request #5369 from amid2887/2.1.2-wip
...
Add missing icon class definition for navs.less
2012-10-01 10:27:13 -07:00
amid2887
46764a7165
Add missing icon class definition for navs.less
...
add missing icon class definition for navs:
'[class*=" icon-"]'
P.S. Sorry for 2 pull requests with the same problem..
2012-10-01 14:32:51 +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
c82b9d1e7c
remove gradientbar mixin
2012-09-30 23:54:35 -07:00
Mark Otto
973646ea67
vars less spacing and cleanup
2012-09-30 23:52:02 -07:00
Mark Otto
142643589f
remove bluedark var
2012-09-30 23:50:54 -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
3934e55254
remove dupe ff3/4 button fixes; also remove headingscolor var
2012-09-30 23:46:48 -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
0cd186183c
add comment for filter opacity browser requirements
2012-09-30 22:54:44 -07:00
Mark Otto
840cad69af
remove translucent bg mixin
2012-09-30 22:52:32 -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
40a8a93b22
Merge branch 'amid2887-master' into 2.1.2-wip
2012-09-30 22:41:11 -07:00
amid2887
d49dd766c8
Add missing icon class definition for buttons.less
...
add missing icon class definition for buttons:
'[class*=" icon-"]'
2012-10-01 12:27:37 +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
Kevin Attfield
82715ae96d
Fix for #5362
...
Fix for issue [5362](https://github.com/twitter/bootstrap/issues/5362 ):
tab events fired on wrong dropdown anchor.
2012-09-30 21:41:37 -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
Carl Porth
e1f6458e36
don't wait for ready when binding events to document
2012-09-27 15:00:02 -07:00
Artem Kustikov
0944e036ae
Fix for #4550
...
Also fixes dropdowns hiding behavior for case when two or more dropdowns
with [data-toggle=dropdown] exist on the page
2012-09-27 21:45:37 +03: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
Carl Porth
474471b831
bind data-api events to document instead of body to allow body replacement
2012-09-26 23:11:03 -07: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
2eb4c6fc79
cleanup breadcrumbs less code (nesting)
2012-09-25 22:57: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
f0b4f05a27
remove ie7 support from mixins
2012-09-25 22:02:29 -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
Robin Lewis
b29d947477
Use paginationActiveBackground var to finish fixing #4295
2012-09-25 21:12:01 +01: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
a4bf6ef0a0
match decimal placements in type.less
2012-09-23 15:16:13 -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
Mark Otto
c3ea955661
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-09-22 21:37:08 -07:00
Mark Otto
a419e70a42
add specific line items to contributing doc for issues, update branch list
2012-09-21 10:24:16 -07:00
Jacob Thornton
ebf94c53a5
change transition.js, rebuild… travis maybe will be happy?
2012-09-20 16:50:36 -07:00
Jacob Thornton
1716b0fdb5
remove src's
2012-09-20 16:31:10 -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
67585bd34e
fixes #5211 manually: spacing in mixins to match others
2012-09-20 09:07:48 -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
13be8b2031
contributing edits
2012-09-18 11:50:11 -07:00
Mark Otto
c15877445c
Merge pull request #5187 from caniszczyk/2.1.2-wip
...
Add CONTRIBUTING.md
2012-09-18 11:44:43 -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
Chris Aniszczyk
2a20761f07
Add CONTRIBUTING.md
...
Signed-off-by: Chris Aniszczyk <zx@twitter.com >
2012-09-18 10:50:04 -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
f69e244a60
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
2012-09-17 15:28:41 -07:00
Mark Otto
cd876fb659
Merge pull request #5125 from tapcanvas/tab-body-bg
...
Use @bodyBackground on .nav-tabs active state instead of static color
2012-09-17 15:28:31 -07:00
Mark Otto
6f3bef195a
nuke new examples for now
2012-09-17 08:53:13 -07:00
Mark Otto
1ea09b751e
fixes #5163 : add new var for navbar collapse's default view, use that in responsive navbar css
2012-09-17 08:52:19 -07:00
Mark Otto
6e25aacc91
more carouself example work
2012-09-16 21:54:06 -07:00
Robert McLaws
6aa15eb01f
Support for left-opening dropdown submenus
...
Adds a new class called .dropdown-submenu-left. It is useful when you
have a .pull-right DropDown that has submenus. Without this, the menu
opens left past the page boundary, which can trigger the scrollbars and
cause other nastiness.
2012-09-16 03:02:31 -04: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
Adrien Cahen
5331fe39df
fix active tab bg on non-white body
2012-09-13 12:16:18 -07:00
Mark Otto
595e1a189c
fixes #5119 : javascript in navbar typo
2012-09-13 10:07:57 -07:00
Brian Campbell
a40ab1cd66
mistakenly committed ALL assets. since only bootstrap.css and bootstrap.min.css are changed i removed all others
2012-09-12 18:11:42 -06: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
65d322958c
add space
2012-09-12 16:11:03 -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
Mark Otto
bbadd429a8
change up box-shadow mixin usage everywhere to use escaping again, or local var if necessary for further var evaluation
2012-09-12 15:48:56 -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
cd2b12f788
fixes #5064 manually: remove fancy quote mark
2012-09-10 22:41:14 -07:00
Mark Otto
7110b243f5
more tests and experiments
2012-09-10 10:11:02 -07:00
Mark Otto
10faf28aef
Merge pull request #5051 from GeoffYoung/2.1.2-wip
...
Update modal example code to match example
2012-09-10 10:04:34 -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
1f8e2d2617
Merge branch 'dionysiosarvanitis-master' into 2.1.2-wip
2012-09-07 11:41:35 -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
Dionysios G. Arvanitis
cc4f8b9f6c
remove offset margin in row-fluid mobile layout
2012-09-07 17:54:15 +03:00
Giuliano Velli
501a2d69e1
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
2012-09-07 10:13:26 +02:00
Giuliano Velli
7762a77c21
Modified the file to conform to bootstrap standards and fix an IE7 css selector issue
...
Signed-off-by: Giuliano Velli <giuliano@giusi.org >
2012-09-07 09:59:52 +02: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
Slavi Pantaleev
5ff5d351bf
Do not force white icons in active tab links
...
Active `.nav-tabs` elements are not blue (like pills),
so forcing a white icon there is not appropriate.
2012-09-05 19:07:53 +03:00
Jacob Thornton
c52368d3c5
last rebuild before 2.1.1 release
2012-09-04 20:44:11 -07:00
Mark Otto
df8e3c6ee3
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
2012-09-04 20:13:36 -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
♒∆✝
9341bb756b
Merge pull request #4784 from rossj/2.1.1-wip
...
Fix Typeahead key navigation with Chrome + jQuery 1.8.0
2012-09-04 20:03:04 -07:00
♒∆✝
9d890a8412
Merge pull request #4810 from mainerror/2.1.1-wip
...
Makefile misses a 'clean' directive
2012-09-04 19:54:16 -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
73ef263d5f
improve comments in image styles
2012-09-04 11:31:48 -07:00
Mark Otto
bf590d8c81
fixes #4958 : add version to minified js
2012-09-04 11:13:08 -07:00
Mark Otto
a1d2ee6542
fixes #4885 : correct use of skew in .skew() mixin for FF
2012-09-04 11:08: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
acf2a64016
fixes #4935 : properly comment responsive image techniques and add CSS tests to support
2012-09-03 17:35:35 -07:00
Mark Otto
8cda830eaf
fixes #4146 : IE7-8 responsive image helper
2012-09-03 01:13:42 -07:00
Mark Otto
f25129361b
add comment to go with updated box-shadow mixin
2012-09-03 01:04:53 -07:00
Mark Otto
f46813a8c8
Merge pull request #4763 from Luis-TP/2.1.1-wip
...
Improve .box-shadow mixin by utilizing regex function to no longer require escaping
2012-09-03 01:03:37 -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
Octavian Damiean
a976a1583c
Added 'clean' directive to the make file.
2012-08-29 13:24:00 +02: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
Ross Johnson
b5373d8561
Merge remote-tracking branch 'origin/2.1.0-wip' into 2.1.1-wip
2012-08-28 11:14:34 -05:00
Ross Johnson
66ad3d62c6
Fix key events with Chrome + jQuery 1.8.0
2012-08-28 00:55:56 -05: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
Jacob Thornton
215d92bacd
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
2012-08-27 21:27:31 -07:00
Jacob Thornton
4751a0a274
crude check to make sure element has a # for an id
2012-08-27 21:27:01 -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
Mark Otto
438f745ea2
Merge pull request #4765 from globocom/missing-i18n-tag-getting-started-download-page
...
i18n tags missing in some strings at getting started download page
2012-08-27 20:06: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
Luis Aleman
2719ac3e9b
Unescaped box-shadows to take advantage of new box-shadow mixin
2012-08-27 19:14:00 -04:00
Luis Aleman
67eae2a503
Do not need to write box-shadow in full
2012-08-27 19:13:37 -04:00
Luis Aleman
96a1797af1
No longer need to write box-shadows in full when using lighten or other functions
2012-08-27 19:13:11 -04:00
Luis Aleman
1b7a3ca416
Changed box-shadow mixin to accept infinite, comma separated, shadows
2012-08-27 19:10:20 -04: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
12d5c88c20
fixes #4742 : add default value to striped gradient
2012-08-27 09:53:23 -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
cfa039d2e0
Merge branch 'sparanoid-master' into 2.1.1-wip
2012-08-26 22:30:49 -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
Tunghsiao Liu
ec6b320003
Add .transition-delay mixin
2012-08-26 13:09:10 +08:00
Mark Otto
bb9d1af1ca
fixes #4672 manually: placeholder comment
2012-08-25 21:51:07 -07:00
Mark Otto
aa07523e69
Merge branch '2.1.1-wip' of github.com:twitter/bootstrap into 2.1.1-wip
2012-08-25 19:41:25 -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
d9fe9af966
Merge pull request #4643 from rpavlik/codespell
...
Spelling mistake in tooltip test
2012-08-23 09:51:20 -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
Ryan Pavlik
019d9bf0f3
Fix typo found with codespell.
2012-08-23 11:41:55 -05: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
582b178723
fixes #4542 manually: typo in phantomjs and space between url in markdown
2012-08-22 10:44:41 -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
1973c64342
Merge branch 'PavelDemyanenko-patch-1' into 2.1.1-wip
2012-08-21 14:42:25 -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
philippm
6e7ba4e24a
Fix all submenus expanded recursively in dropdown
...
The problem was that the CSS selector made *all* of a submenu's nested
menus visible. Fixed by applying the selector to the immediate nested
menu only.
2012-08-21 22:10:36 +01: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
6dc13573bf
add css tests and stuff for #4528
2012-08-21 13:42:00 -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
94f9f9de73
Merge branch 'UTGuy-master' into 2.1.1-wip
2012-08-21 13:07:11 -07:00
Mark Otto
e5060b8d92
clean up spacing and run make
2012-08-21 13:07:06 -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
UTGuy
5fc5d26917
Update less/variables.less
...
https://github.com/twitter/bootstrap/issues/4508
should fix this issue
2012-08-21 11:21:28 -03:00
Pavel Demyanenko
fe3ed433e4
Fix bug Collapse broken in IE
2012-08-21 14:33:15 +04: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
Mark Otto
471d913ab6
add bottom margin back to sidenav for narrow tablets
2012-08-20 16:37:46 -07:00
Mark Otto
cbc7873bb4
fix jittering of sidenav
2012-08-20 16:33:41 -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
aa2cec6f2f
fixes #4178 : translate3d instead of translate
2012-08-20 14:26:38 -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
ed13ec50f8
Merge branch 'patch-1' of https://github.com/krnlde/bootstrap into krnlde-patch-1
2012-08-20 11:28:43 -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
a12c19b3c8
updated package and readme
2012-08-19 23:05:16 -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
94ba211c40
fixes #4462 : mixins instead of vanilla css
2012-08-19 20:32:29 -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
Kai Dorschner
1e190d8036
Fix for thumbnails in responsive design
2012-08-19 17:32:40 +03: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
39f779b5d3
Merge pull request #4419 from natansh/2.1.0-wip
...
Fix typo to make dropdown active link show icon-white
2012-08-17 11:23:22 -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
Natansh Verma
bb61175eba
Fixes typo for issue #4413 .
2012-08-16 17:09:55 +05:30
Mark Otto
54c645e33d
tweak transition
2012-08-15 14:49:55 -07:00
Mark Otto
fd509cb370
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-08-15 14:45:41 -07:00
Mark Otto
ada5589184
add transition to thumbnails
2012-08-15 14:45:35 -07:00
Mark Otto
74bda55d4c
Merge pull request #4406 from mikaelkael/fix/add-affix-to-compilation
...
Add affix.js to javascript compilation
2012-08-15 09:36:35 -07:00
tobz
48f5626499
Fixed spelling error in forms documentation.
2012-08-15 11:07:43 -03:00
tobz
27e9214e05
Removed pixel designation from a zeroed-out property.
2012-08-15 10:38:59 -03:00
tobz
ddefdbf31f
Added default top margin of 1px for icons.
2012-08-15 10:38:21 -03:00
tobz
6bfa58ea4d
Updated margin adjustments of button-based icon overrides.
2012-08-15 10:37:49 -03:00
Mickael Perraud
6a1521327b
Add affix.js to javascript compilation
2012-08-15 10:56:52 +02:00
Mark Otto
b0437bef76
Merge pull request #4274 from Marmelatze/three-color-gradient
...
Force percentage value on .vertical-three-colors() gradient mixin.
2012-08-14 22:07:17 -07:00
Jacob Thornton
ff38c14948
stray ;
2012-08-14 21:23:29 -07:00
Jacob Thornton
ae9a2bd93a
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
2012-08-14 21:06:39 -07:00
Jacob Thornton
dee57462e2
get affix actually working and update docs
2012-08-14 21:06:08 -07:00
Mark Otto
e1659b2c4e
add affix plugin to downloads page
2012-08-14 18:57:27 -07:00
Mark Otto
2ee035403d
running make on prev merge
2012-08-14 16:28:17 -07:00
Mark Otto
61a8ef2feb
Merge branch 'fix/center-text-navbar' of https://github.com/mikaelkael/bootstrap into mikaelkael-fix/center-text-navbar
2012-08-14 16:27:01 -07:00
Mark Otto
9c72246d49
navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946
2012-08-14 16:24:58 -07:00
Mark Otto
f3479a3953
compensate for ie7 button padding with no borders, fix indentation
2012-08-14 15:44:25 -07:00
Mark Otto
f933a41c7b
remove bottom margin on radios and checkboxes
2012-08-14 15:34:10 -07:00
Mark Otto
780636d955
fixes #3674 : checkbox vertical alignment in IE9
2012-08-14 15:29:47 -07:00
Mark Otto
b14d946afb
add animation to docs download btn for firefox
2012-08-14 15:12:22 -07:00
Mickael Perraud
41093a328e
Center text in navbar with change to @baseLineHeight (18 -> 20px)
2012-08-15 00:11:57 +02:00
Mark Otto
a80dafbb18
fix width of star github btn in docs
2012-08-14 15:00:22 -07:00
Mark Otto
5144c77b27
fixes #4358 : make select elements 30px tall to match inputs
2012-08-14 14:57:49 -07:00
Mark Otto
50df524ba1
remove borders entirely from fixed navbars
2012-08-14 14:53:45 -07:00
Mark Otto
dbcd87331d
fixes #4371 : scope hovers on table rows to tbody
2012-08-14 14:51:33 -07:00
Mark Otto
662fface3b
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-08-14 14:32:10 -07:00
Mark Otto
0b0d7f104c
fixes #4396 : pull right dropdown menus no longer overlaid by submenus
2012-08-14 14:32:03 -07:00
Mark Otto
2a6deb92b1
fixes #4395 : scope dropdown menu caret in navbar to first level dropdown only
2012-08-14 14:29:31 -07:00
Mark Otto
75e5279e01
Merge pull request #4393 from Nivl/2.1.0-wip
...
Fix .thumbnail line-height
2012-08-14 14:25:31 -07:00
Melvin
f6ac297903
Fix .thumbnail line-height
2012-08-14 21:06:35 +03:00
Mark Otto
e9b04acb92
Merge pull request #4384 from andriijas/2.1.0-wip-js-typo-fix
...
now with 13 custom jquery plugins
2012-08-14 09:54:04 -07:00
Mark Otto
57ea6fea76
Merge pull request #4376 from kylase/2.1.0-wip
...
Changed placeholders values
2012-08-14 09:30:27 -07:00
Andreas Cederström
2df0a0fdeb
now with 13 custom jquery plugins
2012-08-14 13:58:12 +02:00
Mark Otto
4bf93a2d76
fixes #4265 : restore chromium select fix
2012-08-13 23:03:35 -07:00
Mark Otto
97a23ef2e6
fixes #4342 : navbar vars not in use, render navbar dividers
2012-08-13 22:57:40 -07:00
kylase
d684607976
Amend placeholders values
2012-08-14 13:51:50 +08:00
Mark Otto
0040a78058
merge
2012-08-13 21:35:31 -07:00
Mark Otto
41f4c60a91
fixes #4373 : broken examples link on homepage
2012-08-13 21:34:40 -07:00
Mark Otto
cf33664b0c
Merge pull request #4372 from hho/patch-2
...
Fixed a typo in inverse navbar code sample
2012-08-13 21:32:24 -07:00
kylase
d96047f45f
Changed placeholders value of @baseFontSize and @baseLineHeight to the values specified in variables.less
2012-08-14 11:57:13 +08:00
Henning Hoefer
a74457a203
Fixed a typo in inverse navbar code sample
2012-08-14 02:10:07 +02:00
Mark Otto
cf4fd1abbe
Merge pull request #4367 from benjaminoakes/2.1.0-wip
...
Fix wording of "Button dropdowns" docs
2012-08-13 16:13:01 -07:00
Ben Oakes
e31f06b857
Fix wording (presumed typo)
2012-08-13 13:22:08 -05:00
Mark Otto
9f8ce77751
running make on previous changes
2012-08-13 10:05:19 -07:00
Mark Otto
5df1e2c00a
hotfix: github buttons urls
2012-08-09 14:00:24 -07:00
Mark Otto
e06c257e6b
fix gh buttons
2012-08-09 11:25:34 -07:00
Mark Otto
f6c7ac51f2
add some simple styles for showing white icons on hover where appropriate
2012-08-08 11:26:22 -07:00
Mark Otto
08e4475f00
reorg vars fields on customize page to ensure they are all in three columns for time being
2012-08-07 23:11:23 -07:00
Mark Otto
3c89f7bb5f
fix chevron on js docs and run make after table changes
2012-08-07 23:07:53 -07:00
Mark Otto
85f1f2257b
make twitter bird white in illustration on homepage to abide by brand guidelines
2012-08-07 23:05:39 -07:00
Mark Otto
03eee23952
speed up animation and brightness on docs download
2012-08-07 23:02:01 -07:00
Mark Otto
4eee78e051
fixes #4304 : more specific selectors on table border classes to override .table-striped
2012-08-07 22:50:49 -07:00
Mark Otto
a525a6fe33
Merge pull request #4300 from rilian/2.1.0-wip
...
optimizing images on 2.1.0-wip branch; saving couple of KBs from package
2012-08-07 22:45:53 -07:00
Mark Otto
8ed77c41f0
fixes #4295 : add vars for pagination
2012-08-07 22:37:38 -07:00
Mark Otto
0cb3ba6b23
run make after merging #4289
2012-08-07 22:34:39 -07:00
Mark Otto
aeed751a7f
Merge pull request #4289 from coliff/patch-4
...
Update docs/templates/pages/javascript.mustache
2012-08-07 22:34:09 -07:00
rilian
80a645b52a
optimizing images on 2.1.0-wip branch; saving couple of KBs from package
2012-08-06 13:23:12 +03:00
Mark Otto
3823d29c04
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-08-05 00:15:21 -07:00
Mark Otto
f61dd7239b
fixes #4277 : typo
2012-08-05 00:15:09 -07:00
Christian
25c6175311
Update docs/templates/pages/javascript.mustache
...
Amended all mentions of 'Javascript' and 'javascript' in the body text to the correct 'JavaScript'.
2012-08-05 12:39:17 +09:00
Florian Pfitzer
fa38ab573b
Fixes vertical-three-colors in Firefox
2012-08-03 16:56:59 +02:00
Jacob Thornton
88deb08ff2
Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip
2012-08-02 16:58:51 -07:00
Jacob Thornton
2b2b3303e1
fix indexof on array for ie8
2012-08-02 16:58:25 -07:00
Mark Otto
33c6ab9b20
decrease docs nav padding
2012-08-01 23:21:06 -07:00
Mark Otto
d27dcf3b07
cut down on selectors on .formFieldState() mixin to origin input catchall
2012-08-01 23:16:49 -07:00
Mark Otto
1482030679
fixes #4207 : redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit
2012-08-01 23:15:51 -07:00
Mark Otto
1e2edaef48
add test for #4236 : button group, one button with text and one with icon, now line up properly
2012-08-01 22:52:53 -07:00
Mark Otto
fc7ecd78c8
add select element responsive CSS test
2012-08-01 20:58:33 -07:00
Mark Otto
4a84145c43
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-08-01 20:34:29 -07:00
Mark Otto
86a577d76b
decrease box-shadow
2012-08-01 20:34:19 -07:00
Jacob Thornton
48546c2735
aria-labelledby="myModalLabel" aria-hidden="true"
2012-08-01 20:26:44 -07:00
♒∆✝
7ec1778103
Merge pull request #4257 from ginader/modal-accessibility
...
close #3531 added focus handling and removed the badly announced "times"...
2012-08-01 20:23:50 -07:00
Dirk Ginader
6977d35eed
close #3531 added focus handling and removed the badly announced "times" close button from screenreaders
2012-08-01 20:11:16 -07:00
Mark Otto
225d0e0af3
label new css test
2012-08-01 19:36:28 -07:00
Mark Otto
1bb7c0e669
fixes #4254 : make .span12 expand full width of a parent when responsive
2012-08-01 19:33:37 -07:00
Mark Otto
3c742fc08b
add test for textarea at .span12, really fix docs footer
2012-08-01 19:25:50 -07:00
Mark Otto
72323051c3
increase padding on navbar responsive nav links, fix footer margins
2012-08-01 19:18:42 -07:00
Mark Otto
c2e899f2a0
remove the canvas slider doodad
2012-08-01 19:00:25 -07:00
Mark Otto
fe93b926b4
add popover and tooltip components
2012-08-01 18:08:31 -07:00
Mark Otto
fbc053692d
add components section to docs for isolated examples
2012-08-01 18:06:02 -07:00
Mark Otto
b979cd9e67
darken default button borders
2012-08-01 17:01:29 -07:00
Mark Otto
7aaf141371
add compability note to image styles
2012-08-01 16:57:27 -07:00
Mark Otto
e8fd7e6c96
fix jank button on docs homepage
2012-08-01 16:15:21 -07:00
Mark Otto
735001cb26
increase horizontal padding on inputs given new font-size
2012-08-01 11:53:00 -07:00
Mark Otto
5637c6fb70
pulsing download button on homepage
2012-08-01 11:52:48 -07:00
Mark Otto
fab1a80dcb
increase margin on checkboxes and radios to center properly
2012-08-01 11:35:31 -07:00
Mark Otto
060e216712
fixes #4253 : hover on responsive navbar
2012-08-01 09:18:00 -07:00
♒∆✝
6905dbe98d
Merge pull request #4241 from shama/issue-guidelines
...
Use ref instead of label when checking branches in issue-guidelines
2012-08-01 00:52:52 -07:00
Kyle Robinson Young
1f70dd71c8
Use ref instead of label when checking branches in issue-guidelines
2012-07-31 15:16:40 -07:00
Mark Otto
31b30ab88e
copy edits to docs
2012-07-31 00:06:37 -07:00
Mark Otto
e191964ff8
reorder docs css
2012-07-31 00:01:04 -07:00
Mark Otto
9795e9bbe6
place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav
2012-07-30 23:48:26 -07:00
Mark Otto
196fb1d86a
fixes #3615 : remove last-child hack for IE7 since IE7 doesn't support :last-child
2012-07-30 22:26:54 -07:00
Mark Otto
59eba9afbc
remove position from labels/badges in mini btns
2012-07-30 15:54:03 -07:00
Mark Otto
0e62011da0
fix download page links
2012-07-30 15:52:38 -07:00
Mark Otto
364dbb7931
fixes #3665 : ensure inputs in a fluid row maintain grid sizing
2012-07-30 15:38:36 -07:00
Mark Otto
be8d5243f4
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-30 13:25:49 -07:00
Mark Otto
a9bf1e6e35
fixes #3900 : nudge badges in buttons up 1px
2012-07-30 13:25:27 -07:00
Mark Otto
1f30faac73
Merge pull request #4229 from conzett/master
...
Add 'dist' directory to .gitignore
2012-07-30 13:08:29 -07:00
Mark Otto
b2ebd5c46c
update button styles to use updated 14px base font size, align carets to others with no opacity changes
2012-07-30 12:52:44 -07:00
Mark Otto
7fa99fb1fe
fix navbar form alignment, and update examples to show these cases
2012-07-30 12:15:08 -07:00
Graham Conzett
178397ae5e
Add 'dist' directory to .gitignore
...
Allows you to keep a 'dist' directory in the repository as a target build location.
This can be useful if you have bootstrap as a submodule in a project and want to build it,
but still keep it self-contained. Similar to how jQuery does their default builds:
https://github.com/jquery/jquery/#how-to-build-your-own-jquery
2012-07-30 14:10:01 -04:00
Mark Otto
6bf661aceb
new fav and touch icons to match new masthead
2012-07-30 10:33:48 -07:00
Mark Otto
04164e4367
fixes #3858 : add var for responsive navbar. also add additional examples to navbar docs
2012-07-30 10:25:04 -07:00
Mark Otto
b63543181a
fix examples collapse classes, rename navbar-redux to navbar and delete the old one
2012-07-30 10:08:27 -07:00
Mark Otto
cfac4bb59d
fixes #4221 : correct border-collapse property for IE7 hack
2012-07-29 23:51:40 -07:00
Mark Otto
84a9c74efd
fix footer in responsive
2012-07-29 23:51:18 -07:00
Mark Otto
22a9a83656
fixes #3694 : provide override classes for .hide and .pull-right for grid columns
2012-07-29 16:51:24 -07:00
Mark Otto
d63ebe3f3c
more breadcrumb tweaks for contrast
2012-07-29 16:37:37 -07:00
Mark Otto
87ce3489d3
remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons
2012-07-29 16:25:20 -07:00
Mark Otto
761429d88a
Merge branch '2.1.0-wip-navbar' into 2.1.0-wip
2012-07-29 16:24:05 -07:00
Mark Otto
134d11b528
use shorthand on form field transitions for box-shadow mixin
2012-07-29 12:10:29 -07:00
Mark Otto
e56a700849
fixes #4210 : indenting on hero example
2012-07-29 12:07:18 -07:00
Mark Otto
5184da39f4
clear out docs assets, update and png crush features image
2012-07-29 00:44:55 -07:00
Mark Otto
a30045daef
reverse navbar styles to save code
2012-07-29 00:30:15 -07:00
Mark Otto
fe6a4b0b54
add .btn-block for a full-width button option
2012-07-27 15:42:58 -07:00
Mark Otto
16b4ac0d8f
add docs for sub menu support on dropdowns, add caret via :after to submenu toggles
2012-07-27 10:35:15 -07:00
Mark Otto
9d5c431223
add basic support for sub menus in dropdown menus
2012-07-27 10:06:54 -07:00
Mark Otto
1e9b450619
add image styles, for now to scaffolding (soon to own file)
2012-07-27 00:06:43 -07:00
Mark Otto
6474190746
increase height of homepage jumbotron, update vars and styles of popovers
2012-07-26 23:42:36 -07:00
Mark Otto
79067721b1
fix js docs formatting
2012-07-26 23:21:06 -07:00
Mark Otto
4bb2a13776
rerun make
2012-07-26 21:45:30 -07:00
Mark Otto
f75277e62d
indenting and such
2012-07-26 21:45:19 -07:00
Mark Otto
880bdbc4dd
simplify styles for bs docs nav
2012-07-24 16:07:25 -07:00
Jacob Thornton
c10a357bb3
don't bite so hard
2012-07-24 12:57:00 -07:00
Mark Otto
fa6a131eb6
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-24 01:53:45 -07:00
Mark Otto
b7b4fd5c82
wrap footer in bs docs canvas for scrolling doodad
2012-07-24 01:53:32 -07:00
Mark Otto
7590e65f6f
fix search form, mostly in navbar
2012-07-24 01:44:12 -07:00
Jacob Thornton
e2fc202df2
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
2012-07-24 00:49:19 -07:00
Jacob Thornton
c98b75c979
added fade out on scroll - we can pull this if you prefer it
2012-07-24 00:48:45 -07:00
Mark Otto
394922a1bf
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-24 00:44:20 -07:00
Mark Otto
87aa61001e
fixes #4118 : responsive modal gets width auto and improved positioning for narrower widths
2012-07-24 00:44:11 -07:00
Mark Otto
c37aa99e28
modal heading line-height
2012-07-24 00:37:19 -07:00
Mark Otto
4912dd441d
fix h3 in modal and make modal unhidden by removing important from earlier issue
2012-07-24 00:35:54 -07:00
Jacob Thornton
e38fa4b1f4
fix scroll thinggg
2012-07-24 00:30:58 -07:00
Jacob Thornton
5b2f2ed821
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/css/docs.css
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-07-24 00:24:25 -07:00
Jacob Thornton
4ea7c47235
slightly fix side bar
2012-07-24 00:21:40 -07:00
Mark Otto
7ce048bccd
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-23 23:57:13 -07:00
Mark Otto
cd441e082f
fixes #4156 : don't override border radius if stacked nav has one child
2012-07-23 23:56:13 -07:00
Mark Otto
6245886b26
tweak docs shadows
2012-07-23 23:54:26 -07:00
♒∆✝
802ced9ca5
Merge pull request #4166 from jonathansampson/2.1.0-wip
...
IE10 uses 'transition' and 'transitionend'
2012-07-23 23:15:46 -07:00
Mark Otto
f085dbadd1
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/css/docs.css
docs/base-css.html
docs/components.html
docs/customize.html
docs/getting-started.html
docs/javascript.html
docs/scaffolding.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/customize.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/javascript.mustache
docs/templates/pages/scaffolding.mustache
2012-07-23 23:01:38 -07:00
Jonathan Sampson
2a0cf0f131
IE10 uses 'transition' and 'transitionend'
...
msTransition, while supported in IE, should be ignored in favor of the
unprefixed property. Additionally, MSTransitionEnd should also be
ignored in favor of the unprefixed event transitionend.
Current unit test requires no attention in light of this change.
MSDN:
http://msdn.microsoft.com/en-us/library/ie/hh673535(v=vs.85).aspx#transitions_dom_events
2012-07-24 01:50:38 -04:00
Mark Otto
0dda2c4659
make docs scroll over jumbotrons, but only for 980px up
2012-07-23 22:36:08 -07:00
Jacob Thornton
614d52bd7f
delete this test for now - as affix is still heavily underdevelopment
2012-07-23 18:17:43 -07:00
Jacob Thornton
5247b15411
following #4148
2012-07-23 18:12:23 -07:00
♒∆✝
685785d2c2
Merge pull request #4159 from ixti/opera11-transitions-fix
...
Fix transition end name for opera 11+12
2012-07-23 17:58:38 -07:00
Mark Otto
5b8838aeac
more alignment fixes for customize page
2012-07-23 12:51:48 -07:00
Mark Otto
b05fc00d59
fixes #4148 , readme typo
2012-07-23 12:51:36 -07:00
Aleksey V Zapparov
76cfe17002
Fix transition end name for opera 11+12
...
Fix transition end name for Opera 11 and Opera 12.
Should fix issues: #3896 , #3897 , #4157 , #4158
2012-07-23 20:56:18 +02:00
Jacob Thornton
e25bcb93fc
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
2012-07-22 18:29:01 -07:00
Jacob Thornton
dcf75697ec
some progress on affix plugin
2012-07-22 18:28:39 -07:00
♒∆✝
cf70fb629f
Merge pull request #3842 from alienlebarge/2.1.0-wip
...
<img /> tag with `height` attr are not responsive
2012-07-22 14:59:08 -07:00
Jacob Thornton
fa1e1e34df
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
2012-07-22 14:52:13 -07:00
Jacob Thornton
fae6c36874
adds minLength #3960
2012-07-22 14:50:52 -07:00
♒∆✝
48fc0ad569
Merge pull request #4104 from lookfirst/2.1.0-wip-fix-destroy
...
namespace the events for popover/tooltip
2012-07-22 14:40:09 -07:00
Jon Stevens
d76c899142
remove the ns option
2012-07-22 14:36:23 -07:00
Mark Otto
e9f374f041
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-22 14:31:58 -07:00
Mark Otto
5b8ff7061b
fixes #4136 : use @dropdownBorder var, but keep IE7-8 fallback
2012-07-22 14:31:39 -07:00
Jon Stevens
393f4a7b42
simplify things to one line. pull #4104
2012-07-22 14:19:11 -07:00
Jacob Thornton
8281a9023a
*face palm*
2012-07-22 13:21:44 -07:00
Jacob Thornton
77dea2c5eb
change haunt to write
2012-07-22 13:00:17 -07:00
Jacob Thornton
6c2fa9430c
add haunt w/ issue guideline spec
2012-07-22 12:57:39 -07:00
Mark Otto
b9105b98f9
move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons
2012-07-20 22:06:47 -07:00
Mark Otto
ee750bbce1
tweak docs masthead links hover
2012-07-20 21:38:28 -07:00
Jon Stevens
117f65d431
on destroy, also hide. issue #3880 , pull #4104
2012-07-20 09:47:12 -07:00
Mark Otto
1d4660beea
nuke commented out code from last fix
2012-07-19 21:25:42 -07:00
Mark Otto
3c1a0fbda4
fixes #4103 : simpler fix for tfoot in .table-border
2012-07-19 21:25:24 -07:00
Mark Otto
89d7ec5290
fixes #4102 : properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer
2012-07-19 21:06:42 -07:00
Mark Otto
6c23fff4d6
misc docs content changes
2012-07-18 01:06:52 -07:00
Mark Otto
c8fa2600f2
copy change
2012-07-17 23:38:29 -07:00
Mark Otto
aac3736eea
fixes #3845 : add .btn-link for transparent buttons styled as links
2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0
Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
...
Conflicts:
docs/base-css.html
docs/templates/pages/base-css.mustache
2012-07-17 23:14:58 -07:00
Mark Otto
ba90d0fc5e
Merge pull request #4110 from purwandi/develop
...
Moved JS to bottom on extends page
2012-07-17 22:44:26 -07:00
Mark Otto
326b665065
de-scope nav-header from .nav
2012-07-17 22:40:38 -07:00
Purwandi
a8316c780d
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into develop
2012-07-18 12:33:16 +07:00
Mark Otto
39f8996d6a
fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding
2012-07-17 22:26:53 -07:00
Purwandi
51c9fa1697
Moved JS to bottom on extends page
2012-07-18 12:19:02 +07:00
Mark Otto
6a663081a7
remove separate examples page, add to getting started page
2012-07-17 21:45:57 -07:00
Mark Otto
a1ad6d124a
Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip
...
Conflicts:
docs/extend.html
docs/templates/pages/extend.mustache
2012-07-17 20:57:20 -07:00
Mark Otto
62f6368344
center masthead bg pattern
2012-07-17 20:22:55 -07:00
Mark Otto
25bc298aff
pngcrush masthead pattern to save 10k
2012-07-17 19:55:02 -07:00
Mark Otto
4008d666a5
new pattern for masthead
2012-07-17 19:54:29 -07:00
Mark Otto
16fa610ea4
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-17 19:11:51 -07:00
Mark Otto
478396fd4e
remove list-type declarations from ul and ol elements since those should just use browser defaults
2012-07-17 19:11:41 -07:00
Jon Stevens
2ee9b2717b
namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880
2012-07-16 16:01:11 -07:00
Ben Oakes
426e7d9fbd
Compiled; ignoring bootstrap.css change to avoid conflicts
2012-07-16 09:31:18 -04:00
Ben Oakes
9581cbfe32
Two of the three apps are for Linux/Windows; adjust accordingly
2012-07-16 09:29:49 -04:00
Mark Otto
40ab928315
Merge pull request #4083 from martinbean/2.1.0-wip
...
Moved JS to bottom as per best practices
2012-07-15 16:26:42 -07:00
Mark Otto
e20d2dfe9d
docs cleanup and blockquote cleanup for .pull-right option
2012-07-15 16:13:25 -07:00
Mark Otto
750badabf7
copy edits and tweaks to utility classes to ensure they always are specific enough
2012-07-13 14:43:51 -07:00
Martin Bean
74b167b86d
Moved JS to bottom as per best practices
2012-07-13 22:25:47 +01:00
Mark Otto
463de252a9
update static assets section of extend page, copy changes elsewhere
2012-07-13 14:20:25 -07:00
Mark Otto
6e622ee763
more content edits to Extend
2012-07-13 11:18:35 -07:00
Mark Otto
93b1519017
content edits to Extend page
2012-07-13 11:17:22 -07:00
Mark Otto
5cb116beb8
cleanup subnav example
2012-07-13 10:58:20 -07:00
Mark Otto
2d4f5eb5a4
fix indenting on getting started page
2012-07-13 00:56:18 -07:00
Mark Otto
fae691c3d9
some analytics tracking on getting started
2012-07-12 21:41:51 -07:00
Mark Otto
f22b06097a
add download links to getting started
2012-07-12 21:41:07 -07:00
Mark Otto
f36060dab5
remove getting started link from home, add to navbar, overhaul getting started docs
2012-07-12 21:40:25 -07:00
Mark Otto
9343e1e933
remove getting started link from home, add to navbar, overhaul getting started docs
2012-07-12 21:38:18 -07:00
Mark Otto
a12f0e551f
overhaul docs on sub pages, clean up css and copy
2012-07-12 18:11:49 -07:00
Mark Otto
549d61fc28
updated footer
2012-07-12 17:02:55 -07:00
Mark Otto
7d324ee35b
Merge branch 'respclasses' of https://github.com/digitaldisseny/bootstrap into digitaldisseny-respclasses
2012-07-12 16:24:37 -07:00
Mark Otto
3c775f2432
add chevrons to other docs navs
2012-07-12 16:23:21 -07:00
Mark Otto
280dfda6ed
docs css cleanup for spacing and stuff
2012-07-12 16:16:06 -07:00
Mark Otto
c884d6eaa6
clean up docs for subnav
2012-07-12 13:50:27 -07:00
Mark Otto
338c7ef2b6
tweak code snippet on pager and clean up type and font-sizes on docs Home
2012-07-12 13:45:07 -07:00
Mark Otto
5b5352c92d
fix grid alignment on scaffolding
2012-07-11 11:15:04 -07:00
Roberto - phproberto
f0ed383e51
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into respclasses
2012-07-11 01:31:44 +02:00
Mark Otto
713105774f
fixes #3706 : add textColor and textShadow as options to .buttonBackground mixin
2012-07-10 00:45:44 -07:00
Mark Otto
a750551fee
add vars for tooltip customization via background and color
2012-07-10 00:36:21 -07:00
Mark Otto
5d8e78e0fa
fixes #3605 : add support for input-prepend/-append to .form-search
2012-07-10 00:32:30 -07:00
Roberto - phproberto
83846ba0d6
Fixes #4002 responsive utilities classes
2012-07-10 08:12:16 +02:00
Mark Otto
75d952ffd8
fix indenting and remove hidden subnav on Components
2012-07-09 22:40:58 -07:00
Mark Otto
0ca210395c
fix indenting and remove hidden subnav on Scaffolding
2012-07-09 22:36:12 -07:00
Mark Otto
3ea309568f
fix indenting and remove hidden subnav on Base CSS docs
2012-07-09 22:34:33 -07:00
Mark Otto
c74dddd02e
fix indenting on extend and js docs pages, remove hidden subnavs
2012-07-09 22:29:53 -07:00
Mark Otto
6f8226a393
update Extend docs page to include side nav and spec out next section for extending with static assets
2012-07-09 22:25:00 -07:00
Mark Otto
64e87a85f5
remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1
2012-07-09 22:14:30 -07:00
Mark Otto
f4877c2369
fix up docs popover examples and copy
2012-07-09 21:13:33 -07:00
Mark Otto
148e5a3d89
fixes #3291 : remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF
2012-07-09 21:07:49 -07:00
Mark Otto
f495a8d0cc
fixes #3210 : add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form
2012-07-09 21:01:29 -07:00
Mark Otto
413c05a09d
fixes #3381 : update docs to show correct media query range on responsive utilities
2012-07-09 20:55:11 -07:00
Mark Otto
93be608bf0
fixes #3384 : add support for multiple inputs per line when using grid sizing
2012-07-09 20:49:17 -07:00
Mark Otto
dbea3e2784
update comments after merging gradient change
2012-07-09 00:53:56 -07:00
Mark Otto
646c87c151
Merge pull request #3937 from codler/patch-4
...
Update linear-gradient standard
2012-07-09 00:53:18 -07:00
Mark Otto
7800fee7e0
fixes #3973 : same border on disabled inputs as default inputs:
2012-07-09 00:51:38 -07:00
Mark Otto
07f80e6fd8
fixes #4027 : same margins on .pager and .pagination
2012-07-09 00:42:38 -07:00
Mark Otto
50a945e084
Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip
...
Conflicts:
less/buttons.less
2012-07-09 00:39:56 -07:00
Mark Otto
25d0b341a9
wasn't feeling the new buttons, downsizing again until we get a better balance
2012-07-09 00:31:54 -07:00
Mark Otto
9887d3cf4a
updating docs examples to remove 13/18 resets, fix up buttons alignments and carets
2012-07-09 00:26:32 -07:00
Mark Otto
410decafad
indenting
2012-07-09 00:17:52 -07:00
Mark Otto
16cf6b30cd
docs changes for icons
2012-07-09 00:17:36 -07:00
Mark Otto
8b696ad0b5
fix text in docs about default font-size and line-height
2012-07-09 00:14:35 -07:00
Mark Otto
db9925510b
fix up carousel alignment and line-height
2012-07-08 21:47:16 -07:00
Mark Otto
20676ddd4d
adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar
2012-07-08 01:47:36 -07:00
Mark Otto
5f861ef517
fix up docs to use default container, fix responsive home changes
2012-07-07 23:16:07 -07:00
nextgenthemes
7d1c8c2a0c
Wrapped btn:hover, btn.disabled inside .btn
2012-07-07 23:20:50 +03:00
Mark Otto
3f2f96b0d7
reoder forms a bit
2012-07-07 12:52:05 -07:00
Mark Otto
e2b777d9a3
docs pre font-size and nowrap on prepend/append
2012-07-07 12:34:47 -07:00
Mark Otto
7cc916d137
Merge branch '21jumpst' into 2.1.0-wip
2012-07-07 00:48:15 -07:00
Mark Otto
c7f6499235
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-07-07 00:30:55 -07:00
Mark Otto
e2336ef02a
remove specific values for the fluid grid system and instead use LESS's percentage() function
2012-07-07 00:30:43 -07:00
Mark Otto
6d447079a4
update buttons in docs to include type
2012-07-06 15:18:56 -07:00
Mark Otto
7ff1b074ea
Merge pull request #3986 from desandro/full-height-progress-bar
...
Full height progress bar
2012-07-06 13:44:09 -07:00
Mark Otto
dc6eaafb00
vertically align inline form content
2012-07-06 10:59:46 -07:00
Mark Otto
19ea4668e5
prevent small tags from increasing height of headings
2012-07-06 10:35:08 -07:00
Mark Otto
3d770ab7bd
Merge branch 'philfreo-patch-1' into 2.1.0-wip
2012-07-06 10:22:53 -07:00
Mark Otto
095e052606
adding homepage social buttons
2012-07-06 10:10:56 -07:00
Mark Otto
cd6915cdb4
tests cleanup on type, homepage content tweaks
2012-07-05 19:45:32 -07:00
Mark Otto
68146db004
buttons and pre updates for font-size
2012-07-05 15:15:57 -07:00
Mark Otto
3c07eaa251
updates to type scale
2012-07-05 15:11:54 -07:00
Mark Otto
c6ee96c025
fix up subnav styles, add subnav search form styles, add some basic docs for subnav
2012-07-05 10:37:23 -07:00
Mark Otto
a645664e50
update thumbnails to fix display issues and refine aesthetics
2012-07-05 10:12:15 -07:00
Mark Otto
62c386259b
rewrite docs homepage, new graphics
2012-07-04 23:31:30 -07:00
Gavin Cooper (work)
b4125748b0
added ability to give rows in tables status classes .success .error and .info.
2012-07-04 12:22:34 +01:00
Phil Freo
4d6434a2c7
Adding 'connect' npm requirement as it is required to run make test (in order for it to run node js/tests/server.js)
2012-07-03 23:34:11 -07:00
Dave DeSandro
26dad5f56d
.progress .bar { height: 100% }
2012-07-02 17:21:26 -04:00
Mark Otto
3ad52ca632
fast responsive tweaks
2012-07-01 22:49:01 -07:00
Mark Otto
70e81e6f55
new jumbotron
2012-07-01 08:42:09 -07:00
Mark Otto
fb29075926
Merge pull request #3976 from benvinegar/master
...
Fix Opera .clearfix bug when using contenteditable
2012-06-30 22:05:03 -07:00
Mark Otto
cd2d82150c
standardize top level file comments
2012-06-28 21:46:45 -07:00
Mark Otto
98ebd54800
address issues with fixed subnav like borders, corners, etc
2012-06-28 21:20:40 -07:00
Mark Otto
6f4360c47b
cleanup docs css more
2012-06-28 21:06:54 -07:00
Mark Otto
c31a4e5131
remove responsive subnav from docs and place in navbar-responsive.less
2012-06-28 20:59:16 -07:00
Mark Otto
c09e8473e2
use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta
2012-06-28 10:03:46 -07:00
Mark Otto
a683497dbc
renamed less.html to extend.html, removing all the vars and mixins
2012-06-27 23:56:00 -07:00
Han Lin Yap
2e3306d5dd
Update linear-gradient standard
2012-06-26 12:30:43 +03:00
Mark Otto
b77ed4a3a3
fix dropdowns in button groups after font-size hack
2012-06-25 20:57:04 -07:00
Mark Otto
244a9ab79d
reverse the gradient on striped progress bars so it matches the active state when animated
2012-06-25 20:20:32 -07:00
Ben Vinegar
3761d50c5a
Fix Opera .clearfix bug when using contenteditable
2012-06-25 17:35:42 -07:00
Mark Otto
a85499749a
Merge pull request #3856 from Calvein/patch-1
...
Remove useless ms prefixes
2012-06-25 17:10:02 -07:00
Mark Otto
e7e183e55d
Merge branch 'tekezo-patch-1' into 2.1.0-wip
2012-06-25 16:49:13 -07:00
Mark Otto
d65e815a48
use @textColor to change help-block/help-inline font color
2012-06-25 16:47:29 -07:00
Mark Otto
94a3d4eb14
reorder media queries
2012-06-25 16:25:50 -07:00
Mark Otto
8c2db7d7d6
prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack
2012-06-25 15:47:07 -07:00
Mark Otto
78849cf52e
remove jank fix for dt bold text
2012-06-25 15:09:39 -07:00
Mark Otto
cd466f1d0b
add tests for table grid sizing, solve bugs in fluid table grid sizing
2012-06-25 14:37:35 -07:00
Mark Otto
27845e4492
#3223 : make table row hover optional class
2012-06-25 14:11:37 -07:00
Mark Otto
508a93d9e3
make fixing of subnav work again
2012-06-24 21:07:20 -07:00
Mark Otto
6662f62236
remove subnav file, instead add an optional class for .navbar
2012-06-24 21:03:39 -07:00
Mark Otto
87af5d3bbe
more subnav optimizations
2012-06-24 20:42:31 -07:00
Mark Otto
71669dda63
tons of docs cleanup in css, adding subnav to official components
2012-06-24 20:26:48 -07:00
Takayama Fumihiko
e80f37b600
".linenums .tag" should be ".prettyprint .tag".
2012-06-24 15:26:39 +09:00
Mark Otto
160fe7ca59
create vars for responsive grid values, fixed and fluid, and document them in the customizer
2012-06-20 23:46:51 -07:00
Mark Otto
59153205b3
run make on js files
2012-06-20 23:46:29 -07:00
Mark Otto
3875a9f31b
Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip
2012-06-20 20:26:59 -07:00
Mark Otto
b353565d4e
add docs for fluid offsetting
2012-06-20 20:26:50 -07:00
Mark Otto
f2dadecbf3
Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip
2012-06-20 20:22:22 -07:00
Mark Otto
7301931a6d
Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into 2.1.0-wip
2012-06-20 20:20:22 -07:00
Mark Otto
f5a2d82a3a
Merge branch 'EngineerGio-patch-1' into 2.1.0-wip
2012-06-20 19:36:16 -07:00
Mark Otto
83e46b8df9
reorder for t-r-b-l
2012-06-20 19:36:06 -07:00
EngineerGio
5bd9217f9b
Added border-radius mixins to set single corner radius and single side border radius
2012-06-21 01:50:28 +03:00
Jacob Thornton
1e717991e8
Merge pull request #3880 from lookfirst/popover-destroy
...
Add popover / tooltip destroy method
2012-06-20 12:02:05 -07:00
Jacob Thornton
eb62c977cd
Merge pull request #3770 from Barryvdh/2.1.0-wip
...
Scope carousel .active to .item
2012-06-20 10:58:20 -07:00
Jon Stevens
3a5b4cc7df
simplify code into a single line
2012-06-20 10:42:25 -07:00
Jacob Thornton
b2b000b750
change transition end name for opera
2012-06-20 10:40:56 -07:00
Mark Otto
089f42a07f
fix html typos
2012-06-20 00:06:05 -07:00
Mark Otto
d704d6f0ed
#3861 : add span to pagination selectors for full support of non-link pagination items
2012-06-19 23:37:47 -07:00
Mark Otto
ce140662a0
remove unused container reset
2012-06-19 20:01:03 -07:00
Mark Otto
9df832b4bb
add separate vars for dropdown link hover and active states
2012-06-19 19:17:42 -07:00
Mark Otto
40298ddbf1
add note to components about nav list nesting
2012-06-19 15:25:35 -07:00
Mark Otto
ff92344f0d
remove icons example of nav list--doesn't really add anything useful
2012-06-19 14:46:14 -07:00
Mark Otto
b54264cde0
add basic vertical button group support
2012-06-19 14:42:46 -07:00
Mark Otto
64ba423b6d
#2764 : add disabled styles to navs and dropdowns
2012-06-19 13:52:07 -07:00
Mark Otto
d14f06fc4e
round select list corners
2012-06-19 13:25:35 -07:00
Mark Otto
143b6ae2de
fix less docs typos
2012-06-19 13:23:30 -07:00
Mark Otto
9aa5a6db12
updated tests and homepage marketing copy
2012-06-19 13:21:35 -07:00
Jon Stevens
af88f54e5d
small typo fix to docs
2012-06-18 19:56:52 -07:00
Jon Stevens
47e0647086
add unit tests for destroy behavior of popover and tooltip
2012-06-18 19:51:49 -07:00
Jon Stevens
6a974f9ff7
enable the ability to destroy tooltips and popovers from elements. related to issue #3453
2012-06-18 19:25:54 -07:00
Mark Otto
bae3cfd183
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-06-17 12:40:43 -07:00
Mark Otto
3add79c071
#3864 : use @baseLineHeight in alerts.less
2012-06-17 12:40:36 -07:00
Mark Otto
36e78bd7ac
Merge pull request #3863 from rosslaird/spelling
...
Corrected spelling error
2012-06-17 12:34:29 -07:00
Ross Laird
626b45d691
Corrected spelling error
2012-06-15 13:07:44 -07:00
François Robichet
fb31cdba9c
Remove useless ms prefixes
2012-06-15 15:23:40 +03:00
Mark Otto
b1cb556503
improve inline-block of append/prepend inputs with font-size: 0;
2012-06-14 11:56:46 -07:00
alienlebarge
7b726f974f
fix responsive height of image
2012-06-14 14:53:04 +02:00
Mark Otto
cda48d41ba
fix #gradientBar to .gradientBar in LESS docs
2012-06-13 22:04:02 -07:00
Mark Otto
3ead14a1e0
clarify support of select items (which is none) for input-prepend/append
2012-06-13 22:00:10 -07:00
Mark Otto
2cbff258b9
fix examples page
2012-06-11 22:33:16 -07:00
Mark Otto
1db72f8d77
Merge pull request #3810 from purwandi/develop
...
Add space between attrs in docs on navbar button
2012-06-11 22:31:58 -07:00
Mark Otto
2e6d4e9439
more rearrangement and removal of about sections in js docs
2012-06-11 22:28:10 -07:00
Mark Otto
bf875d9e36
cleanup options display in all sections, rearrange typeahead section
2012-06-11 22:19:25 -07:00
Purwandi
c7ffe6edc8
Add space on navbar button
2012-06-12 12:17:10 +07:00
Mark Otto
f453909f39
add a dropdowns section to Components (still needs work) and reformat much of the js docs
2012-06-11 21:48:41 -07:00
Mark Otto
5dd47f1196
keep tables at 13px in docs for now, clean up some modals js docs stuff
2012-06-11 20:33:00 -07:00
Mark Otto
7ed02b461b
fix blockquote alignment
2012-06-11 20:20:51 -07:00
Marcus Schwab
97cbefa72f
Merge remote-tracking branch 'upstream/2.1.0-wip' into 2.1.0-wip
2012-06-11 02:04:14 -07:00
Marcus Schwab
bd19b42c15
Proper spacing between offsets
...
row-fluids don't have the same negative margin-left as rows. This was
throwing everything off.
So added a different rule for first-child and subsequent "spans".
2012-06-11 01:51:19 -07:00
Mark Otto
681b601561
Merge branch '2.1.0-wip' of https://github.com/marcusds/bootstrap into marcusds-2.1.0-wip
2012-06-10 23:02:30 -07:00
Mark Otto
a0cd886c56
rewrite the rest of the nav section
2012-06-10 21:24:13 -07:00
Mark Otto
c90c66e61f
rewrite the split button dropdowns section
2012-06-10 21:00:20 -07:00
Mark Otto
081a07c168
updated button groups section
2012-06-10 20:50:49 -07:00
Mark Otto
017b7cb804
rewrite the navbar section
2012-06-10 20:39:00 -07:00
Mark Otto
0c817bf5e2
redo pagination and breadcrumbs
2012-06-10 16:46:46 -07:00
Mark Otto
3985379cca
rearrange hero unit section
2012-06-10 15:14:21 -07:00
Mark Otto
f2e39233f5
rewrite alerts and progress bars sections
2012-06-10 15:12:02 -07:00
Mark Otto
4a907709ba
redo icons section
2012-06-09 23:26:46 -07:00
Mark Otto
5ef2b6561a
realign icons to five cols, fix buttons
2012-06-09 22:47:45 -07:00
Mark Otto
fc2481b8e5
fix form display issue in docs
2012-06-09 19:26:06 -07:00
Mark Otto
c65006601e
overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples
2012-06-09 19:15:46 -07:00
Mark Otto
ca63ea2f26
overhaul tables docs for more streamlined content
2012-06-09 13:15:28 -07:00
Mark Otto
aff3694f28
remove mention of prettify from docs, fix docs subnav width when fixed
2012-06-09 12:58:55 -07:00
Mark Otto
550e375af0
restore scrollspy to body
2012-06-08 16:35:04 -07:00
Barryvdh
c028e33358
Scope finding the .active to .item
2012-06-08 16:19:08 +03:00
Mark Otto
269ce715f1
overhaul js docs top sections, update subhead
2012-06-07 22:24:47 -07:00
Mark Otto
97c7a83a8f
remove individual js file download buttons
2012-06-07 22:12:15 -07:00
Mark Otto
bba0b34c36
restore top navs entirely
2012-06-07 22:10:36 -07:00
Mark Otto
c1c7528dd9
drop the side nav, restore topbar
2012-06-07 21:48:03 -07:00
Mark Otto
df869f1eb0
fix grids
2012-06-07 21:45:37 -07:00
Marcus Schwab
c3f5d7c62d
ajgon's fluid offsets working with first-child
2012-06-07 17:23:22 -07:00
Igor Rzegocki
f8d68002dc
Added offsets for .row-fluid
2012-06-07 17:23:22 -07:00
Mark Otto
ff6dd0cf56
nav and content tweaks
2012-06-07 14:01:03 -07:00
Mark Otto
860a96939a
fix grid tooltips, tweaks
2012-06-07 10:58:15 -07:00
Mark Otto
f109be4e8a
update readme to match master
2012-06-07 10:31:52 -07:00
Mark Otto
857b8fb8be
Update master
2012-06-07 10:31:26 -07:00
Mark Otto
a1aa2b188a
more content changes to docs
2012-06-07 10:20:52 -07:00
Mark Otto
2ecbd36cbf
add back left rail nav, tweak colors
2012-06-06 00:48:31 -07:00
Mark Otto
10d68406fe
examples-wrap tables
2012-06-05 23:59:50 -07:00
Mark Otto
2c5ac562d2
updated type section of base css
2012-06-05 20:47:40 -07:00
Mark Otto
5a614fb86d
remove sidenav
2012-06-05 19:53:54 -07:00
Mark Otto
09ec0b843e
updated less page to single col
2012-06-05 18:29:26 -07:00
Mark Otto
8ee0679522
updated javascripts for first pass at single column
2012-06-05 18:25:46 -07:00
Mark Otto
53cec198c0
update layout for side nav
2012-06-05 17:17:20 -07:00
Mark Otto
22918f8f92
more tweaks to layouts and some docs styles
2012-06-05 17:16:17 -07:00
Mark Otto
dd127611e1
two col scaffolding rev
2012-06-05 00:46:16 -07:00
Mark Otto
094e65eb9d
adding 20px grid, setting that on docs
2012-06-04 23:58:51 -07:00
Mark Otto
de53f62a04
more changes to js and components, playing with new docs subnav
2012-06-04 23:57:48 -07:00
Mark Otto
47e2c43401
navs tabs pills to single column
2012-06-04 23:37:18 -07:00
Mark Otto
b8d8704f90
button groups and dropdowns to single column
2012-06-04 23:34:02 -07:00
Mark Otto
446f9199c6
updated index page and footer
2012-06-04 23:31:26 -07:00
Mark Otto
f0ff20ec40
updating scaffolding page to single column
2012-06-04 23:10:30 -07:00
Mark Otto
257890f839
finish off rest of base-css page
2012-06-04 23:03:21 -07:00
Mark Otto
060100cf3a
update table section to single column
2012-06-04 21:13:35 -07:00
Mark Otto
094e12f68d
convert code section to new layout
2012-06-04 21:10:08 -07:00
Mark Otto
c44bd1edf4
revamp docs to have new width, start realigning the base css page to match
2012-06-04 21:08:31 -07:00
Mark Otto
632c6d22a2
add bs-docs-examples styles from other branch
2012-06-04 20:57:58 -07:00
Mark Otto
eef87c96af
#3684 : reset width to auto for input type='image'
2012-06-04 20:27:42 -07:00
Mark Otto
348668ec13
add misc helper classes to components css docs
2012-06-04 20:25:57 -07:00
Mark Otto
589242604f
document large and small well classes
2012-06-04 18:56:50 -07:00
Mark Otto
b79c100967
add placeholder to input-prepend to confirm FF placeholder looks good
2012-06-04 18:44:50 -07:00
Mark Otto
c56eb0962a
fix double @@ on less pages
2012-06-04 18:39:02 -07:00
Mark Otto
8df906e641
Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip
2012-06-04 08:47:48 -07:00
Mark Otto
9cceb0bba7
Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip
2012-06-04 08:47:41 -07:00
Mark Otto
5563b8448e
fix #3693 : rounded corners on search form
2012-06-04 08:45:51 -07:00
Mark Otto
8eb1488861
wrap download page in form
2012-06-04 08:44:50 -07:00
Mark Otto
37ba0eba02
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-06-04 08:33:48 -07:00
Mark Otto
eb3a4b8f75
fix placeholder for FF by attaching input and textarea when we call the mixin
2012-06-04 08:33:42 -07:00
Jacob Thornton
82ea5847a7
adds remote source to modal. Remote source can be specified in href or by providing a remote option #936
2012-06-03 21:26:54 -07:00
Jacob Thornton
041b8bdfd3
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
2012-06-03 11:24:51 -07:00
Jacob Thornton
31e8a358c3
check length so that pause, actually pauses
2012-06-03 11:24:19 -07:00
Mark Otto
ad9bfeef7a
fix cut off icons
2012-06-02 22:34:20 -07:00
Mark Otto
9a4ee790e1
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2012-06-02 22:14:12 -07:00
Mark Otto
9a3a297a47
update version # on homepage, crush assets
2012-06-02 22:12:45 -07:00
Jacob Thornton
2d3a0babd2
make active selector more specific #2043 and rebuild
2012-06-02 22:10:35 -07:00
Jacob Thornton
4a276b1620
Merge pull request #3682 from mlmorg/2.1.0-wip
...
Alter typeahead to accept synchronous/asynchronous data source
2012-06-02 21:57:18 -07:00
Matt Morgan
af14f6db5d
Merge branch 'async' into 2.1.0-wip
2012-06-03 00:33:06 -04:00
Jacob Thornton
91a7274a43
only set height explicitly for collapse when animation is supported #2131
2012-06-02 21:26:34 -07:00
Jacob Thornton
a38bc90b48
change note to point out that boostrap.js bundles all plugins #3174
2012-06-02 21:19:56 -07:00
Jacob Thornton
ebc1fe907d
only trigger $.support.transition.end when it exists
2012-06-02 21:09:13 -07:00
Jacob Thornton
3a751a63d4
fix multi carousel bug #3194
2012-06-02 21:01:45 -07:00
Jacob Thornton
555a3b0478
fix carousel when hiding a reshowing - make sure it always triggers transition end #3248
2012-06-02 20:28:08 -07:00
Jacob Thornton
0b827965d3
fix regression in typeahead #3313
2012-06-02 19:31:30 -07:00
Jacob Thornton
354f99f0bd
add length to parent dropdown check #3316
2012-06-02 19:02:30 -07:00
Jacob Thornton
b8a8927b0c
add link to phantomjs in docs #3347
2012-06-02 18:36:45 -07:00
Jacob Thornton
4ca1cba3f8
upgrade jquery to 1.7.2 #3379
2012-06-02 18:25:07 -07:00
Jacob Thornton
b07b869b26
rebuild assets
2012-06-02 18:15:23 -07:00
Jacob Thornton
806a82ef83
add relatedTarget to carousel slide event
2012-06-02 18:06:00 -07:00
Jacob Thornton
037107480d
remove isHTML support
2012-06-02 17:57:36 -07:00
Jacob Thornton
f836473129
add html option back to tooltip and popover to explicitly prevent XSS #3421
2012-06-02 17:55:10 -07:00
Jacob Thornton
fc96bc8bba
rebuild doi
2012-06-02 17:30:00 -07:00
Jacob Thornton
5b401a8c16
add collapsed class to collapse invoker when it's target is collapsed #3525
2012-06-02 17:28:38 -07:00
Jacob Thornton
5e5965ca6f
Merge branch 'accessibility' into 2.1.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663
2.0.3 -> 2.0.4
2012-06-01 11:04:27 -07:00
Jacob Thornton
5657ab46c5
Merge branch '2.0.4-wip'
2012-06-01 10:53:47 -07:00
Jacob Thornton
4eaeea81fd
rebuild and fix test
2012-05-31 10:24:23 -07:00
Jacob Thornton
bcd5097c02
Merge pull request #3655 from jorgenfb/8dda83906d72ade81ecf9b21d55b5a2922589d30
...
Updated unit test for tooltips. Now using is() instead of hasClass()
2012-05-31 09:03:53 -07:00
Mark Otto
7875e4833c
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing
2012-05-28 17:32:24 -07:00
Mark Otto
f53a038088
remake after merging IE7/8 bugfix for animations
2012-05-28 17:17:55 -07:00
Mark Otto
6fc5674466
Merge branch 'raymccoy-no-filters' into 2.0.4-wip
2012-05-28 17:17:36 -07:00
Mark Otto
9699e1d707
scope float right dropdown menus to immediate children
2012-05-28 01:13:24 -07:00
Mark Otto
241cbd478d
Merge pull request #3619 from coreyti/2.0.4-wip-fix-placeholder
...
2.0.4 wip fix placeholder
2012-05-28 01:00:23 -07:00
Jacob Thornton
a85c8fe74e
add note about contributing
2012-05-27 20:07:58 -07:00
Corey Innis
8a06339501
fixes .placeholder to work as a "grouped selector"
...
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`
the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
2012-05-27 18:12:08 -07:00
Mark Otto
287086758b
add tracking but for production only
2012-05-26 23:17:23 -07:00
Mark Otto
cc8b260ed8
adding google analytics tracking to docs
2012-05-26 16:35:28 -07:00
Mark Otto
a7529e158b
remove color from labels
2012-05-25 09:19:10 -07:00
Mark Otto
7dbcd0be9a
fix navbar button for mobile tapping (turn to button instead of adding href=#), streamline less docs page
2012-05-24 21:30:43 -07:00
Mark Otto
aaf1825b49
fix example code for carousel
2012-05-24 20:26:08 -07:00
Mark Otto
fe30bd6055
make bootstrap like google maps a bit more
2012-05-24 20:18:52 -07:00
Mark Otto
76ee212343
make nested cols code match given example
2012-05-24 20:16:25 -07:00
Mark Otto
c1c679b644
#3592 : clarify grid sizing in grid docs
2012-05-24 20:13:59 -07:00
Mark Otto
7fa9f605d6
recompile after adding ms-placeholder
2012-05-24 19:18:06 -07:00
Mark Otto
72e3b3beb3
Merge branch 'ademaro-patch-1' into 2.0.4-wip
2012-05-24 19:17:49 -07:00
Ademaro
34e5bc5f1d
ie support placeholder color ( http://msdn.microsoft.com/en-us/library/ie/hh772745(v=vs.85).aspx )
2012-05-24 13:57:02 +04:00
Mark Otto
19489496c1
remove redeclared font styles from <p> and rebuild
2012-05-23 00:05:30 -07:00
Mark Otto
5d27fbb32d
Merge branch 'pvorb-patch-1' into 2.0.4-wip
2012-05-23 00:05:13 -07:00
Mark Otto
3b6b6eb242
fix field state mixin
2012-05-23 00:04:54 -07:00
Tomás Arribas
642f75141d
Do not use filters in fade animations
2012-05-21 02:56:57 +02:00
Jørgen Borgesen
8dda83906d
Swapped out .hasClass() with .is() when checking for multiple classes
2012-05-20 20:10:21 +02:00
Jørgen Borgesen
e388a5e475
Added unit test to check that tooltips is not showed when leave event is triggered before show delay has expired AND the hide delay is set to 0
2012-05-20 19:59:53 +02:00
Paul Vorbach
faf2866f96
Remove re-declaration of font-fam, font-size, and line-height in p
2012-05-20 11:54:21 +03:00
Mark Otto
78790da03c
fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas
2012-05-17 22:00:49 -07:00
Mark Otto
e5187e12c4
fix modal example per #3510
2012-05-17 21:48:13 -07:00
Mark Otto
1dbf4c92ce
manually resolve #3516 : type in less docs
2012-05-17 21:45:45 -07:00
Jacob Thornton
b1d7c34086
remove log
2012-05-17 00:45:28 -07:00
Jacob Thornton
9889948f58
abandon activedescendant because it was awful
2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92
nearly everything working with activedescendant... then decide it's wrong.
2012-05-17 00:23:11 -07:00
Jacob Thornton
10c6db4b14
add proper role to dialog markup and cleanup modal logging
2012-05-16 19:43:22 -07:00
Jacob Thornton
4b53778150
Merge branch 'master' into 2.0.4-wip
2012-05-16 19:10:49 -07:00
Jacob Thornton
a404ac33bb
modal accessibility tab control
2012-05-16 19:09:57 -07:00
Mark Otto
5ecab6112c
version bump on docs home
2012-05-15 10:59:06 -07:00
Mark Otto
e009ed23fc
move navbar and update paths so it sits in tests
2012-05-15 09:45:53 -07:00
Mark Otto
67f81a2ed5
clarify button type on dismiss icons
2012-05-15 09:41:06 -07:00
Mark Otto
0679f24606
example incorrect for modal dismiss button
2012-05-15 09:37:28 -07:00
Mark Otto
3a27b4e6f6
remake again after pull
2012-05-15 09:07:55 -07:00
Mark Otto
6be09df1bf
Merge branch '2.0.4-wip-forms' of github.com:twitter/bootstrap into 2.0.4-wip-forms
2012-05-15 09:07:31 -07:00
Mark Otto
a9d4b667ff
finish fixing uneditable-input and remake
2012-05-15 09:07:19 -07:00
Mark Otto
532569fe59
updated forms to rearrange focus state, reinstate uneditable-input, and a few other cleanup tidbits
2012-05-15 09:04:44 -07:00
Mark Otto
ecf84bdac5
correct regressions against 2.0.3
2012-05-15 00:17:02 -07:00
Mark Otto
87f6e426b3
three columns
2012-05-14 23:50:34 -07:00
Mark Otto
c8cafa5d5a
move forms test to less/tests
2012-05-14 23:45:25 -07:00
Mark Otto
e28efd7da0
consolidate and relabel new form selectors
2012-05-14 23:42:32 -07:00
Mark Otto
a0809ceebe
add forms test page for all html5 input types and refactor selectors
2012-05-14 23:40:06 -07:00
Mark Otto
33061a8e0b
document .lead per #3213
2012-05-14 22:02:51 -07:00
Mark Otto
1b537c6f9c
adding navbar example, for fixed and static navbars
2012-05-14 08:57:24 -07:00
Jørgen Borgesen
e9a7d26d06
Cancel running timer for tooltips with delayed show, but instant hide. This prevents delayed tooltips from appearing if the mouse leaves the elements before tooltip is showed and the hiding delay is 0.
2012-05-14 14:03:36 +02:00
Mark Otto
826a8714e2
#3257 : share .navbar-fixed-top styles with .navbar-fixed-bottom
2012-05-13 22:11:35 -07:00
Mark Otto
ea15660973
#3420 : properly scope dropdown open state to immediate children only
2012-05-13 21:52:18 -07:00
Mark Otto
332d2a7384
#3438 : fix typo on i18n tag
2012-05-13 17:43:56 -07:00
Mark Otto
a2fb9ed42f
#3449 : make legend and form-actions the same border color
2012-05-13 17:43:04 -07:00
Mark Otto
c02c3c60c9
Merge branch 'aziz-patch-7' into 2.0.4-wip
2012-05-13 14:42:12 -07:00
Mark Otto
8f44245850
document .hyphens() mixin
2012-05-13 14:31:31 -07:00
Mark Otto
23401e811f
Merge branch 'Synchro-hyphenation' into 2.0.4-wip
2012-05-13 14:29:08 -07:00
Mark Otto
1a8561d084
Merge branch 'hyphenation' of https://github.com/Synchro/bootstrap into Synchro-hyphenation
2012-05-13 14:28:32 -07:00
Mark Otto
7de65e0a62
#3465 part 2: add mention to docs of type button issue
2012-05-13 14:03:32 -07:00
Mark Otto
d09db29039
#3465 part 1: add type="button" to all dismiss buttons in docs
2012-05-13 14:01:57 -07:00
Mark Otto
6f61c96f02
Merge branch '2.0.4-wip' of github.com:twitter/bootstrap into 2.0.4-wip
2012-05-13 13:59:26 -07:00
Mark Otto
6a89659727
#3468 : 140 icons, not 120
2012-05-13 13:59:20 -07:00
Mark Otto
3a21891824
#3469 : add variables for dropdown menu dividers
2012-05-13 13:58:42 -07:00
Mark Otto
526d77af61
remove wrapping <label> from all js docs
2012-05-13 11:10:08 -07:00
Mark Otto
839ec86ac7
Merge pull request #3428 from Gavrisimo/patch-1
...
Update .placeholder() mixin call
2012-05-12 11:37:53 -07:00
Milos Gavrilovic
20eae67147
Update .placeholder() mixin call
...
In less/mixins.less this mixin is being created with @placeholderText
color as default, which is actually set as @placeholderText: @grayLight
in less/variables.less so it's redundant to make call like this:
.placeholder(@grayLight);
2012-05-10 12:25:22 +03:00
David Hirtle
452d8c1df0
Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params
2012-05-04 13:50:16 -07:00
Synchro
ca369c4b2a
Add Opera prefix
2012-05-01 17:54:53 +02:00
Synchro
dcc89e7400
Coding style
2012-05-01 17:06:19 +02:00
Synchro
5ffb6d6706
Add .hyphens mixin
2012-05-01 17:01:26 +02:00
Mark Otto
ef368f0076
#3263 : typo in forms docs
2012-04-30 15:43:47 -07:00
Mark Otto
b6b354ceaa
#3255 : typo in components for tabbable tabs
2012-04-30 15:42:55 -07:00
Mark Otto
51153766f5
Merge branch 'anirvan-master' into 2.0.4-wip
2012-04-30 15:41:47 -07:00
Mark Otto
59ec4c7154
make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3)
2012-04-30 15:40:49 -07:00
Mark Otto
c204bc66d6
#3237 : change to CSS comments in responsive docs
2012-04-30 15:33:35 -07:00
Mark Otto
6e9756ebb6
#3228 : update docs to list dependencies from 2.0.3 for compiling via make
2012-04-30 15:30:56 -07:00
Mark Otto
ad46b0980c
expand input css tests to fixed width grid
2012-04-30 15:06:26 -07:00
Anirvan Chatterjee
ec56940c51
several spelling corrections
2012-04-27 10:48:59 -07:00
Matt Morgan
bf9d8fcc07
Alter typeahead to accept synchronous/asynchronous data source via function/callback
2012-04-26 14:09:20 -04:00
Allen Bargi
ab178060be
let's reuse color variables, instead of hardcoding colors.
2012-04-26 17:38:47 +03:00
Jacob Thornton
b261f9781b
Merge pull request #3226 from aziz/patch-6
...
No need to specify units when a value is 0, thanks to RECESS
2012-04-25 22:19:49 -07:00
Jacob Thornton
ffb4d9025b
rebuild with typeahead change
2012-04-25 22:15:39 -07:00
Jacob Thornton
fc509e14b2
revert position -> offset for typeahead position
2012-04-25 22:14:39 -07:00
Jacob Thornton
a29e5a9dd6
fix #3234
2012-04-25 21:52:05 -07:00
Allen Bargi
99c3b7810b
No need to specify units when a value is 0, thanks to RECESS
2012-04-25 18:16:59 +03:00
Jacob Thornton
aaabe2a46c
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)
2012-04-24 18:06:41 -07:00
Giuliano Velli
3aa89ded21
Merge branch 'media-component' of github.com:wpbrains/bootstrap into media-component
...
Conflicts:
docs/components.html
Signed-off-by: Giuliano Velli <wpbrains@giusi.org >
2012-04-24 17:23:14 +02:00
Giuliano Velli
4fbb400754
Added Medias code and documentation
...
Fix for Issue #1711
Added media.less and edited bootstrap.less and responsive.less to
manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org >
2012-04-24 17:19:17 +02:00
Mark Otto
66ac6e14db
heading
2012-04-24 06:53:48 -07:00
Mark Otto
7b282798a3
officially drop support for offset on thumbnails since it breaks BC
2012-04-24 06:52:57 -07:00
Mark Otto
5be84ad0b7
restore margins on thumbnails, add comments about it's changes and how responsive affects it
2012-04-24 06:45:21 -07:00
Mark Otto
f9744ff522
make component animations work cross browsers with opacity mixin, restore float on thumbnails > li
2012-04-24 06:39:14 -07:00
Jacob Thornton
e659dc7e1b
Merge branch '2.0.3-wip'
...
Conflicts:
Makefile
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
2012-04-24 02:21:45 -07:00
Jacob Thornton
839ef3a030
2.0.2 -> 2.0.3
2012-04-24 02:19:02 -07:00
Mark Otto
79d7092a39
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-24 02:12:09 -07:00
Mark Otto
d8aaf50798
implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid
2012-04-24 02:11:59 -07:00
Jacob Thornton
fc871a4821
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-24 02:02:28 -07:00
Jacob Thornton
73453c7f79
changes for build in preperation for 2.0.3 release
2012-04-24 02:02:06 -07:00
Mark Otto
1c2db11d58
fix ie7 button group toggles and button borders
2012-04-24 01:46:20 -07:00
Mark Otto
805ca03457
fix #3179 : cut off radios and checkboxes
2012-04-24 01:33:00 -07:00
Mark Otto
7f6f3ff462
fix #3202 : add cursor to .accordion-toggle
2012-04-24 01:23:24 -07:00
Mark Otto
f805a6080c
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-23 10:06:45 -07:00
Mark Otto
419e50e339
fix up buttons after recess property order
2012-04-23 10:06:35 -07:00
Jacob Thornton
b8b1ffde05
hr to var in makefil
2012-04-23 04:16:27 -07:00
Jacob Thornton
c408d8961b
rewrite server.js, fix travis
2012-04-23 03:44:32 -07:00
Jacob Thornton
c896a182e1
increase length of waitfor timeout for phantom
2012-04-23 03:18:13 -07:00
Mark Otto
091a97c01c
white bg on docs again
2012-04-23 03:06:30 -07:00
Mark Otto
176e0b1169
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-23 03:05:22 -07:00
Mark Otto
99a916d5eb
remove background color from radios and checkboxes for IEs
2012-04-23 03:05:10 -07:00
Mark Otto
192cb575da
fix typo
2012-04-22 23:56:36 -07:00
Giuliano Velli
f5fd5e7523
Added Medias code and documentation
...
Added media.less and edited bootstrap.less and responsive.less to manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org >
2012-04-20 17:55:22 +02:00
Jacob Thornton
f84882122e
style changes to phantom integration
2012-04-19 17:40:58 -07:00
Jacob Thornton
03f78f7a60
run qunit tests in phantomjs for travis-ci
2012-04-19 17:34:07 -07:00
Jacob Thornton
1160935446
make a few changes to package.json (add make test to makefile)
2012-04-19 16:38:43 -07:00
Jacob Thornton
de9271bfd1
Merge pull request #3157 from caniszczyk/2.0.3-wip
...
Add TravisCI support and update README
2012-04-19 16:35:27 -07:00
Chris Aniszczyk
c99dcd2e93
Add Travis CI Support
...
Continous integration is nice, fixes #3155
Signed-off-by: Chris Aniszczyk <zx@twitter.com >
2012-04-19 16:09:59 -07:00
Mark Otto
fd009597b6
mention responsive css in navbar responsive section
2012-04-19 09:28:40 -07:00
Jacob Thornton
f89394b8ef
make build prettier - hopefully this works, maybe some makefile bro's can improve
2012-04-18 22:49:31 -07:00
Jacob Thornton
edb52a82d8
make bootstrap compile with Recess instead of Less
2012-04-18 16:16:42 -07:00
Jacob Thornton
bc07e2adae
allow for pushstate in scrollspy
2012-04-18 13:35:14 -07:00
Jacob Thornton
b627898919
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-18 13:15:58 -07:00
Jacob Thornton
8f98c4fbf6
offset -> position #3088
2012-04-18 13:15:13 -07:00
Mark Otto
47b6e6bd80
fix #3111 , badge and label alignment with surrounding text
2012-04-18 09:47:30 -07:00
Mark Otto
62a0f5fdcb
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-18 09:37:12 -07:00
Mark Otto
178a9f3b51
fix some text around media queries in the docs
2012-04-18 09:37:07 -07:00
Mark Otto
48e6d88889
Merge pull request #3128 from codler/patch-2
...
Add -ms-user-select
2012-04-18 09:22:38 -07:00
Han Lin Yap
c09602d172
add -ms-user-select
2012-04-18 11:38:14 +03:00
Jacob Thornton
f3cf4cbaae
rebuild
2012-04-16 17:36:03 -07:00
Jacob Thornton
ba202d77ba
Merge pull request #3104 from iamnirav/2.0.3-wip
...
Allow updater function in bootstrap-typeahead.js (updates the value of the input field) to be overridden
2012-04-16 17:35:32 -07:00
Nirav Sanghani
031fa47f68
Update new typeahead method docs to be a bit clearer.
2012-04-16 17:27:34 -07:00
Nirav Sanghani
d5a95315eb
Update typeahead docs to reflect new option.
2012-04-16 17:24:51 -07:00
Nirav Sanghani
8e8b1ad03d
Allow updater function (updates the value of the input field) to be overridden.
2012-04-16 17:05:35 -07:00
Jacob Thornton
2881269e16
lots of property ordering
2012-04-16 16:34:08 -07:00
Jacob Thornton
a3ec868ac2
few more property orders
2012-04-16 15:37:17 -07:00
Jacob Thornton
457859feba
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-16 15:09:26 -07:00
Jacob Thornton
498b7d984a
a few property reordering things
2012-04-16 15:09:05 -07:00
Mark Otto
5fa0fcc888
fix modal per #3086
2012-04-16 14:38:22 -07:00
Mark Otto
41b695b8cd
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-15 17:25:38 -07:00
Mark Otto
a184806538
nuke line
2012-04-15 17:25:32 -07:00
Jacob Thornton
6cf9906a60
build bootstrap.js and bootstrap.min.js into docs
2012-04-15 17:03:33 -07:00
Mark Otto
5c5310dc87
remove @gridRowWidth var since we don't use it anywhere
2012-04-15 16:57:11 -07:00
Mark Otto
b67a2d8a59
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-15 16:48:26 -07:00
Mark Otto
d374fe92e5
simplify the left margin for offset grid columns
2012-04-15 16:48:17 -07:00
Jacob Thornton
6506ede632
add bootstrap + bootstrap.min.js to gh-pages for @remy
2012-04-15 16:45:13 -07:00
Jacob Thornton
0b8042656f
fixes #2941 + whitespace in collapse
2012-04-15 16:15:32 -07:00
Mark Otto
13e4d1d5ac
fix #2990 : text wrapping in .uneditable-input
2012-04-15 00:35:30 -07:00
Jacob Thornton
cad8f2b43a
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-15 00:20:50 -07:00
Jacob Thornton
e985681758
add zip to git ignore, and fix gh-pages make
2012-04-15 00:19:25 -07:00
Jacob Thornton
2a6894d834
simplify make - move zipping to gh-pages only
2012-04-15 00:16:09 -07:00
Mark Otto
6c221d65e3
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-15 00:06:35 -07:00
Mark Otto
a4c2332eb1
move js tooltip link
2012-04-15 00:06:11 -07:00
Jacob Thornton
c262ead6ed
change comments to preserve for yui
2012-04-14 23:51:08 -07:00
Jacob Thornton
be0efcfcfc
whitespace
2012-04-14 23:38:11 -07:00
Jacob Thornton
1ca1ef94ee
fix opera bug \o/ !!!! #1776
2012-04-14 23:24:19 -07:00
Mark Otto
9e9be2dc0d
fix #2989 : clear .checkbox/.radio floats
2012-04-14 23:19:42 -07:00
Jacob Thornton
cf4924764c
rebuild with tooltip formatting change
2012-04-14 23:11:19 -07:00
Jacob Thornton
19469aa52c
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-14 23:10:41 -07:00
Jacob Thornton
b14455b03a
add tests for mouseout delay in tooltip
2012-04-14 23:10:03 -07:00
Mark Otto
2dbce887df
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-14 23:07:51 -07:00
Mark Otto
a6f27ebed4
ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous
2012-04-14 23:06:00 -07:00
Jacob Thornton
c7dc4cc573
change position of var in dropdown + cleanup makefile vars
2012-04-14 22:43:36 -07:00
Mark Otto
8dc1a0eade
Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-14 22:43:26 -07:00
Jacob Thornton
ce94442104
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-14 21:45:23 -07:00
Jacob Thornton
d65f7f204a
don't open dropdown if target is disabled
2012-04-14 21:44:57 -07:00
Mark Otto
490eb1bd16
fix #3068 : compile after changing comment
2012-04-14 20:56:50 -07:00
Mark Otto
3bc7553f66
Merge branch 'au-phiware-patch-1' into 2.0.3-wip
2012-04-14 20:56:13 -07:00
au-phiware
16855b920e
Silence comment (just like the others)
2012-04-15 12:31:07 +10:00
Mark Otto
fc7ae48c95
fix #1823 : styles of tabs within other tabs resolved
2012-04-14 18:47:27 -07:00
Mark Otto
def7ae7798
bump version on docs homepage to 2.0.3
2012-04-14 18:30:43 -07:00
Mark Otto
4bcb89946b
merge in #2684 , offset on the .makeColumn mixin
2012-04-14 18:18:11 -07:00
Mark Otto
d8acc062c1
Merge branch 'gruvii-patch-2' into 2.0.3-wip
2012-04-14 18:11:40 -07:00
Mark Otto
2486033754
Merge branch 'patch-2' of https://github.com/gruvii/bootstrap into gruvii-patch-2
2012-04-14 18:11:31 -07:00
Jacob Thornton
82267d48ff
calling pause on a slide should actually pause it - even when hovering
2012-04-14 17:49:51 -07:00
Jacob Thornton
34132f0e89
rebuild
2012-04-14 17:19:00 -07:00
Mark Otto
ce30d19c15
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-14 17:16:37 -07:00
Mark Otto
dbde2dc9e4
adding icon classes to finish off glyphicons 1.6 update
2012-04-14 17:15:16 -07:00
Jacob Thornton
3408064d00
hack for subnav
2012-04-14 17:15:03 -07:00
Mark Otto
d5063e5dc8
fix #3032 : update glyphicons sprite to 1.6 release
2012-04-14 16:59:49 -07:00
Jacob Thornton
81a296d06a
whitespace
2012-04-14 16:38:44 -07:00
Jacob Thornton
c291e4d786
fix typeahead test
2012-04-14 16:32:20 -07:00
Jacob Thornton
575f18aaf4
add jshint support + a few minor stylistic changes
2012-04-14 16:29:53 -07:00
Mark Otto
8575a45294
alt fix to #3029 : change to single border-radii properties
2012-04-14 13:31:48 -07:00
Mark Otto
a7d8145a32
fix #3036 : add bg color to inputs
2012-04-14 13:18:37 -07:00
Mark Otto
c710f03995
Merge pull request #3042 from ctalkington/typo-fix-1
...
Doc Typo Fix
2012-04-13 17:14:11 -07:00
ctalkington
0e6f12af86
add 's' to 'classe' in components docs. thanks mishmosh.
2012-04-12 15:14:54 -05:00
Bryan Petty
5b85ed181a
Fixed extra margin on Navbar buttons.
2012-04-10 15:22:17 -06:00
Mark Otto
48063afb3a
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-07 23:41:27 -07:00
Mark Otto
0b2d23d443
add larger .input-* to block reset for responsive <767
2012-04-07 23:41:09 -07:00
Mark Otto
28c4ed824e
Merge branch 'alecrust-patch-3' into 2.0.3-wip
2012-04-07 23:38:16 -07:00
Mark Otto
5bc601d9a8
fix typo on js docs selector
2012-04-07 23:37:58 -07:00
Jacob Thornton
08fee005a8
https://github.com/twitter/bootstrap/issues/2954
2012-04-07 21:26:46 -07:00
Chris Aniszczyk
11064c4d34
Update the LICENSE to the actual APLv2
2012-04-07 17:17:39 -07:00
Mark Otto
a20cd66ba4
clean up new input append examples
2012-04-07 16:49:06 -07:00
Mark Otto
3ecf109835
fix conflicts, add docs example for two buttons on an append
2012-04-07 16:44:03 -07:00
Mark Otto
1d30225e2c
Merge branch 'jasny-patch-2' into 2.0.3-wip
...
Conflicts:
less/forms.less
2012-04-07 16:43:48 -07:00
Mark Otto
0a71f171bc
readd bootstrap.zip, add @inputBorderRadius var to close #2946
2012-04-07 16:17:15 -07:00
Mark Otto
f563b1db43
update kippt screenshot
2012-04-07 15:59:14 -07:00
Mark Otto
5591a9b966
use yui-compress by default instead of regular compress
2012-04-07 14:56:37 -07:00
Mark Otto
798363eda7
fix left margin on .thumbnails for responsive <767
2012-04-07 14:31:55 -07:00
Mark Otto
10ff5f16a6
fix #2968 manually: add consolas to monospace font stack
2012-04-07 14:25:58 -07:00
Bryan Petty
4b81c0dff3
Changed .nav-collapse to clear both instead of left, and added compiled files.
2012-04-05 14:13:16 -06:00
Arnold Daniels
fedce0cec7
Allow multiple buttons in .input-prepend and .input-append.
...
This has a look similar to button groups.
2012-04-05 23:08:32 +03:00
Jacob Thornton
4953629ccd
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-04 15:13:27 -07:00
Jacob Thornton
83febb3452
remake and add isHTML check to popover as well
2012-04-04 15:02:30 -07:00
Jacob Thornton
4bd611884a
detect if title in tooltip is text or html. if text - use text method to prevent xss.
...
all add a few notes to js readme about updated event
2012-04-04 14:58:04 -07:00
Alec Rust
ff57f59562
Corrected spacing
2012-04-03 12:15:36 +02:00
Mark Otto
2ea437f353
fix #2908 : unfloat inputs using .span* in fluid row
2012-04-02 22:49:19 -07:00
Mark Otto
4462f24753
fix #2911 : correct /lib/ path to /less/
2012-04-02 22:40:06 -07:00
Mark Otto
2988de6377
fix #2913 : get more specific with button group selectors
2012-04-02 22:38:12 -07:00
Bryan Petty
030265eaec
Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar.
2012-04-02 02:52:06 -06:00
Mark Otto
7bf4c8e76e
Merge branch 'alecrust-patch-1' into 2.0.3-wip
2012-04-01 11:10:20 -07:00
Alec Rust
574592cba5
Corrected "resises" to "resides"
2012-04-01 17:25:43 +02:00
Mark Otto
647f1c98ed
fix #2296 : allow fluid thumbnails
2012-04-01 01:05:00 -07:00
Mark Otto
fe05f9aeb2
fix #2572 : streamline thumbnails css to allow for offsets
2012-04-01 00:59:34 -07:00
Mark Otto
33fa705c7f
fix #2811 : left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width
2012-04-01 00:15:04 -07:00
Mark Otto
d652af1097
fix #2860 : truncate .dl-horizontal terms and reset to stacked for <767px layouts
2012-03-31 23:53:54 -07:00
Mark Otto
452ddc0f0d
update less docs page to reflect changes in mixins (no more default values) and variable name fix
2012-03-31 21:36:45 -07:00
Mark Otto
f37d9aeaef
fix #2856 : make inputs using .span* classes responsive at <767px layout
2012-03-31 21:31:01 -07:00
Mark Otto
2355fd224d
remove @shadow instances and replace with escaped values, update mixins to not use a default value at all
2012-03-31 21:06:16 -07:00
Mark Otto
56ecc6ba96
clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html
2012-03-31 12:31:56 -07:00
Mark Otto
37745cd899
fix fluid grid selectors to remove > in selectors
2012-03-31 00:53:38 -07:00
Mark Otto
2f4810e72f
Merge branch 'grantzau-patch-1' into 2.0.3-wip
2012-03-30 23:38:16 -07:00
Jacob Thornton
2dc979a202
MSTransitionEnd + move paren (thanks rick waldron)
2012-03-29 14:14:17 -07:00
Jacob Thornton
0665c3ebf7
move over paren just because.
2012-03-29 13:55:56 -07:00
Jacob Thornton
422d04cb2b
simplify transition plugin a little
2012-03-29 13:51:23 -07:00
Jacob Thornton
30b3f47e31
remove "technique"
2012-03-29 12:48:37 -07:00
Jacob Thornton
8ea8c312ea
replace UA sniffing
2012-03-29 12:35:06 -07:00
Julius Graakjær Grantzau
6564afbe73
Renaming @gridColumnGutter to @gridGutterWidth
2012-03-29 14:56:53 +03:00
Mark Otto
2bbc9a1cb2
fix js links in css tests
2012-03-28 20:03:57 -07:00
Mark Otto
a9f9949b3e
rearrange other parts of forms docs
2012-03-28 19:41:23 -07:00
Mark Otto
04baa07547
document .backface-visibility and update comments and initial value
2012-03-28 18:25:27 -07:00
Mark Otto
feccc6e705
Merge branch 'backface-visibility' of https://github.com/dannykeane/bootstrap into dannykeane-backface-visibility
2012-03-28 18:21:04 -07:00
Mark Otto
3308d1968f
fix #2846 : Firefox required two clicks on selects to get to options dropdown
2012-03-28 18:18:41 -07:00
Mark Otto
d6680a50b9
start rearranging form docs and clear up messaging about required classes and default styles
2012-03-28 18:00:05 -07:00
Mark Otto
369ca13c75
fix homepage link in css-tests and remove second help text from example form
2012-03-28 17:52:03 -07:00
Mark Otto
66743676ce
moving css tests to less directory
2012-03-28 17:41:40 -07:00
Mark Otto
93d42ca80e
fix #2832 : clarify docs on use of .tabbable and add mention of .fade
2012-03-28 17:35:06 -07:00
Mark Otto
e41584afb5
fix #2829 : redeclare .pull-right for navs since they get more specific floats
2012-03-28 17:02:13 -07:00
Danny Keane
2165ab2620
Added the back-face visibility css property to mixins.less, this property prevents the browser flickered experienced especially in Chrome when using 3D transformations.
2012-03-28 15:05:49 +01:00
Mark Otto
0fe68de1a4
fix second booboo
2012-03-27 09:22:15 -07:00
Mark Otto
5b3268317c
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-27 09:21:35 -07:00
Mark Otto
d27fc24aa0
fix spelling booboo
2012-03-27 09:21:13 -07:00
Mark Otto
155a7c1067
Merge pull request #2817 from andriijas/2.0.3-wip
...
Finish of a.close to button.close
2012-03-27 09:14:39 -07:00
Andreas Cederström
5d2062a3cc
Finish of close conversion from a to button
2012-03-27 08:36:34 +02:00
Mark Otto
917f11e679
update LESS docs to note @baseFontSize and @baseLineHeight must be pixels
2012-03-26 09:30:42 -07:00
Mark Otto
d4914f47c3
fix #2799 , mention of text in the navbar
2012-03-26 09:25:31 -07:00
Mark Otto
cffadd8c71
add position relative to .dropup
2012-03-25 22:28:43 -07:00
Mark Otto
4449c4e9e0
update docs messaging around alerts and buttons
2012-03-25 20:44:01 -07:00
Mark Otto
473e5714f7
change all anchor alert closes to buttons
2012-03-25 20:41:59 -07:00
Mark Otto
ea437351ed
add heads up note for required href on alert dismiss actions
2012-03-25 19:47:13 -07:00
Mark Otto
4893928310
add back href for alerts in components docs to make close work on iphone
2012-03-25 18:03:30 -07:00
Mark Otto
825227474b
add refresh method documentation to js docs to close #2028 and #2795
2012-03-25 17:37:38 -07:00
Mark Otto
3e2e111b17
add css tests for fluid rows and inputs
2012-03-25 17:11:50 -07:00
Mark Otto
519384fae8
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-03-25 16:41:57 -07:00
Mark Otto
95c2877ffc
remove > in fluid grid selectors, fix double padding issue on fluid layout and example
2012-03-25 16:41:46 -07:00
Mark Otto
998c8a6e3d
fix double padding issue on fluid layout and example
2012-03-25 16:40:51 -07:00
Mark Otto
8d52e6d458
change arrows in one pagination example because opera janks it up, per #2697
2012-03-25 14:51:54 -07:00
Mark Otto
4c3e7690ba
jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728
2012-03-25 14:46:47 -07:00
Mark Otto
cbd77d0aeb
give IE7 inline-block behavior for input-prepend/append
2012-03-25 14:37:19 -07:00
Mark Otto
d0526e31fa
remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius
2012-03-25 14:31:04 -07:00
Mark Otto
c0f28d81b0
Remove black border on buttons in IE7:
...
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
2012-03-25 14:28:24 -07:00
Jacob Thornton
a62810918f
fix responsive navbar
2012-03-25 13:33:36 -07:00
Mark Otto
a5552a1d70
revert bart's mixin fix
2012-03-25 12:42:47 -07:00
Mark Otto
b81a082cd1
add navbarheight support to .brand and .nav links in navbar
2012-03-25 12:32:29 -07:00
Mark Otto
6c5c29ada2
introduce .navbar-link to resolve issue with buttons in .navbar-text
2012-03-25 01:21:47 -07:00
Mark Otto
a7b8e52f8e
Overhaul the responsive utility classes:
...
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
2012-03-25 01:12:51 -07:00
Mark Otto
d1864b3608
adding 144x144 ipad touch icon
2012-03-25 00:46:03 -07:00
Mark Otto
1837b8ef2c
remove height: auto on images since it interferes with inline dimensions
2012-03-25 00:20:30 -07:00
Mark Otto
223c8358ce
Merge branch 'andreasbovens-master' into 2.0.3-wip
2012-03-25 00:07:09 -07:00
Jacob Thornton
3e7920820a
add missing closing brace
2012-03-24 20:01:51 -07:00
Jacob Thornton
0dfff052cb
add MSTransitionEnd event to js plugin
2012-03-24 19:02:55 -07:00
Jacob Thornton
f02d017ffa
return matcher value directly + cleanup first lines of files
2012-03-24 18:59:04 -07:00
Jacob Thornton
6dc59a9c3e
add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip
2012-03-24 18:45:12 -07:00
Jacob Thornton
bccc2cb719
add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last
2012-03-24 18:20:09 -07:00
Jacob Thornton
ef5ac02b69
allow prevent default for show and hide event in modal
2012-03-24 17:50:21 -07:00
Andreas Bovens
de0aaff433
Added -o- and -ms- prefixes to animations CSS
...
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
2012-03-24 18:53:27 +01:00
Mark Otto
f9f03d8976
Merge branch 'bartt-master' into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/button-groups.less
2012-03-23 20:56:48 -07:00
Mark Otto
c7afe382a2
fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition
2012-03-23 20:56:04 -07:00
Mark Otto
f87e4c60e9
Merge branch '2.1.0-wip' into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-23 18:29:21 -07:00
Bart Teeuwisse
035b85eeba
The native box-shadow, background-clip and background-size instructions all take 1 or more arguments. In 1.3.0 LESS became arity aware, see https://gist.github.com/1933613 . As a result the signatures of these mixins had to change a little.
2012-03-23 12:37:40 -07:00
Mark Otto
a57554222f
Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-23 09:53:04 -07:00
Mark Otto
0b41984920
Fix #2758 : Uneditable inputs in input-prepend/append
...
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add to the .uneditable-input in forms to remove the float as we do with all other form controls
2012-03-23 09:47:57 -07:00
Andreas Cederström
eb4f708b91
badge-error => badge-important
2012-03-23 13:35:46 +01:00
Mark Otto
5179df1928
css tests cleanup
2012-03-23 01:31:22 -07:00
Mark Otto
de7aee2465
fix broken tables with double borders and such, add css tests page to start with table edge cases
2012-03-23 01:28:04 -07:00
Mark Otto
622b8fa3f0
adding blog link to docs homepage
2012-03-23 01:13:20 -07:00
Mark Otto
e84161076b
add mention of transitions plugin requirement on collapse
2012-03-23 00:58:41 -07:00
Mark Otto
f330de0b5c
add comment for append/prepend z-indexing
2012-03-23 00:51:31 -07:00
Mark Otto
281e058ef2
fix #2613 : labels hang too low
2012-03-23 00:40:10 -07:00
Mark Otto
ee3fc11add
fix #2617 : add negative margin to fixed-bottom navbar
2012-03-23 00:38:13 -07:00
Mark Otto
2729d15742
fix #2625 manually: account for dropup caret on large button
2012-03-23 00:37:15 -07:00
Mark Otto
b8d8ab1aad
run make on merge of progress bars change
2012-03-23 00:28:58 -07:00
Mark Otto
81f31d95c8
Merge branch 'patch-1' of https://github.com/sirlantis/bootstrap into sirlantis-patch-1
2012-03-23 00:28:25 -07:00
Mark Otto
a28fa20018
remove redundant max-width img from docs css
2012-03-22 23:49:39 -07:00
Mark Otto
c4fb703269
fix left and right tab-content alignment with width: auto;
2012-03-22 23:38:50 -07:00
TJ Rana
7ea34ae0ef
Add "the" on lines 28 and 29
2012-03-22 23:31:52 -07:00
TJ Rana
7376eef378
Add s to bumps on line 30
2012-03-22 23:31:52 -07:00
TJ Rana
303ba1326b
Make guidelines for release numbering more specific
2012-03-22 23:31:52 -07:00
Mark Otto
ac64d9405b
Dropdowns overhaul:
...
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
2012-03-22 23:09:31 -07:00
Mark Otto
50b2245be5
restore max-width 100% for images
2012-03-22 22:06:23 -07:00
Mark Otto
20da2c8ea0
add the broken out responsive files
2012-03-22 21:54:54 -07:00
Mark Otto
ab068f6fda
bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization
2012-03-22 21:33:06 -07:00
Mark Otto
bdf8a6966b
remove labels and badges from customizer and replace with single file
2012-03-22 21:17:55 -07:00
Mark Otto
dbadac183d
add new @formActionsBackground to customize page
2012-03-22 21:09:27 -07:00
Mark Otto
1852d077bf
add shell of tests page, lighten form actions background and give it a variable
2012-03-22 21:08:41 -07:00
Mark Otto
b011daf67f
finish adding remaining component variables to less docs page
2012-03-22 19:36:55 -07:00
Mark Otto
254bb40f00
remove mentions of unused button variable per #2537
2012-03-22 17:49:13 -07:00
Mark Otto
edca6f28f0
fix #2718 , misaligned uneditable inputs in prepends/appends
2012-03-22 17:41:20 -07:00
Mark Otto
b7b84c7a0d
remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append
2012-03-22 17:36:32 -07:00
Mark Otto
ceab161324
fix unescaped reset filter per #2575
2012-03-22 17:31:09 -07:00
Mark Otto
1a6a1828bf
remove mention of siteWidth, no longer used
2012-03-22 17:23:20 -07:00
Mark Otto
42f636032c
fix #2716 , incorrect required markup for navbar search form
2012-03-22 17:22:19 -07:00
Mark Otto
e0c85fb69c
use new font-stack mixins in base and alt font family mixins
2012-03-22 17:18:07 -07:00
Mark Otto
78e37e7d21
Merge branch 'font-variables' of https://github.com/ctalkington/bootstrap into ctalkington-font-variables
2012-03-22 17:13:58 -07:00
Mark Otto
89ea238c32
move navbarBrandColor closer to link color
2012-03-22 17:13:20 -07:00
Mark Otto
b59cb505f8
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-22 17:12:22 -07:00
Mark Otto
fa1b3bdda4
Merge branch 'Synchro-master' into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-22 17:10:16 -07:00
Mark Otto
0e73a0e94b
change spacing and fix code blocks
2012-03-22 17:09:54 -07:00
Mark Otto
d839bf961b
Merge branch 'master' of https://github.com/Synchro/bootstrap into Synchro-master
2012-03-22 16:04:32 -07:00
Mark Otto
d7af2714c6
remove separate badges and labels, add single file instead, remove hover from non-link badges/labels
2012-03-22 16:02:00 -07:00
Marcus Bointon
239c178b68
Clarify docs on how tabs are activated from JS, see #1000
2012-03-22 21:24:57 +01:00
Marcus Bointon
cfce34e300
Add more examples for activating tabs
...
Make naming of tab id consistent
2012-03-22 20:36:49 +01:00
Mark Otto
0f57bdab75
Merge branch 'doc-typos' of https://github.com/ZeroGravX/bootstrap into ZeroGravX-doc-typos
2012-03-22 09:06:59 -07:00
Mark Otto
d335adf644
Updated readme to include blog mention
2012-03-22 00:33:18 -07:00
Jacob Thornton
b3bf223617
filter out non matches in map
2012-03-21 23:59:27 -07:00
Jacob Thornton
20e085723b
cache $(href) lookup
2012-03-21 23:51:32 -07:00
Jacob Thornton
706ee46b73
sort scrollspy to prevent flicker for unordered nav
2012-03-21 23:45:58 -07:00
Jacob Thornton
94b24aaa47
clear timeout to reset delays for tooltip/popover
2012-03-21 21:57:06 -07:00
Jacob Thornton
22963d7346
Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-21 21:37:17 -07:00
Jacob Thornton
d5fb653914
top stripping leading and trailing whitespace + always use .html method
2012-03-21 21:35:02 -07:00
Marcus Bointon
2f06366399
Make changes in page templates, rebuild
2012-03-21 12:09:00 +01:00
Marcus Bointon
02a67ea59e
Add note about styling tabs
...
Fix typo in popover docs
2012-03-21 11:28:23 +01:00
Marcus Bointon
a0203bc8e0
Fix and improve docs on tab config
2012-03-21 11:20:56 +01:00
Jacob Thornton
cb8dcfcebf
if transitioning collapse, don't start new transition
2012-03-20 22:43:27 -07:00
Jacob Thornton
663e41d74f
prevent dropdowns from closing when clicking inside form element inside dropdown
2012-03-19 23:13:55 -07:00
Jacob Thornton
63bd7cb478
fix slide logic for ie+ in carousel
2012-03-19 21:39:39 -07:00
Jacob Thornton
bce33bbb09
if parent in collapse, only grab children
2012-03-19 21:10:55 -07:00
Jacob Thornton
630ff4ff7d
fix collapse bug in ie7+ for initial collapse in
2012-03-19 20:51:20 -07:00
Jacob Thornton
07d23b927e
add activate to scrollspy docs
2012-03-19 20:29:22 -07:00
Jacob Thornton
384a082e8d
active - onActivate
2012-03-19 20:24:46 -07:00
Jacob Thornton
05e0d5f3d9
fire active event on active
2012-03-19 16:09:08 -07:00
Jacob Thornton
67f199678c
if interval is false, do not autocycle the carousel
2012-03-19 15:48:57 -07:00
Jacob Thornton
83a7a69893
typeahead should escape regexp special chars
2012-03-19 15:33:28 -07:00
Jacob Thornton
bf59220b87
;)
2012-03-19 15:19:01 -07:00
Jacob Thornton
5a2c7eb50a
select last item in scrollspy if you've reached the bottom of the document or element
2012-03-19 15:18:00 -07:00
Mark Figueredo
d115d169b7
Added offset parameter to .makeColumn.
2012-03-19 14:58:55 -03:00
Mark
cdd158c571
Could have sworn I added that 's'!
2012-03-18 12:49:18 -06:00
Mark
4c0905c5f2
Added URL fix from #2643 - Thanks ctalkington
2012-03-18 12:44:31 -06:00
Jacob Thornton
527fb87dad
add /head
2012-03-17 21:29:56 -07:00
ctalkington
2c4230e2d3
update docs to match variable addition.
2012-03-15 14:46:27 -05:00
ctalkington
99e96f64f7
update docs to match variable addition.
2012-03-15 14:39:28 -05:00
ctalkington
bf09c979ca
make brand links follow navbarLinkColor but also be customizable in advanced cases.
2012-03-15 14:21:27 -05:00
ctalkington
51f37cbb81
make font family mixins customizable with variables.
2012-03-15 13:34:50 -05:00
Marcel Jackwerth
1a1cab2d06
Invert progress-bar-stripes direction
2012-03-15 18:11:17 +01:00
Mark
d3873b0fc7
Typo Fixes for .mustache files
...
Added the doc typo fixes to the .mustache files as well.
2012-03-14 20:28:24 -06:00
Jacob Thornton
8e0afbeaa4
update hide text to h5bp technique #2586
2012-03-14 12:00:27 -07:00
Mark
6a61e81b7a
Another Typo
...
Fixed another typo pointed out by panahi.
2012-03-13 13:36:58 -06:00
Mark
ffa0d2f180
Some Doc Typos
...
Fixed doc typos in Components and Scaffolding.
2012-03-13 10:35:08 -06:00
Jacob Thornton
59503e71ff
2.0.2 derp
2012-03-12 14:09:38 -07:00
Jacob Thornton
8182b1ef69
make docs again for 2.0.2
2012-03-12 14:03:24 -07:00
Jacob Thornton
1f7a64aa3d
2.0.2
2012-03-12 14:00:19 -07:00
Jacob Thornton
664a838cd6
remove test file
2012-03-12 13:56:50 -07:00
Jacob Thornton
6d4867e799
remove commented out width
2012-03-12 13:45:36 -07:00
Jacob Thornton
56fe54df43
remove collapse class on open so that dropdowns are viewable
2012-03-12 13:37:44 -07:00
Jacob Thornton
cd89c34d99
can't have overflo: visible for "in" which is present during entirity of transition.
2012-03-12 13:31:38 -07:00
Mark Otto
7f3a2b3813
button group sizes for ie7 fixes
2012-03-12 12:44:47 -07:00
Mark Otto
e12c66aabe
adding border variable for dropdowns, making dropdown carets use dropdown vars
2012-03-12 09:57:10 -07:00
Mark Otto
40fddffeec
improve button docs
2012-03-12 09:38:12 -07:00
Mark Otto
5dff63d767
fix apple touch icons in examples
2012-03-12 00:21:52 -07:00
Mark Otto
685039d608
add a super jank fix for horizontal-forms and .input-prepend/append in IE7
2012-03-12 00:16:01 -07:00
Mark Otto
c35b04cccd
enable buttons in input-append and input-prepend
2012-03-11 23:43:19 -07:00
Mark Otto
debc4b752f
more homepage links cleanup, ditching the middots
2012-03-11 23:34:22 -07:00
Mark Otto
f4b51b373b
more homepage links cleanup
2012-03-11 23:33:52 -07:00
Mark Otto
d36f3d0a59
clean up links on docs homepage and add link to direct download with docs
2012-03-11 23:33:08 -07:00
Mark Otto
7c2ed0c095
resolve #1972 , allowing add-ons at beginning and end of input-prepend/append
2012-03-11 23:21:38 -07:00
Mark Otto
5eed370856
fix more spacing issues with input append/prepend
2012-03-11 23:14:36 -07:00
Mark Otto
58cb7c631d
simplify code for input-prepend/append in inline and search forms
2012-03-11 23:12:45 -07:00
Mark Otto
91eef351e4
remove need for floats and IE hacks for input-prepend and input-append--boom
2012-03-11 22:58:14 -07:00
Mark Otto
0630cd62b3
rewrite the fluid grid mixin to be simpler, per #2370
2012-03-11 22:45:10 -07:00
Mark Otto
0090fa1a6e
fix overflow on .collapse.in to enable dropdowns within an open collapse
2012-03-11 22:43:35 -07:00
Mark Otto
ac7f571e53
enable button groups in modal-footer by removing 5px added margin between .btn
2012-03-11 22:28:37 -07:00
Mark Otto
e5a284d442
merge #2476 to allow for custom popover arrow colors
2012-03-11 22:26:07 -07:00
Mark Otto
1a11c526b9
Merge branch 'luk3thomas-popover_arrow_colors' into 2.0.2-wip
2012-03-11 22:25:34 -07:00
Mark Otto
5a28bd1e78
fix vertical align issue with labels in IE9
2012-03-11 21:44:00 -07:00
Mark Otto
ee5d2ec91a
add block level input mixin for border-box box-sizing
2012-03-11 21:21:51 -07:00
Mark Otto
c8f4325c19
remove text indent on carets (not needed) and add inline replacement mixin
2012-03-11 21:12:59 -07:00
Mark Otto
67714d8347
remove the unused text-indent on dropdown carets
2012-03-11 20:38:17 -07:00
Mark Otto
0f23883283
fix broken dropdowns in ie7 per #2333
2012-03-11 20:16:39 -07:00
Mark Otto
2e52946fd3
fix lingering tables bug
2012-03-11 20:03:55 -07:00
Mark Otto
4109c62cf7
fix table border bug with double borders on theads and use of colgroup
2012-03-11 18:18:18 -07:00
Mark Otto
7154e378b2
use variable for navbar text line-height
2012-03-11 17:53:17 -07:00
Mark Otto
95cb6f07a8
Merge branch 'zerkms-master' into 2.0.2-wip
...
Conflicts:
Makefile
2012-03-11 17:38:23 -07:00
Mark Otto
8fd126ba1b
updated apple touch icons and moved input responsive fix from <480 to <767
2012-03-11 17:28:28 -07:00
Mark Otto
ce292a8bb8
fix overflowing thumbnails in responsive <767px layouts
2012-03-11 15:15:55 -07:00
Mark Otto
a97b9c1122
in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width
2012-03-11 14:41:52 -07:00
Ivan Kurnosov
354252b4b5
Grammar fix in js/README.md
2012-03-12 10:24:18 +13:00
Mark Otto
bf6cdff88a
vertical align middle on images, run make to rebuild
2012-03-11 13:48:47 -07:00
Mark Otto
ffbed0980c
Merge branch 'Gavrisimo-patch-1' into 2.0.2-wip
2012-03-11 13:48:30 -07:00
Mark Otto
ad1e9697ae
update grid system mixins in less docs for new grid
2012-03-11 13:48:04 -07:00
Mark Otto
e8ef7d5e7b
tweak button sizes on homepage
2012-03-11 00:06:48 -08:00
Mark Otto
349bdc12a7
ensure right align dropdown example doesn't go all the way off page
2012-03-10 18:15:28 -08:00
Mark Otto
635ee36e11
fix gradient mixins by escaping them, add notes on progress bars
2012-03-10 18:03:59 -08:00
Mark Otto
6e72760de5
fix js typo per #2471
2012-03-10 17:38:09 -08:00
Mark Otto
6a2c519152
Merge pull request #2503 from maxbublik/patch-1
...
ignore Apple Double files
2012-03-10 16:23:52 -08:00
Mark Otto
5de8b277c6
add vars for navbar search
2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c
clean up search form in navbar, add new variable for placeholder text color
2012-03-10 16:15:54 -08:00
Mark Otto
f4ac080f9e
fix #2510 , docs typo
2012-03-10 16:06:56 -08:00
Mark Otto
1dbb942d5b
massive update to customize page to include all the new variables (and ensure they're being used in the .less files)
2012-03-10 16:01:06 -08:00
Mark Otto
95a3cd8732
simplify notes around using button dropdowns
2012-03-10 15:41:41 -08:00
Mark Otto
cecfe72060
remove unused images, update examples to include soundready
2012-03-10 15:37:28 -08:00
Mark Otto
145a36323c
add new example site thumbnail
2012-03-10 15:15:13 -08:00
Mark Otto
9c1d8e032b
change title attr to re-include twitter
2012-03-10 15:14:54 -08:00
Mark Otto
700457c62a
remove unused example diagrams
2012-03-10 15:09:35 -08:00
Mark Otto
67aa00d0bb
make pre font-size a percentage of @baseFontSize
2012-03-10 14:36:58 -08:00
Mark Otto
aef230d40a
fix typo per #2494
2012-03-10 14:20:46 -08:00
Mark Otto
f7d4fb61ce
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-10 14:12:29 -08:00
Mark Otto
dd5cffc308
add button sizes to docs for button dropdowns, clean up styles for them
2012-03-10 13:40:58 -08:00
Mark Otto
c7eb1ab49a
make nav padding and negative margins the same
2012-03-10 13:24:46 -08:00
Jacob Thornton
a07851d6af
stop doing oldschool escape substitution
2012-03-10 13:01:17 -08:00
Jacob Thornton
04851652db
rebuild with latest grid changes - need 1.3 to build!
2012-03-10 12:45:09 -08:00
Jacob Thornton
1fd5e55881
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
2012-03-10 12:42:39 -08:00
Jacob Thornton
1a8d7576e0
Merge branch 'new_grid' into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
less/mixins.less
2012-03-10 12:41:41 -08:00
Maxim Pshenichnikov
922b5fba53
ignore Apple Double files
2012-03-11 00:11:03 +04:00
Mark Otto
9ebc6b4c97
simplify buttons docs section by changing a buttons to button elements
2012-03-10 11:37:34 -08:00
Mark Otto
5d961eaeb3
rebold headings
2012-03-10 11:29:57 -08:00
Mark Otto
f4e879a936
fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron
2012-03-10 11:27:07 -08:00
Mark Otto
c414e57dcc
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-10 11:23:47 -08:00
Mark Otto
305374ab1a
clear up nav variables
2012-03-10 11:23:05 -08:00
Jacob Thornton
b410eeb6dd
Merge pull request #2480 from jonathanmaron/master
...
fat
2012-03-09 11:12:45 -08:00
Milos Gavrilovic
3ff78d138a
Add vertical-align: middle; to img elements
...
More info: h5bp.com/i/440
2012-03-09 14:52:50 +01:00
Jonathan Maron
aa8e6b081c
Fixed double copy action in Makefile.
2012-03-09 07:38:14 +01:00
Luke Thomas
1cc1852a9a
added ability to set custom colors for popover arrow mixin
2012-03-08 19:02:29 -06:00
Jacob Thornton
1562381114
remove non existent dist dir from phony makefil
2012-03-08 11:42:12 -08:00
Jacob Thornton
af1dbf6581
rebuild
2012-03-08 11:39:50 -08:00
Jacob Thornton
d3721c504e
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
2012-03-08 11:39:33 -08:00
Jacob Thornton
bcef12dfcc
add version to min js
2012-03-08 11:39:00 -08:00
Jacob Thornton
26e683f1d0
Merge pull request #2177 from phopkins/typeahead_friendly
...
[2.0.2-wip] Typeahead friendly
2012-03-08 11:14:56 -08:00
Jacob Thornton
426feeef6a
give pages custom titles based on names
2012-03-08 11:09:33 -08:00
Mark Otto
203d75770c
Merge pull request #2449 from burningTyger/master
...
Examples typo
2012-03-07 11:02:15 -08:00
burningTyger
d0120c94a0
fix for typo
2012-03-07 15:38:12 +01:00
Mark Otto
933136d382
Merge pull request #2443 from tarsis/master
...
uglify-js install information in compiling section at less.html. Improve issue #1756 in 2.0.2 wip
2012-03-06 21:44:34 -08:00
Mark Otto
a613a8ebd0
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
2012-03-06 21:16:57 -08:00
Mark Otto
27c3d5a90b
Merge pull request #2436 from gruvii/2.0.2-wip
...
Add new headings vars to type.less
2012-03-06 21:16:40 -08:00
Mark Otto
69e4522a4e
set font-family for inputs and such via basefontfamily
2012-03-06 21:13:29 -08:00
Mark Otto
6b9f70797d
adding well sizes
2012-03-06 21:12:43 -08:00
Mark Figueredo
03bdf82ca2
Added use of new headings variables.
2012-03-06 16:45:43 -05:00
Mark Otto
738fac18de
move padding from container to body for max-width: 767; responsive layout
2012-03-05 23:50:03 -08:00
Mark Otto
492ccedcab
Merge branch 'davewasmer-master' into 2.0.2-wip
2012-03-05 23:07:54 -08:00
Mark Otto
79090ac121
fix input grid sizing, fix background color on form actions and append add-ons
2012-03-05 23:06:27 -08:00
Mark Otto
bcd9294cc4
clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green)
2012-03-05 23:00:37 -08:00
Mark Otto
d98a2e9234
adding table variables
2012-03-05 22:47:39 -08:00
Mark Otto
ac6eff280d
Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
...
Conflicts:
less/dropdowns.less
2012-03-05 20:49:39 -08:00
Mark Otto
9c2b2c589d
fix comment on bottom-up, should be dropup
2012-03-05 20:20:42 -08:00
Mark Otto
20b10b5d66
change dropdown hover/active color back to link color
2012-03-05 20:15:35 -08:00
Mark Otto
eaf464a2c5
increase specifity of .pills li.active for dropdowns
2012-03-05 20:14:54 -08:00
Mark Otto
cb9234ba46
fix warning button issue per #2392 and add warning buttons to components
2012-03-05 00:47:13 -08:00
Mark Otto
7a8d6b1976
clean up horizontal dl option and docs
2012-03-05 00:42:37 -08:00
Mark Otto
fb1d4a0f04
Merge pull request #2267 from dominicbarnes/dl_horizontal
...
Horizontal mode for description lists
2012-03-05 00:38:26 -08:00
Mark Otto
1fa42e2f71
fix ie7 breadcrumbs per #2224
2012-03-05 00:36:57 -08:00
Mark Otto
235811cd8a
Merge branch 'alexpeattie-master' into 2.0.2-wip
2012-03-05 00:34:54 -08:00
Mark Otto
a95c15a530
utilize new dropdown variables
2012-03-05 00:32:02 -08:00
Mark Otto
d3e922f0c8
add a ton new variables for type, buttons, inputs
2012-03-05 00:29:16 -08:00
Tarsis Azevedo
3cbc40b129
add uglify-js install information in compiling section. improve issue #1756
2012-03-05 01:38:20 -03:00
Jacob Thornton
29c63fdb6a
true > child + varargs
2012-03-04 14:27:13 -08:00
Jacob Thornton
3524aa909c
make sure to pass child var through
2012-03-04 14:21:54 -08:00
Jacob Thornton
2f598e35a0
when > 0 rather than when not 0
2012-03-04 14:11:51 -08:00
Jacob Thornton
1aeca545c8
new approach to grid with recursive mixins :D
2012-03-04 14:06:30 -08:00
Simon Charette
efd5e29ff4
Fixed small button caret and moved less code to dropdowns
2012-03-04 15:49:55 -05:00
Alex Peattie
0112b56c9c
Fix typo in .mustache file
2012-03-03 22:16:20 -08:00
Alex Peattie
6a839fb2c3
docs/scaffolding typo: Large display is 1200px and up, not 1210px
2012-03-01 15:29:32 -08:00
Dave Wasmer
ff8b997a1f
Added disabled styles to pager
2012-02-28 18:39:35 -05:00
Mark Otto
7bf3419647
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
2012-02-28 08:53:06 -08:00
Mark Otto
bd55824827
.progress-warning mention in docs
2012-02-28 08:52:59 -08:00
Mark Otto
2087339035
Merge pull request #2305 from MeilleursAgents/features/warning_progress_bar
...
Progress bars: Added warning (orange) bar
2012-02-28 08:52:16 -08:00
Jonathan Camile
a397130669
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar
2012-02-28 11:06:05 +01:00
Jonathan Camile
15759d9e7c
Components: Added mention to warning progress-bar in docs
2012-02-28 10:58:23 +01:00
Mark Otto
fbebb046f7
fix navbar container for default 940px grid per #2194
2012-02-27 22:34:25 -08:00
Mark Otto
6c9547f411
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
2012-02-27 22:08:44 -08:00
Mark Otto
9ee77f2c11
set line-height for labels to prevent change in height when floated per #2222
2012-02-27 21:50:54 -08:00
Mark Otto
a7b96b3e59
set list-style to none for breadcrumbs to resolve cross browser issues per #2224
2012-02-27 21:32:48 -08:00
Mark Otto
5cc4fcf6a2
Merge branch 'meleyal-fix-carousel-docs' into 2.0.2-wip
...
Conflicts:
docs/javascript.html
docs/templates/pages/javascript.mustache
2012-02-27 21:22:20 -08:00
Dominic Barnes
0b78033f0b
removing a few of the size classes, changing up the documentation
2012-02-27 23:21:25 -06:00
Dominic Barnes
d12737719f
undoing what I suspect are the 'dirty' parts of this commit
2012-02-27 22:55:35 -06:00
Mark Otto
2c98e18724
Merge pull request #2227 from andriijas/2.0.2-wip-pillexamplefix
...
Fixing nav-pills code example
2012-02-27 19:51:44 -08:00
Mark Otto
4e17b1975e
Merge branch 'meleyal-patch-1' into 2.0.2-wip
2012-02-27 19:50:44 -08:00
Mark Otto
ca9588c896
manually resolve #2266 , typo in example HTML for breadcrumbs
2012-02-27 19:47:21 -08:00
Mark Otto
7525aac830
make .input-prepend/append .add-on text color the same as labels, #333 , to close out #2276
2012-02-27 19:44:16 -08:00
Mark Otto
d57598827f
fix typo in js docs carousel section per #2299
2012-02-27 19:40:07 -08:00
Mark Otto
af8261af93
simplify selector for .modal-form per #2218
2012-02-27 19:09:44 -08:00
Mark Otto
7bdd9551ed
really add protocol to examples
2012-02-27 18:48:28 -08:00
Jacob Thornton
8615987243
add guard for child spans
2012-02-27 18:21:21 -08:00
Jacob Thornton
ae3382d797
working through new grid implementation...
2012-02-27 18:15:59 -08:00
Mark Otto
163f58ff81
add heads up label to new docs mention
2012-02-26 23:31:12 -08:00
Mark Otto
dd94f8d509
remove warning from icons section about :after labels, add section to explain spacing
2012-02-26 23:30:15 -08:00
Mark Otto
1a781a707e
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-26 23:16:11 -08:00
Mark Otto
ccf7697185
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-26 23:15:36 -08:00
Dominic Barnes
0a8efd5320
Adding a 'horizontal' option to description lists, similar to .form-horizontal
2012-02-25 21:21:05 -06:00
Jacob Thornton
43760eb202
fix for @pamelafox and #1861
2012-02-24 22:17:36 -08:00
Jacob Thornton
fb74018ae2
and pause on hover option to carousel
2012-02-24 21:51:39 -08:00
Mark Otto
6abb2059eb
fix docs example in js page per #2225
2012-02-24 21:06:17 -08:00
Mark Otto
4309153051
add version to docs homepage, fix docs example for forms
2012-02-24 21:02:24 -08:00
meleyal
be9ae70060
Fix typos and clarify wording in carousel docs
2012-02-25 01:25:31 +01:00
meleyal
591908eccf
Fix broken links to fav and touch icons in examples, fixes #2244
2012-02-24 23:06:02 +01:00
Jonathan Camile
1562a8a010
Progress bars: Added warning (orange) bar
2012-02-24 11:37:26 +01:00
Andreas Cederström
34268672be
Fixing nav-pills code example - closes #2225
2012-02-24 07:34:23 +01:00
Jacob Thornton
74a3c763b4
add note about backdrop static
2012-02-23 16:24:33 -08:00
Mark Otto
0e8427e7b1
update modal footers to use text-align instead of float on buttons for alignment
2012-02-22 22:38:54 -08:00
Pete Hopkins
3a6f58598c
Allows escape to bubble when menu isn't shown
2012-02-22 14:19:55 -05:00
Pete Hopkins
70fecd1115
Fires change event when element is selected from menu
2012-02-22 14:19:55 -05:00
Pete Hopkins
80d03e143c
Allow events to propagate / default if not used.
...
- All key events when the menu is not shown now propagate.
- Blur is also allowed to propagate.
2012-02-22 14:19:55 -05:00
Mark Otto
8609a77bd2
add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173
2012-02-22 11:16:32 -08:00
Mark Otto
0ed6d3b28e
Merge branch 'couchbaselabs-clearfix-ing-form-actions' into 2.0.2-wip
2012-02-22 11:15:53 -08:00
Mark Otto
6f3b4b857f
Merge branch 'clearfix-ing-form-actions' of https://github.com/couchbaselabs/bootstrap into couchbaselabs-clearfix-ing-form-actions
2012-02-22 11:15:44 -08:00
Mark Otto
a0ec422444
fix #1954 : icons in tabs add jank border
2012-02-22 08:36:07 -08:00
Mark Otto
b86969f762
restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080
2012-02-22 08:21:29 -08:00
Mark Otto
4410ede8ed
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-22 08:12:51 -08:00
Mark Otto
92a54a7b72
tighten padding on labels and badges given default line-height
2012-02-22 08:12:25 -08:00
Jacob Thornton
f3b6cf1d6d
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
less/mixins.less
2012-02-21 23:18:18 -08:00
Jacob Thornton
5ad5dde1e2
rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it.
2012-02-21 23:16:06 -08:00
Mark Otto
a139167489
set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins)
2012-02-21 23:15:43 -08:00
Mark Otto
9b524a16e9
clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918
2012-02-21 23:00:02 -08:00
Mark Otto
917df6703c
clarify responsive docs on media queries
2012-02-21 22:40:21 -08:00
Mark Otto
8bd67bb124
clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups
2012-02-21 22:09:51 -08:00
Mark Otto
20221a67c2
Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/navbar.less
2012-02-21 22:01:39 -08:00
Mark Otto
b4cc6c74f5
add support and docs for .navbar-fixed-bottom
2012-02-21 21:12:16 -08:00
Mark Otto
e3ae517555
move container up in default grid mixin
2012-02-21 15:21:18 -08:00
Mark Otto
8665fa8c50
move table columns mixin to mixins.less
2012-02-21 15:18:05 -08:00
Mark Otto
575072b74b
Merge pull request #2143 from inmarelibero/2.0.2-wip
...
Add columns 13-24 for grid systems to enable customization up to 24 cols
2012-02-21 15:15:56 -08:00
Mark Otto
bb16b9bef2
fix second part of #1962
2012-02-21 13:52:02 -08:00
Mark Otto
664a5c4438
update forms help-block
2012-02-21 13:43:13 -08:00
Emanuele Gaspari
1cfb3fd03a
substituted hard-coded number of columns (12) with @gridColumns
2012-02-21 19:19:15 +01:00
Emanuele Gaspari
45cec4a6fa
added .span[13-24] and .offset[12-23] to support up to 24-columns layout
2012-02-21 19:07:55 +01:00
Mark Otto
d908731566
Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-21 09:05:04 -08:00
Mark Otto
187b3bd4bd
Merge pull request #2129 from andriijas/2.0.2-wip-navtabs
...
Width fix on .tab-content
2012-02-21 09:00:10 -08:00
Mark Otto
a78faee589
Merge pull request #2138 from laczoka/2.0.2-wip
...
Fix for #2137 , adding select to input append/prepend
2012-02-21 08:29:08 -08:00
Mark Otto
80abc50d3e
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-21 08:25:19 -08:00
Mark Otto
f3ad4c7183
adding responsive utility classes and matching docs section with super neato table and test
2012-02-21 08:24:18 -08:00
Laszlo Toeroek
e423fc2629
.input-append should work for select element, fixes #2137
2012-02-21 16:32:57 +01:00
Andreas Cederström
f50b2c9b92
100% width on .tab-content
2012-02-21 09:20:46 +01:00
Andreas Cederström
dfd0326186
Bring back nowrap to labels and badges
2012-02-21 08:17:16 +01:00
Jacob Thornton
d149a131c1
remake
2012-02-20 22:02:04 -08:00
Jacob Thornton
f046c12bd2
fix cycling in carousel
2012-02-20 22:01:38 -08:00
Mark Otto
06d4756114
adding basic badges support
2012-02-20 21:20:06 -08:00
Mark Otto
d2630ff84e
introduce new mixin to do navbar vertical centering
2012-02-20 19:14:26 -08:00
Mark Otto
143b3db2c9
update inline forms to resolve checkbox label with space in it and overlapping content, per #1969
2012-02-20 18:56:05 -08:00
Mark Otto
331c85724a
remove max-width on img from reset and put in docs only, per #1552
2012-02-20 16:18:13 -08:00
Mark Otto
9c74f21966
fix overflow issue on tabbed content per #2079
2012-02-20 16:06:42 -08:00
Mark Otto
91fe8bc0f4
remake after merging buttons update
2012-02-20 13:37:24 -08:00
Mark Otto
2b8fc018ba
Merge branch 'billyvg-main' into 2.0.2-wip
2012-02-20 13:36:56 -08:00
Billy Vong
e18a35784a
Update old button selectors 'small' and 'large' to be 'btn-small' and 'btn-large'
2012-02-20 13:16:49 -08:00
Mark Otto
7ef7547a14
add horizontal divider support to nav list, including documentation for it, per #2106
2012-02-20 12:38:49 -08:00
Mark Otto
6df925bc75
enable use of span in place of a for .disabled in pagination, per #1406
2012-02-19 23:51:59 -08:00
Mark Otto
9f608411cb
no more uppercase in readme
2012-02-19 22:53:34 -08:00
Mark Otto
f81e5fbe9f
readme cleanup
2012-02-19 22:52:32 -08:00
Mark Otto
9b09d1de86
move overflow and max-height on modal to modal-body instead
2012-02-19 21:55:09 -08:00
Mark Otto
1c7d346767
quick edit to new global styles section
2012-02-19 16:40:41 -08:00
Mark Otto
8247cb3362
add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles
2012-02-19 16:28:46 -08:00
Mark Otto
f4f34ab12f
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 16:00:54 -08:00
Mark Otto
59d570fc16
Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:38:34 -08:00
Mark Otto
3470c0dc49
Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:04:52 -08:00
Mark Otto
89ccbdf8d1
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Mark Otto
5f2d2893d2
Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 14:59:42 -08:00
Mark Otto
8482cc4cb3
commit leftover from make
2012-02-19 14:55:07 -08:00
Mark Otto
adbbf17ee4
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0
simplify text color in navbar by placing the color on global .navbar component
2012-02-19 14:53:07 -08:00
Mark Otto
532242e626
Merge pull request #2089 from jacobrask/ie6hack
...
Remove IE6 hacks
2012-02-19 14:52:06 -08:00
Jacob Rask
f28140897e
Update documentation for abbreviations
2012-02-19 22:14:18 +01:00
Jacob Rask
e145619f6d
Remove underscore hack for IE6
...
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6
Separate span12 and container classes
...
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.
Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask
ad546c9631
Add Opera-prefixed radial gradient
...
Tested and works in Opera 11.61
2012-02-19 21:42:12 +01:00
Jacob Rask
51ec513b5c
Use inherit on alert-heading color
...
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
2012-02-19 21:29:32 +01:00
Jacob Rask
c1775da187
Add class for upper case abbreviations, aka initialisms
...
Read more:
* http://en.wikipedia.org/wiki/Abbreviation
* http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:24:06 +01:00
Jacob Rask
f08b407667
Only show help cursor/border for abbr with title
2012-02-19 21:23:17 +01:00
Jacob Rask
df757fb040
All abbreviations are not upper case initialisms
...
Read more:
* http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
* http://en.wikipedia.org/wiki/Abbreviation
* http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:21:44 +01:00
Jacob Thornton
ac6e667ad9
Merge branch 'master' into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-18 23:31:37 -08:00
Jacob Thornton
3d58b46226
fix bootstrap-button toggle regression + tests
2012-02-18 23:29:58 -08:00
Mark Otto
1948e985a3
merge in and remake for responsive navbar dropdown fix
2012-02-18 20:09:34 -08:00
Mark Otto
ba97f56912
Merge branch 'tagliala-collapse-dropdown-fix' into 2.0.2-wip
2012-02-18 20:08:11 -08:00
Mark Otto
bbb2fb3395
fix right aligned dropdowns
2012-02-18 20:06:38 -08:00
Mark Otto
fed3b59e46
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
2012-02-18 15:31:44 -08:00
Mark Otto
dc4a864aaa
Merge pull request #2063 from DominikTo/master
...
fixed syntax error in sprites.less and typo in comments
2012-02-18 15:31:16 -08:00
Mark Otto
29e6ef7c70
clarify forms in navbar per #2072
2012-02-18 15:23:38 -08:00
Mark Otto
db940b3d8f
Merge pull request #2066 from artstorm/2.0.2-wip
...
Fixed compile problem with LESS 1.2.1.
2012-02-18 15:17:41 -08:00
Mark Otto
1a1816b5bd
clarify misc components subhead
2012-02-18 15:17:25 -08:00
Johan Steen
c900d72857
Fixed compile problem with LESS 1.2.1.
...
The sprite path variables introduced in v2.0.1 prevents bootstrap.less to
compile wiht LESS v1.2.1. Updated the variables to use the @{name}
construct when inserted in sprites.less, as outlined in the LESS
documentation. This change makes the CSS compile with LESS v1.2.1.
2012-02-18 14:28:44 +01:00
Geremia Taglialatela
2068b74ea8
Fixed a wrong behaviour when using collapse and dropdown in responsive layout
2012-02-18 13:08:49 +01:00
Dominik Tobschall
7609fd4dc6
fixed syntax error
2012-02-18 09:40:28 +01:00
Dominik Tobschall
f5bd4b3c8f
fixed typo (whitespace)
2012-02-18 09:40:18 +01:00
Mark Otto
b776cae902
add mention of js compilation to single file in customize page per #2003
2012-02-17 21:18:08 -08:00
Mark Otto
ec05ebc5ed
add small section to navbar docs on text in the component, per #2035
2012-02-17 20:53:12 -08:00
Mark Otto
1455bc9f8f
removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024
2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0
fix duplicate input prepend/append css selectors per #2026
2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1
swap last .btn-dark reference
2012-02-17 20:25:49 -08:00
Mark Otto
5d02b8c3c6
fix grid typo in subnav
2012-02-17 14:41:41 -08:00
Mark Otto
7fa1578c49
fix page header example and docs per #2048
2012-02-17 14:39:30 -08:00
Andreas Cederström
1e6d386b8d
Keep origin in track
2012-02-17 13:31:36 +01:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Jacob Thornton
03e6dc66c2
Merge branch '2.0.1-wip'
2012-02-16 22:41:02 -08:00
Mark Otto
091622644a
bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE
2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f
change clearfix mixin to drop parens that prevent it from being a class, too
2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab
add mini buttons per #1971
2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64
fix buttons focus state and swap a buttons for button buttons
2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be
fix responsive media queries to use 979 and 980 where appropro
2012-02-16 21:08:52 -08:00
Mark Otto
0369c1fcfc
add mention of navbar vertical divider in docs
2012-02-16 21:04:16 -08:00
Jacob Thornton
c3d3cf7262
add note about popover placement
2012-02-16 20:46:35 -08:00
Jacob Thornton
9d12b2d601
don't try next if not next
2012-02-16 20:43:57 -08:00
Jacob Thornton
b3e4e5ae22
add idea to modal markup exmaple
2012-02-16 20:33:15 -08:00
Jacob Thornton
1520ec446c
rebuild bro
2012-02-16 20:30:18 -08:00
Jacob Thornton
6da16a6def
fix dropdown links
2012-02-16 20:30:00 -08:00
Jacob Thornton
e730f8adb5
null out interval so that pause doesn't resume on next or prev
2012-02-16 20:22:01 -08:00
Jacob Thornton
f9b578260f
rebuild alerts
2012-02-16 20:05:09 -08:00
Jacob Thornton
792059b7ad
fix alerts
2012-02-16 20:04:26 -08:00
BigBlueHat - Web Manufacturer
18760393d7
Adding .clearfix() to .form-actions to allow for .pull-right button containers
2012-02-14 15:16:55 -05:00
Jacob Thornton
a8c478e051
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-13 18:42:57 -08:00
Jacob Thornton
6e77c9d123
add semicolons to the end of js files
2012-02-13 18:41:02 -08:00
Jacob Thornton
9143d8e449
update irc spacing in readme
2012-02-13 18:11:41 -08:00
Jacob Thornton
28cfa8be03
add irc note
2012-02-13 18:10:36 -08:00
Mark Otto
64ea59234f
change up fonts on form elements to remove unnecessary font-family on label element, per #1950
2012-02-13 08:18:19 -08:00
Andreas Cederström
60826077e7
Clean up inverse button using variables, adding button group examples. Also adding inverse inline label
2012-02-13 09:41:28 +01:00
Mark Otto
da94850844
fix filename mention in js docs per #1938
2012-02-12 22:50:21 -08:00
Mark Otto
ce5976fb29
ensure help-block is block per #1937
2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591
clean up nav-header in responsive
2012-02-12 21:11:56 -08:00
Mark Otto
944c7298d3
adding makeRow and makeColumn mixins for generating more semantic layouts
2012-02-12 20:46:39 -08:00
Mark Otto
3e00c1261f
allow .input-prepend/.input-append to work in .navbar per #1681
2012-02-12 20:28:22 -08:00
Mark Otto
be6fdd9a62
add docs for alt form control sizing per #1700
2012-02-12 20:10:48 -08:00
Mark Otto
4d1f1f0fc7
add typography pattern .page-header to components per #1701
2012-02-12 20:07:25 -08:00
Mark Otto
81d101a6a7
update docs on fixed nav per #1726
2012-02-12 19:50:36 -08:00
Mark Otto
5fc62c5fcc
clear up scaffolding page to separate fixed from fluid grid systems
2012-02-12 16:59:29 -08:00
Mark Otto
16f2e0e19e
add link to docs compiling section in readme
2012-02-12 16:05:25 -08:00
Mark Otto
87ed82207a
update readme to clarify dependencies of make command, per #1756
2012-02-12 16:04:02 -08:00
Mark Otto
ac9ac4ddae
add note to button dropdowns about js plugin dependency per #1746
2012-02-12 15:49:04 -08:00
Mark Otto
163c98ea7e
clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin
2012-02-12 15:43:04 -08:00
Mark Otto
a57dbada0f
change classname from .btn-dark to .btn-inverse, change use text
2012-02-12 15:18:20 -08:00
Mark Otto
b8493ed8b7
Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip
2012-02-12 15:14:27 -08:00
Mark Otto
1b32e982ad
add hero-unit docs per #1880
2012-02-12 14:47:09 -08:00
Mark Otto
0ff88f2db3
enable the use of .nav-header in dropdowns per #1827
2012-02-12 14:10:07 -08:00
Mark Otto
a9e469e75a
add navbar background hover variable and fix uneditable-input with append/prepend controls
2012-02-12 14:01:58 -08:00
Mark Otto
86b6ea4b5f
lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed
2012-02-12 13:33:23 -08:00
Mark Otto
de6f3d4a6f
Merge branch '2.0.1-wip' of github.com:twitter/bootstrap into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-12 13:27:29 -08:00
Mark Otto
ebe547b6a0
Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2
2012-02-12 13:20:17 -08:00
Mark Otto
24df7f1e1d
update ff comment in buttons
2012-02-12 13:20:08 -08:00
Mark Otto
b9d5ceb14b
edit comment on IE7-8 support of :focus in navbar-search
2012-02-12 11:17:46 -08:00
Jacob Thornton
5b4a29d84e
honor data attributes set on modal as well
2012-02-12 11:15:12 -08:00
Mark Otto
a2bc22bad5
standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover
2012-02-12 11:14:13 -08:00
Mark Otto
c02df93903
move shim after css
2012-02-12 11:08:58 -08:00
Mark Otto
a72ef967ba
re-add protocol to the shim
2012-02-12 11:08:33 -08:00
Jacob Thornton
d7953a8f1e
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-12 11:07:34 -08:00
Jacob Thornton
ed07a4d0ce
add note about popover placement
2012-02-12 11:06:50 -08:00
Mark Otto
2eedf60d62
write out icon classes explicitly to enable find via browser
2012-02-11 22:34:41 -08:00
Mark Otto
b327420e52
update comment to reflect ie support
2012-02-11 20:58:10 -08:00
Mark Otto
158419c045
reset line-height for file input in ie9
2012-02-11 20:00:44 -08:00
Mark Otto
5bb55e4615
change fixed height on responsive textareas to min-height
2012-02-11 19:21:23 -08:00
Mark Otto
343012a9af
Merge branch 'patch-1' of https://github.com/cvrebert/bootstrap into cvrebert-patch-1
2012-02-11 17:28:07 -08:00
Mark Otto
5b22cf5cc3
fix tabs content wrapping per #1620
2012-02-11 17:27:08 -08:00
Mark Otto
a84092d225
update buttons docs for .disabled class per #1774
2012-02-11 17:25:47 -08:00
Mark Otto
c16ccf64f1
update tooltips message in upgrade docs
2012-02-11 17:25:30 -08:00
Mark Otto
85d8fe884c
Merge branch '2.0.1-docs-update' of https://github.com/smaboshe/bootstrap into smaboshe-2.0.1-docs-update
2012-02-11 17:18:17 -08:00
Mark Otto
a497e9010a
make button examples button element and add upgrade note on tooltip positions per #1532
2012-02-11 17:12:32 -08:00
Mark Otto
5a3dfb72bf
support small for legend per #1544
2012-02-11 16:50:57 -08:00
Mark Otto
4ddc8fd0e4
remove color on :active of buttons
2012-02-11 16:43:53 -08:00
Mark Otto
102bb8e684
clear up some messaging in docs on fluid grid system and nesting overall
2012-02-11 10:38:41 -08:00
Mark Otto
2679c3ebe3
remove the reset type from cancel buttons in forms examples per #1844
2012-02-11 10:13:53 -08:00
Mark Otto
8f1db4321a
fix inline form checkbox/radios
2012-02-11 00:24:06 -08:00
Mark Otto
60ee768537
fix type on responsive grid per #1852
2012-02-11 00:16:13 -08:00
Mark Otto
efac5441d8
move legend fix out of horizontal and to all forms
2012-02-11 00:11:34 -08:00
Mark Otto
855dcd3f56
Merge branch '2.0.1-wip' of https://github.com/jmar777/bootstrap into jmar777-2.0.1-wip
2012-02-11 00:10:58 -08:00
Mark Otto
cbccbed8c8
fix javascript text on tooltips per #1862
2012-02-11 00:10:26 -08:00
Mark Otto
722c75d1b1
update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first
2012-02-11 00:07:05 -08:00
Mark Otto
a63663a3b6
fix type in less docs per #1902
2012-02-11 00:02:28 -08:00
Mark Otto
02cb4df469
fix some single vs double quotes, fix typo in js docs per #1900
2012-02-11 00:01:35 -08:00
Mark Otto
89205d9db4
manually address #1895
2012-02-10 23:59:00 -08:00
Mark Otto
b4b3343a61
clarify structure of responsive css file
2012-02-10 23:57:31 -08:00
Mark Otto
c720d951be
add best practices and re-org the button groups
2012-02-10 23:50:45 -08:00
Mark Otto
8a91f927f5
clarify npm install command in less docs
2012-02-10 23:37:54 -08:00
Mark Otto
d7aefe67e3
scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag
2012-02-10 23:07:32 -08:00
Mark Otto
c10661cf5d
Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip
2012-02-09 23:20:05 -08:00
Mark Otto
9126014e93
Merge branch 'ol-unstyled' of https://github.com/barsoom/bootstrap into barsoom-ol-unstyled
2012-02-09 23:19:31 -08:00
Simon
d9eff8efc1
Added the carret of the button
2012-02-10 00:31:40 +01:00
Simon
451a642ae8
Added a black/dark button
2012-02-09 23:08:14 +01:00
Chris Wiederspan
4c7b9b8fce
Added an overriding filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) to the .subnav-fixed class that fixes the bug caused on nav dropdown menus when "docked" in the fixed position.
2012-02-09 14:28:12 -07:00
Jeremy Martin
920d995843
webkit legend margin fix for non-horizontal forms
2012-02-09 15:27:42 -05:00
Silumesii Maboshe
2e5a81601c
Typo.
2012-02-08 17:11:51 +02:00
Jacob Thornton
b0bd3efc4a
Merge pull request #1781 from pamelafox/patch-7
...
Javascript update docs for tooltips, based on @fat's feedback.
2012-02-07 22:35:47 -08:00
Jacob Thornton
b36a744fa7
remove small class
2012-02-07 22:32:32 -08:00
Jacob Thornton
687c8bf761
Merge branch 'master' of https://github.com/twitter/bootstrap into 2.0.1-wip
2012-02-07 22:05:17 -08:00
Jacob Thornton
04fd01d4b6
fix docs for carousel markup
2012-02-07 22:04:52 -08:00
Jacob Thornton
e8f1a10ec9
Merge pull request #1808 from wrightlabs/patch-1
...
Responive design fix for examples on some devices
2012-02-07 21:58:28 -08:00
Jacob Thornton
139a077543
don't use e.target incase button has icon or other content inside it
2012-02-07 21:55:27 -08:00
John Wright
d390a921dc
some (android) devices need this viewport meta tag for responsive design to work
2012-02-07 11:06:08 -08:00
John Wright
9928e7fd3c
some (android) devices need this viewport meta tag for responsive design to work.
2012-02-07 11:05:13 -08:00
John Wright
91d0997c79
Some devices need this for responsive design to work
2012-02-07 10:58:01 -08:00
Henrik N
25bf0af249
Add ol.unstyled
2012-02-07 19:29:45 +01:00
Mark Otto
11f72f6aa2
merge in #1782 , remake to compile html, add some i18n tags
2012-02-07 00:31:01 -08:00
Mark Otto
00c13691a9
Merge branch 'pamelafox-patch-8' into 2.0.1-wip
2012-02-07 00:17:04 -08:00
Mark Otto
adff17ac03
fix for #1779 , use line-height var
2012-02-07 00:16:05 -08:00
Mark Otto
2d9b3c45d3
move formfieldstate mixin to mixins.less for #1785
2012-02-07 00:13:52 -08:00
Mark Otto
3b57fba754
merge in #1757 and make the chance to the mustache template, then remake
2012-02-07 00:07:08 -08:00
Mark Otto
3fa971378e
Merge branch 'master' of https://github.com/bastula/bootstrap into bastula-master
2012-02-07 00:05:25 -08:00
Mark Otto
7dffeb471f
fix #1786 to manually fix typo in js docs links
2012-02-06 23:55:18 -08:00
Mark Otto
b5f1d2f3a4
rearrange order of 3d and skew mixins:
2012-02-06 23:48:48 -08:00
Mark Otto
6840d8f776
Merge branch 'tobaco-master' into 2.0.1-wip
2012-02-06 23:48:16 -08:00
Mark Otto
7ce62ffc98
make after merging in breadcrumbs wrap fix
2012-02-06 23:42:57 -08:00
Mark Otto
63fd119c6e
Merge branch 'et-fix_long_breadcrumbs' into 2.0.1-wip
2012-02-06 23:42:45 -08:00
Mark Otto
c76b32bdef
Merge branch 'fix_long_breadcrumbs' of https://github.com/et/bootstrap into et-fix_long_breadcrumbs
2012-02-06 23:42:40 -08:00
Mark Otto
a10c23f1aa
Merge branch 'CaryLandholt-master' into 2.0.1-wip
2012-02-06 23:42:02 -08:00
Mark Otto
6325402372
Merge branch 'master' of https://github.com/CaryLandholt/bootstrap into CaryLandholt-master
2012-02-06 23:41:53 -08:00
Mark Otto
1a97cce19b
manual patch of #1449 to make thumbnails use grid vars
2012-02-06 23:39:22 -08:00
Mark Otto
4ed1b13719
Merge branch 'raphaelz-patch-1' into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-06 23:36:31 -08:00
Mark Otto
575b82473f
rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query
2012-02-06 23:34:03 -08:00
raphaelz
3722bb9a88
Grammatical changes have been made as suggested by @cvrebert for issue #1787 .
2012-02-07 02:11:25 -05:00
Pamela Fox
7e92b33f12
Adding tooltip example to javascript docs. It's particularly helpful to show the pre-generated HTML for tooltips, as inspecting the source will show post-processed HTML with data-original-title attributes and may confuse folks (where folks=me :).
2012-02-06 14:37:47 -08:00
Pamela Fox
407ca09226
Javascript update docs for tooltips, based on @fat's feedback.
2012-02-06 14:33:12 -08:00
Torsten Baldes
9ba9185afc
Removed double declaration of Skew
...
+ added translate3d to mixins.less
2012-02-06 09:59:23 +01:00
Jacob Thornton
c8c4d5b392
fix alert tests + add show option back to modals
2012-02-06 00:17:31 -08:00
Chris Rebert
98cffdbf46
parallel fix to mustache template
2012-02-05 23:02:16 -08:00
Aditya Panchal
8a8daca71e
Fixed a typo in base-css.html which allows the user icon to be shown on the example button
2012-02-05 22:04:46 -06:00
Mark Otto
85e401a656
add label hover style for ability to make it a link
2012-02-05 02:36:21 -08:00
Mark Otto
f9847b300b
Merge branch 'jarijokinen-master' into 2.0.1-wip
2012-02-05 02:33:35 -08:00
Mark Otto
f8db6a3b53
Merge branch 'master' of https://github.com/jarijokinen/bootstrap into jarijokinen-master
2012-02-05 02:33:30 -08:00
Mark Otto
546332d85d
resolve #1602 and add table hover style
2012-02-05 02:28:42 -08:00
Mark Otto
f8c2d9b53d
remove 940px from default grid heading
2012-02-05 02:24:14 -08:00
Mark Otto
59b32586af
close #1628 to add padding to all inline checkboxes/radios
2012-02-05 02:16:46 -08:00
Mark Otto
91475c865d
fix #1631 by adding focus to radio buttons
2012-02-05 02:14:25 -08:00
Mark Otto
4a09cf04d8
clean up labels per #1656
2012-02-05 02:01:28 -08:00
Mark Otto
2a192468d3
address #1722 by finishing incomplete sentence on responsive
2012-02-05 01:59:16 -08:00
Mark Otto
d92523f329
fix for #1658 to give .label-success proper text
2012-02-05 01:57:09 -08:00
Mark Otto
ff91b233eb
fix #1665 by correcting tabs example markup
2012-02-05 01:50:55 -08:00
Mark Otto
53da88e561
add mixin for text-overflow
2012-02-05 01:49:36 -08:00
Mark Otto
f59b7ce8ea
add mention of required classes to horizontal forms
2012-02-05 01:43:22 -08:00
Mark Otto
abf4ecac4d
add another code example for horizontal forms
2012-02-05 01:41:45 -08:00
Mark Otto
83cb105317
adding code snippets to form examples
2012-02-05 01:36:11 -08:00
Mark Otto
9b5b8460b4
Merge branch 'noahblon-master' into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-05 01:26:44 -08:00
Mark Otto
2f42f35c69
manually resolve #1684
2012-02-05 00:35:13 -08:00
Mark Otto
6661639b37
#1693 : manual fix of the pull request to add class name changes to pills/tabs to upgrade guide
2012-02-05 00:29:19 -08:00
Mark Otto
0336f1e644
#1695 : manually fix broken primary button instances
2012-02-05 00:27:08 -08:00
Mark Otto
dfcb2d1ed8
#1697 : update upgrading docs to include mention of no more secondary class in modals
2012-02-05 00:25:40 -08:00
Mark Otto
f29e3263b0
follow up to #1702 , add callout on component alignment in tabs/pills
2012-02-05 00:16:25 -08:00
Mark Otto
cdb1ad1a52
#1702 : add callout to navbar for component alignment
2012-02-05 00:11:21 -08:00
Mark Otto
31abeec0f2
manually handle #1703 for note on horizontal forms
2012-02-05 00:05:01 -08:00
Mark Otto
125368d4db
update docs with call on meta tag for responsive
2012-02-04 23:57:15 -08:00
Mark Otto
a2848ebb00
fix meta tag for viewport in examples and shims
2012-02-04 23:53:24 -08:00
Chris Rebert
93fea1f1cf
The < and > escapes have nothing to do with Unicode.
2012-02-04 23:21:56 -08:00
Mark Otto
35fdddbc4f
correct css selector for .control-label, required in the docs but not in the CSS files
2012-02-04 22:55:47 -08:00
Mark Otto
418bf5221a
#1712 : fix typo in js docs
2012-02-04 22:50:26 -08:00
Mark Otto
87a8c9b677
#1707 : remove rgba() background override on navbar active items for customization
2012-02-04 22:40:50 -08:00
Mark Otto
679cd5ea02
#1706 : protocol independent html5shim added, and moved after the CSS for loading time's sake
2012-02-04 22:38:49 -08:00
Mark Otto
6d8ac203e5
fix broken alert example with data-dismiss
2012-02-04 22:32:04 -08:00
Mark Otto
b297a61f82
#1732 : make examples of alerts in docs components page dismissable
2012-02-04 22:31:09 -08:00
Mark Otto
468688638d
#1715 : strip code of styles when in a pre
2012-02-04 22:23:20 -08:00
Mark Otto
7e81f84b29
buttons and icons updated for improved placement and variable support for icon paths
2012-02-04 22:22:19 -08:00
Mark Otto
81d1f3b96e
remove max-width on dropdown menus
2012-02-04 18:52:25 -08:00
Mark Otto
9259e24f73
fix cutoff follow button
2012-02-04 18:27:05 -08:00
Mark Otto
ac98cee609
allow alternate form layouts to hide inputs with .hide on them
2012-02-04 18:26:04 -08:00
Noah Blon
f922a0800b
Fixes typo on download page
...
Changed chose to choose spelling error on download template
2012-02-03 10:34:03 -06:00
Jacob Thornton
f68f7870ef
Merge pull request #1603 from mikaelbr/master
...
Fixed ID and for-attr in the doc forms
2012-02-02 23:47:22 -08:00
Jacob Thornton
7f0a64106d
its core (typo)
2012-02-02 23:31:03 -08:00
Jacob Thornton
c04241b615
Merge pull request #1647 from htanata/fix_alerts_code_example
...
Fix alerts JavaScript code example
2012-02-02 23:16:17 -08:00
Hendy Tanata
906028abdb
Fix alerts JavaScript code example.
2012-02-02 20:45:58 -08:00
Eric Thomas
ced08f6935
Wrap long breadcrumb trails
2012-02-02 11:02:14 -08:00
Mark Otto
9ab843b936
add mention of classes to use for button sizes
2012-02-02 09:57:22 -08:00
Mark Otto
e92e9f1138
add count to follow button, tweak links to fit on one line for 940px
2012-02-02 09:46:14 -08:00
Mark Otto
ab4345332d
Merge branch 'shama-master' into 2.0.1-wip
2012-02-02 09:38:21 -08:00
Mark Otto
bd0e952003
fix inverted warning text and bg colors in less docs page
2012-02-02 09:36:33 -08:00
Mark Otto
4c237e688b
Merge branch 'zhongwei99-master' into 2.0.1-wip
2012-02-02 09:34:37 -08:00
Mark Otto
cf488c2800
fix incorrect uses of it's in the docs
2012-02-02 09:33:18 -08:00
Mark Otto
dfdc63e872
fix incorrect use of 'caret'
2012-02-02 09:31:07 -08:00
Mikael Brevik
8c0b47a6a8
Fixed duplicate and wrong IDs and label fors in forms.
2012-02-02 14:09:27 +01:00
zhongwei99
4158701894
Minor typo fix.
2012-02-02 18:01:16 +08:00
Kyle Robinson Young
99f395bcd7
Typo fixes
2012-02-01 23:30:37 -08:00
Mark Otto
77871a4205
Merge branch 'eirikb-master' into 2.0.1-wip
2012-02-01 23:13:16 -08:00
Mark Otto
7da9b16307
Merge branch 'master' of https://github.com/eirikb/bootstrap into eirikb-master
2012-02-01 23:12:55 -08:00
Mark Otto
9c3218c89b
Merge branch 'mshafrir-master' into 2.0.1-wip
2012-02-01 23:12:17 -08:00
Mark Otto
d86e77a256
Merge branch 'master' of https://github.com/mshafrir/bootstrap into mshafrir-master
2012-02-01 23:12:06 -08:00
Mark Otto
8dd2b3d3f8
follow up to #1501 to update notes in sprites.less
2012-02-01 23:10:37 -08:00
Mark Otto
1ec6628e80
add note for icon class usage per #1501
2012-02-01 23:10:00 -08:00
Mark Otto
25ffe14c1b
add line item to docs on upgrading per #1488
2012-02-01 23:02:31 -08:00
Mark Otto
aa8a7668cb
Merge branch 'master' into 2.0.1-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-01 22:52:07 -08:00
Mark Otto
58fd0dea36
fixing some docs pages for i18n
2012-02-01 22:51:01 -08:00
Jacob Thornton
98d1659ef8
Merge pull request #1549 from TannerNMO/patch-1
...
Fixed simple grammatical errors.
2012-02-01 22:37:42 -08:00
Jacob Thornton
e26da36b9a
remove 2.0-wip ref
2012-02-01 22:30:51 -08:00
Mark Otto
43d797dfff
#1566 : add note about removal of secondary-nav in 2.0
2012-02-01 22:29:15 -08:00
Jacob Thornton
e1deb4e767
fix makefile to reset zips
2012-02-01 22:27:46 -08:00
Mark Otto
4211f21e39
#1571 : remove fixed width on file inputs
2012-02-01 22:27:11 -08:00
Jacob Thornton
6738042c61
rebuild with correct zip
2012-02-01 22:21:29 -08:00
Mark Otto
c1f0da7cce
Merge branch 'master' of github.com:twitter/bootstrap
2012-02-01 22:13:26 -08:00
Mark Otto
cc8a8df125
Merge pull request #1576 from ejain/patch-1
...
Import the responsive css *after* setting the body padding to fix...
2012-02-01 22:13:07 -08:00
ejain
1b8863f925
Import the responsive css *after* setting the body padding to fix the issue described in #1570 .
2012-02-01 21:17:04 -08:00
Cary Landholt
c3c13a2474
Fixed typo "tabs" ==> "button"
2012-02-01 22:20:24 -06:00
Mark Otto
f34ddb5c3f
nuke all curly ticks
2012-02-01 18:27:38 -08:00
Mark Otto
94c2c70e6e
fix spelling in examples page
2012-02-01 18:25:34 -08:00
Mark Otto
54bfdf1183
fix the makefile
2012-02-01 18:24:41 -08:00
Mark Otto
8a1769c9e2
fix missing ; in buttons.less
2012-02-01 18:18:39 -08:00
Mark Otto
f2d3026de8
update scaffolding responsive section to reflect proper media query ranges
2012-02-01 18:12:14 -08:00
Mark Otto
1ebe51c834
fix mis-labeled label
2012-02-01 18:11:19 -08:00
Mark Otto
4d918beb26
fix js links in components
2012-02-01 18:06:52 -08:00
Mark Otto
2e1649410c
remove twitter widgets js from examples
2012-02-01 18:00:40 -08:00
Mark Otto
e36496fd84
Merge pull request #1490 from amenonsen/master
...
Typo fix: Sprited => Striped
2012-02-01 17:59:19 -08:00
Mark Otto
3ea3950225
fix icon-bar class in exampless
2012-02-01 17:57:39 -08:00
Mark Otto
2fd6a2e9f6
remove excess td in less docs
2012-02-01 17:55:32 -08:00
Mark Otto
3a2f0765bf
fix hover state on .nav-list for active links
2012-02-01 17:54:21 -08:00
Mark Otto
73238701bd
fixing jquery links in examples
2012-02-01 17:41:24 -08:00
Mark Otto
5c1527abc5
remove unused css files and add scaffolding and hero-unit to the builder
2012-02-01 17:06:40 -08:00
Mark Otto
f166c5a35b
Merge branch 'master' of github.com:twitter/bootstrap
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-01 16:45:25 -08:00
Mark Otto
9b9e1d309b
fix that jank hack
2012-02-01 16:44:07 -08:00
Jacob Thornton
87df230408
rebuild
2012-02-01 16:39:15 -08:00
Jacob Thornton
59016d2198
only add the anyalytics to production
2012-02-01 16:38:58 -08:00
TannerNMO
11319f6da9
Fixed simple grammatical errors. http://grammar.quickanddirtytips.com/backward-versus-backwards.aspx
2012-02-01 14:14:49 -07:00
eirikb
12ed7a2b33
Removed / from 'Get the javascript' in components.mustache
2012-02-01 19:44:33 +01:00
eirikb
981cbfb4fa
Removed extra / from 'Get the javascript'-link in components.html
2012-02-01 19:40:10 +01:00
Michael Shafrir
b96e80cf39
Fix broken named anchor link for LESS compiling instructions.
2012-02-01 09:58:08 -08:00
Jari Jokinen
a486a6f20b
Allow labels to be links
2012-02-01 12:59:38 +02:00
Abhijit Menon-Sen
140d90db63
Typo fix
2012-02-01 13:21:37 +05:30
Mark Otto
7f32d15fbb
fix links and rebuild
2012-01-31 19:32:42 -08:00
Jacob Thornton
fd49d4a44f
move examples into docs...
2012-01-31 17:35:23 -08:00
Jacob Thornton
bdfb05dbac
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 17:27:01 -08:00
Mark Otto
c8fad25902
update upgrade page
2012-01-31 17:24:20 -08:00
Jacob Thornton
cabba91c7c
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 14:38:06 -08:00
Mark Otto
c84b5cf5f5
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 14:30:07 -08:00
Mark Otto
6cf79a5b8e
remove unused examples, update examples docs page, add starter template to examples, remove warning alert banner, add screenshots
2012-01-31 14:29:44 -08:00
Jacob Thornton
334e5f25c4
Merge branch '2.0-wip'
2012-01-31 14:11:45 -08:00
Jacob Thornton
80a752f525
add makefile to make it easier to publish to gh-pages...
2012-01-31 14:05:30 -08:00
Mark Otto
013de18e6b
remove warning alert on less docs
2012-01-31 14:00:26 -08:00
Jacob Thornton
fd700e358d
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 13:59:40 -08:00
Jacob Thornton
e75bc5eb5f
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 13:59:08 -08:00
Jacob Thornton
390a9af936
move js stuff into assets
2012-01-31 13:58:28 -08:00
Mark Otto
aec0cb3303
fix broken nav on less page
2012-01-31 13:57:43 -08:00
Jacob Thornton
b9de88890e
Merge branch '2.0-wip'
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-31 13:23:29 -08:00
Jacob Thornton
0bfbe5058d
Merge branch '2.0-wip'
...
Conflicts:
.gitignore
LICENSE
Makefile
bootstrap.css
bootstrap.min.css
docs/assets/js/application.js
docs/assets/js/google-code-prettify/prettify.css
docs/index.html
docs/javascript.html
examples/container-app.html
examples/fluid.html
examples/hero.html
js/bootstrap-alerts.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tabs.js
js/bootstrap-twipsy.js
js/tests/index.html
js/tests/unit/bootstrap-modal.js
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-tabs.js
lib/forms.less
lib/mixins.less
lib/patterns.less
lib/scaffolding.less
lib/tables.less
2012-01-31 13:18:34 -08:00
Mark Otto
cfc1c8a8cd
clean up responsive media queries and docs css
2012-01-31 13:16:11 -08:00
Mark Otto
09b9b8a586
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-31 09:40:11 -08:00
Mark Otto
4bd1ba4e0d
Merge pull request #1459 from nkryptic/add-help-text
...
[2.0-wip] Add form help text information to docs
2012-01-31 09:39:59 -08:00
Mark Otto
9cfae03fd4
fix typo in base css docs
2012-01-31 09:37:44 -08:00
Mark Otto
cc5415b889
fix js docs typo
2012-01-31 09:37:14 -08:00
nkryptic
d70ba6c5e6
add form help-* documentation
2012-01-31 03:54:07 -05:00
Mark Otto
a6253f0937
fix disabled button docs
2012-01-31 00:15:43 -08:00
Mark Otto
bd9221ddc0
Merge pull request #1457 from nkryptic/2.0-wip
...
[2.0-wip] added missing nav- prefixes to docs
2012-01-31 00:12:34 -08:00
Mark Otto
b7713b83fa
chance icon class
2012-01-31 00:11:19 -08:00
nkryptic
d633dbb44e
add nav- prefix to rest of docs
2012-01-31 02:54:10 -05:00
Mark Otto
4d93b63916
disable cursor on disabled and active pagination links
2012-01-30 23:27:58 -08:00
Mark Otto
d533310bd2
once more, overhaul the icons and use the css regex selector on our icons
2012-01-30 23:24:35 -08:00
Mark Otto
de994efac7
fix the other disabled button style
2012-01-30 23:17:05 -08:00
Mark Otto
5c9a687665
fix button styles on active and disabled
2012-01-30 23:16:27 -08:00
Mark Otto
61b47e91b8
update layout docs
2012-01-30 23:10:29 -08:00
Mark Otto
1cff29c33f
restore a few commented out responsive items
2012-01-30 23:02:24 -08:00
Mark Otto
47a68ae3aa
update icons everywhere to be scoped per other components, fix broken elements on js docs page
2012-01-30 22:57:00 -08:00
Mark Otto
31911659a2
refactor the navs to use prefixed classes, because you know, consistency is beast mode
2012-01-30 21:29:50 -08:00
Mark Otto
0f3a073b8d
*really* refactor the buttons and update them all over the docs
2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe
refactor buttons.less
2012-01-30 20:50:51 -08:00
Jacob Thornton
155047c3e6
speed up topbar animation for responsive
2012-01-30 13:59:05 -08:00
Mark Otto
74f2a89611
fix wrong value in grid column width in download page
2012-01-30 10:01:02 -08:00
Mark Otto
e94e0f1cf9
implement @textColor for body text
2012-01-30 09:41:31 -08:00
Mark Otto
ac581eebac
large carousel images and margin bottom added
2012-01-30 09:19:25 -08:00
Mark Otto
774904464d
fix docs: move .pull-left from search input to search form in navbar
2012-01-30 08:58:40 -08:00
Mark Otto
3722c34b50
account for floated inputs in the .navbar-form
2012-01-30 08:20:37 -08:00
Mark Otto
2d40b07afc
adding warning (orange) button, fix responsive navbar problem
2012-01-30 08:15:28 -08:00
Mark Otto
a29dee44ac
remove all new dropdown button stuff
2012-01-30 08:04:48 -08:00
Mark Otto
a8400009da
testing out button dropdown group
2012-01-30 07:59:24 -08:00
Mark Otto
2c8ca4f5e2
add skew mixin
2012-01-30 07:54:47 -08:00
Mark Otto
9f5b619094
add in regular button dropdowns, rejigger the button dropdowns section to reflect change
2012-01-30 07:49:28 -08:00
Mark Otto
9ba70796e2
remove top 5px padding from first inline radio/checkbox
2012-01-30 07:40:24 -08:00
Mark Otto
33a969dd0c
update vars in less and download pages
2012-01-30 01:34:59 -08:00
Mark Otto
160a0bf560
update tests for popover to use proper classes
2012-01-30 01:30:18 -08:00
Mark Otto
175fd98a7c
fix forms typo on error state
2012-01-30 01:25:02 -08:00
Mark Otto
144789788f
updated upgrade page to reflect popover changes
2012-01-30 01:24:02 -08:00
Mark Otto
f4e5bc1c53
namespace popover values
2012-01-30 01:20:51 -08:00
Mark Otto
db31efb995
scope .content in container example
2012-01-30 01:18:45 -08:00
Mark Otto
8f448610a9
rename vertical-divider to divider-vertical, add more space around the divider
2012-01-30 01:09:34 -08:00
Mark Otto
8b77722a93
update reverse fluid layout to mirror the fluid layout
2012-01-30 01:06:20 -08:00
Mark Otto
dc3d2b1044
update js docs page to clarify usage of images on carousel
2012-01-30 00:44:27 -08:00
Mark Otto
0f088af855
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
less/responsive.less
2012-01-30 00:43:57 -08:00
Mark Otto
ae7f94eeff
overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts
2012-01-30 00:39:44 -08:00
Jacob Thornton
734bfe7f78
Merge pull request #1421 from MarkReeder/2.0-wip
...
Fixes Opera flickering on the collapse plugin when reset is called without specifying the size
2012-01-29 23:40:34 -08:00
Mark Reeder
f9b53d424e
Fixes issue with Opera flickering on the collapse plugin when reset is called without specifying the size
...
https://github.com/twitter/bootstrap/issues/1208
2012-01-29 21:14:07 -08:00
Jacob Thornton
0de951f4f4
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 19:07:14 -08:00
Jacob Thornton
fae04c8ac1
add license for responsive and rebuild
2012-01-29 19:04:26 -08:00
Mark Otto
2ba1b01f8d
subnav adjustments
2012-01-29 17:03:05 -08:00
Mark Otto
fda77e69eb
move vars and mixins for default grid back to appropriate files
2012-01-29 16:58:51 -08:00
Mark Otto
b078050702
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 16:55:56 -08:00
Mark Otto
0301d469e8
remove .collapse from navbar responsive docs
2012-01-29 16:54:51 -08:00
Jacob Thornton
90f2e8e196
rebuild zip
2012-01-29 16:46:40 -08:00
Mark Otto
882bb9dbd3
reran make
2012-01-29 16:43:03 -08:00
Mark Otto
b0976bb379
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 16:42:37 -08:00
Mark Otto
702d3b6dfe
fix broken navbar collapse
2012-01-29 16:35:55 -08:00
Jacob Thornton
298e637d00
remove dist dir
2012-01-29 16:33:29 -08:00
Jacob Thornton
f622822459
check in dist dir for hb5 + update images to point to correct spot for builder
2012-01-29 16:19:41 -08:00
Burak Tuyan
19b70dc414
Fixing the Docs for Tabs dropups
...
New example caused an overflowing issue at the Tabs dropdowns documentation, this is a quick fix to get rid of this issue.
2012-01-30 01:22:10 +02:00
Burak Tuyan
97b3057824
Extending the dropup support to tabs and pills
...
This was needed to match the color of the carets that are used for tabs and pills
2012-01-30 01:13:21 +02:00
Burak Tuyan
918a17a30b
Adding dropup support to split buttons and navbar
...
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
2012-01-30 00:50:47 +02:00
Mark Otto
d637db1a23
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-29 14:23:06 -08:00
Mark Otto
e493f7fc19
update navbar collapse everywhere and remake
2012-01-29 14:22:51 -08:00
Mark Otto
9e7f5025b4
update collapsible nav in navbar
2012-01-29 14:07:58 -08:00
Mark Otto
7095d181dc
Merge pull request #1404 from ChadMoran/patch-1
...
warningText and warningBackground docs fix
2012-01-29 13:29:50 -08:00
Mark Otto
391661f14b
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-29 13:25:36 -08:00
Mark Otto
278858e706
fix form styles on prepend/append for consistency, update code docs with examples of the code snippets
2012-01-29 13:25:13 -08:00
Chad Moran
2696c6a4bd
Fixed @warningText and @warningBackground colors in docs
2012-01-29 13:20:39 -08:00
Jacob Thornton
910e78d26a
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-29 13:16:02 -08:00
Mark Otto
9fa8bde44d
fix animated/striped gradients in progress bars
2012-01-29 13:15:38 -08:00
Jacob Thornton
49d565a6da
move building zip file into docs/makefile
2012-01-29 13:15:37 -08:00
Mark Otto
4e5b0e185e
refined pager styles to give a border on the links and improved hover state
2012-01-29 13:12:13 -08:00
Mark Otto
8c763589a2
update text on icons note
2012-01-29 13:09:10 -08:00
Mark Otto
0952f3796e
fix js readme api capitalization
2012-01-29 13:07:31 -08:00
Mark Otto
48529ad01f
last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now
2012-01-29 13:06:57 -08:00
Mark Otto
059ff6bcbd
update hero example and examples overview
2012-01-29 02:27:45 -08:00
Mark Otto
7bf2767452
remove form docs from the styles and markup, it's no longer needed
2012-01-29 00:07:01 -08:00
Mark Otto
15a1c0ce79
add swatches to the color variables in less docs page
2012-01-28 23:58:39 -08:00
Mark Otto
f9e01e2258
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 23:41:18 -08:00
Mark Otto
bca269299b
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section
2012-01-28 23:40:52 -08:00
Mark Otto
5e658afb2b
Merge pull request #1367 from lukeman/update-example-layouts
...
[2.0-wip] update example layouts
2012-01-28 23:29:10 -08:00
Luke Hatcher
af9de238fd
update all example pages to latest version
2012-01-29 01:48:51 -05:00
Mark Otto
62f4a1571a
revamped the thumbnails examples to make them work and look better at higher resolution
2012-01-28 22:48:25 -08:00
Mark Otto
487dbfdda4
namespace progress bars and labels classes
2012-01-28 22:14:51 -08:00
Mark Otto
59d9983ebc
updates to responsive and docs for responsive navbar
2012-01-28 22:03:14 -08:00
Mark Otto
f1e520badd
clarify and tweak media queries
2012-01-28 20:34:07 -08:00
Mark Otto
5f314dcb85
remove benefits from homepage html
2012-01-28 20:27:18 -08:00
Mark Otto
3e462f1fb2
update docs to simplify some css
2012-01-28 20:26:27 -08:00
Mark Otto
cf1b46bda4
fix alert close position
2012-01-28 18:46:41 -08:00
Mark Otto
99ac6ca08e
update components page to include docs for the new navbar collapse feature, re-add responsive.less to downloader
2012-01-28 18:39:36 -08:00
Mark Otto
e17c9249d2
fix dropdowns in subnav
2012-01-28 18:27:09 -08:00
Mark Otto
e532228721
more responsive tweaks for tablet
2012-01-28 18:25:05 -08:00
Mark Otto
4fa931e403
fix the navbar click and a few jank responsive problems
2012-01-28 18:11:31 -08:00
Mark Otto
06df91ac55
remove background from accordion, and use border instead
2012-01-28 16:48:03 -08:00
Mark Otto
475b985a0e
remove padding from first-child of inline radios/checkboxes
2012-01-28 16:37:43 -08:00
Jacob Thornton
22d52fca46
fix goign between small view large view with responsive collapse
2012-01-28 16:21:55 -08:00
Jacob Thornton
b8a683d7f2
turn off brand hover for now + get nav toggling in mobile
2012-01-28 15:42:07 -08:00
Jacob Thornton
ea1c21d62d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 15:15:38 -08:00
Jacob Thornton
6493cd22c0
blah
2012-01-28 15:14:57 -08:00
Mark Otto
23e076c1bb
add in a navbar button for toggling the nav items
2012-01-28 15:09:23 -08:00
Mark Otto
dc74530fba
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 14:51:14 -08:00
Mark Otto
7843a665fd
vertical align inline checkboxes/radios to improve rendering in topbar
2012-01-28 14:50:56 -08:00
Jacob Thornton
29b1e86bf9
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 14:48:20 -08:00
Jacob Thornton
616cbf93d2
remove uglify variable from makefile
2012-01-28 14:47:59 -08:00
Mark Otto
9db4f2a344
change .span* inputs to use content-sizing: border-box; to make them behave as block level elements
2012-01-28 14:30:45 -08:00
Mark Otto
d96c0c781d
comment for progress bars firefox keyframes
2012-01-28 14:20:27 -08:00
Mark Otto
ab20c921df
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 13:30:34 -08:00
Mark Otto
fe6d2f2e1d
fix tabs-below typo
2012-01-28 13:30:15 -08:00
Jacob Thornton
b38a13ef98
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 13:17:07 -08:00
Jacob Thornton
6935f693b3
typahead does case insensitive matching with simple sorter + accepts highlighter option
2012-01-28 13:16:05 -08:00
Mark Otto
1a22c3b30a
restore IE filters, but reset them on buttons
2012-01-28 13:13:01 -08:00
Mark Otto
296d06a285
add checkbox/radio border for ios in responsive
2012-01-28 13:07:01 -08:00
Mark Otto
70c6a6cd85
fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices
2012-01-28 12:58:26 -08:00
Mark Otto
b77161f864
reset border-radius only for ie9?
2012-01-28 12:49:26 -08:00
Mark Otto
698d4b414c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 12:43:45 -08:00
Mark Otto
2bfda031ce
darken buttons, uncomment out firefox keyframes from progress bars
2012-01-28 12:43:19 -08:00
Jacob Thornton
f768242759
add trailing ;
2012-01-28 12:14:41 -08:00
Jacob Thornton
e1a1fdd35d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 12:09:16 -08:00
Jacob Thornton
12d3c2fe74
fix z-index issue with modals for popovers,tooltips,and dropdowns
2012-01-28 12:08:41 -08:00
Mark Otto
39f70afed9
update mixins to fix radial gradient
2012-01-28 12:03:26 -08:00
Mark Otto
f1dc214977
increase padding on modal-header after decreasing h3 line-height
2012-01-28 11:24:34 -08:00
Mark Otto
2452768259
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 11:22:07 -08:00
Mark Otto
28ba9d69c8
nav, buttons, and docs updates to account for outline: 0; on :active
2012-01-28 11:21:39 -08:00
Jacob Thornton
c2c02d104c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 11:04:05 -08:00
Jacob Thornton
d465952138
clean up js api for dropdowns
2012-01-28 11:03:39 -08:00
Jacob Thornton
e7e8db966e
Merge pull request #1339 from lookfirst/nodebug
...
2.0-wip: no debugger
2012-01-28 10:47:22 -08:00
Jon Stevens
8ade6989c3
no debugger
2012-01-28 02:25:13 -08:00
Jacob Thornton
ab8f4a394c
remove js for table sorts
2012-01-28 01:48:45 -08:00
Jacob Thornton
68fa1e4826
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 01:35:36 -08:00
Jacob Thornton
e61164e67a
all unit tests passing in ie7
2012-01-28 01:35:13 -08:00
Mark Otto
d65ce1b64c
updated upgrading page
2012-01-28 01:34:07 -08:00
Jacob Thornton
81c128fd0b
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 00:46:21 -08:00
Jacob Thornton
09df780b75
clean up application js a bit
2012-01-28 00:46:04 -08:00
Mark Otto
f1851ab133
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations
2012-01-28 00:43:25 -08:00
Mark Otto
edee985b96
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 00:39:34 -08:00
Mark Otto
967030cb53
modal refinements in docs and general responsiveness
2012-01-28 00:39:22 -08:00
Jacob Thornton
7ffec335ca
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 00:37:12 -08:00
Jacob Thornton
4737d693e0
remove quick start section to simplify landing page + start rewriting application js to work ie7
2012-01-28 00:36:37 -08:00
Mark Otto
18d95a163b
remove fixed width from labels table
2012-01-28 00:34:54 -08:00
Mark Otto
cc01d3c367
extend block level smalls to h2s in docs
2012-01-28 00:31:55 -08:00
Mark Otto
342a99f1d0
block level page-header h1 small for readability on 480px and under
2012-01-28 00:29:38 -08:00
Mark Otto
963e5e0eda
scope subnav link styles to first child, and no dropdowns
2012-01-28 00:27:49 -08:00
Mark Otto
873be0e4f2
drop span2-4 on form examples to 1-3
2012-01-28 00:25:54 -08:00
Mark Otto
1453ea4bf7
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 00:23:44 -08:00
Mark Otto
d448e6921e
rewrite the code section of the type docs
2012-01-28 00:23:30 -08:00
Jacob Thornton
4a7d8de204
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 00:04:06 -08:00
Jacob Thornton
3451dcbc28
fix failing typeahead tests
2012-01-28 00:03:26 -08:00
Mark Otto
ce69b70719
give append/prepend inputs higher z-index on focus
2012-01-27 23:53:56 -08:00
Mark Otto
08fea7587c
call attention to notices in js docs more
2012-01-27 23:27:33 -08:00
Mark Otto
7a756168b5
fix regression in textarea shadows
2012-01-27 22:56:48 -08:00
Mark Otto
1d44f37fc9
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-27 22:52:56 -08:00
Mark Otto
cb8606f2c8
adding wells and close icon to the docs under misc in components, with a new subnav style
2012-01-27 22:52:45 -08:00
Jacob Thornton
7cbb586825
move the matcher and sorter into the options - encourage people to override them...
2012-01-27 22:27:06 -08:00
Jacob Thornton
e726b231ba
add toggle to docs for popover/tooltip
2012-01-27 21:59:06 -08:00
Jacob Thornton
1e07c066a5
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-27 21:37:59 -08:00
Jacob Thornton
0255f47eb3
add zindex option for tooltips/popovers and fix modal zindex doc example
2012-01-27 21:36:58 -08:00
Mark Otto
ad78caa726
fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment
2012-01-27 21:25:35 -08:00
Mark Otto
78120edf72
add clearfix to control-group for longer labels and any other unforeseen circumstances
2012-01-27 21:20:58 -08:00
Mark Otto
d0447e9aa5
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 21:09:24 -08:00
Mark Otto
3934d1b6c4
rgba text color on active buttons for a bit more contrast from their non-active siblings
2012-01-27 21:08:04 -08:00
Jacob Thornton
15d3a4797f
simplify build process more - remove really annoying date.
2012-01-27 21:06:09 -08:00
Mark Otto
4e191c423d
update progress bars to have a solid edge until 100% filled
2012-01-27 20:17:03 -08:00
Mark Otto
9800196bf7
use quotes on attr selectors more consistently
2012-01-27 20:05:03 -08:00
Mark Otto
0fa6422918
icon spacing in small buttons and nav lists
2012-01-27 19:57:53 -08:00
Mark Otto
d02c6957d4
fixing up buttons and examples of implementing icons
2012-01-27 19:49:56 -08:00
Mark Otto
a624ac1edf
Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons
2012-01-27 19:12:09 -08:00
Mark Otto
7fc6e12b79
comment icons that are 1px off
2012-01-27 18:49:00 -08:00
Mark Otto
aaa530c27e
combined .disabled and [disabled] and confirmed in ie7/8
2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063
new tab focus style and mixin
2012-01-27 18:33:25 -08:00
Mark Otto
997fc33af9
clean up use of mixins to highlight them appropriately in your fav editor
2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963
overhaul navbar behavior in responsive css
2012-01-27 16:26:55 -08:00
Burak Tuyan
a2a10ae421
Adding new examples to the icons' docs.
...
- Button with dropdown menu.
- Small info button.
- Text alignment for navigation with no icon.
- Text input form with prepended icon
- Select input form with prepended icon
2012-01-28 02:13:53 +02:00
Mark Otto
800d0b24e0
remove page-header from docs and add to type.less
2012-01-27 15:28:09 -08:00
Mark Otto
91e9f6fa91
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 14:49:02 -08:00
Mark Otto
22359f9dfd
update examples and restore icons
2012-01-27 14:48:35 -08:00
Jacob Thornton
065ed01b1f
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 14:44:58 -08:00
Jacob Thornton
748696a553
add missing paren
2012-01-27 14:44:05 -08:00
Jacob Thornton
8a2124faff
only build mustache files
2012-01-27 14:43:41 -08:00
Mark Otto
003da1e089
fix inputs in navbar
2012-01-27 14:21:17 -08:00
Mark Otto
6353e5070a
remove unused images from docs assets
2012-01-27 14:03:36 -08:00
Mark Otto
3807a88ee9
update the docs for icons
2012-01-27 13:56:50 -08:00
Mark Otto
8da1c176ec
Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip
2012-01-27 13:43:51 -08:00
Mark Otto
335a8686da
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6
Rebuild css and html
2012-01-27 16:39:38 -05:00
Pete Hopkins
1c9db106fa
Moves buttonBackground to mixins (issue 1292)
2012-01-27 16:39:27 -05:00
Mark Otto
b1f38bbea8
update icon examples to show icons in differently sized buttons
2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0
rebuil update layout
2012-01-27 13:36:31 -08:00
Mark Otto
d7b8a9c930
align text in buttons so folks can easily make them different widths
2012-01-27 13:36:08 -08:00
Pete Hopkins
a1fc352cc2
Changes non-transparent navbar search box color to match transparent one better
2012-01-27 16:35:40 -05:00
Mark Otto
a0b40b361a
i18n download page
2012-01-27 13:35:25 -08:00
Pete Hopkins
faa719d59c
Fixes left/right border overlap for IE7
2012-01-27 16:35:21 -05:00
Mark Otto
ccd963e622
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
2012-01-27 13:21:01 -08:00
Mark Otto
e8647c1b11
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff
2012-01-27 13:20:02 -08:00
Pete Hopkins
8328987b15
IE7 fixes for split buttons and dropdowns
2012-01-27 16:10:40 -05:00
Pete Hopkins
347a15b69a
Cleans up IE7 inline margins for buttons and adds them for sprites, also fixes button padding for large/small sizes
2012-01-27 16:10:40 -05:00
Pete Hopkins
43f1a42f7f
Adds necessary ie7-inline-block macros
2012-01-27 16:10:34 -05:00
Pete Hopkins
7b31f4a334
Brings back uneditable input
2012-01-27 16:09:58 -05:00
Pete Hopkins
70d95b1bd7
Moves IE7-specific button padding to only apply to form controls
2012-01-27 16:09:58 -05:00
Jacob Thornton
3b3dbd7229
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Burak Tuyan
16a28d881c
Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip
2012-01-27 20:48:37 +02:00
Mark Otto
97546adc90
Merge branch 'ie_7_base' of https://github.com/phopkins/bootstrap into phopkins-ie_7_base
2012-01-27 09:40:04 -08:00
Mark Otto
e44a7dd4ff
buttons for toggle links in js docs, code example for offsetting in grid
2012-01-27 09:36:49 -08:00
Pete Hopkins
f51e703ba6
Rebuild bootstrap.css
2012-01-27 12:16:36 -05:00
Pete Hopkins
526d388393
Compensates for IE7 first-child-input-inheriting-hasLayout-parents-margins bug for appended text form element
2012-01-27 12:16:17 -05:00
Pete Hopkins
841e386daf
Fixes up internal and external spacing for IE7 buttons
2012-01-27 12:08:56 -05:00
Pete Hopkins
6075b5dee6
Collapses borders for IE7, which doesn't respect border-spacing
2012-01-27 12:08:56 -05:00
Mark Otto
9d0328ff00
adding outline callout as a fallback for IE--needs testing though, thought I already added this
2012-01-27 08:21:39 -08:00
Burak Tuyan
acaa3b5977
Changing the color of the default icons from black ( #000 ) to grayDark ( #333 )
2012-01-27 18:02:57 +02:00
Burak Tuyan
942d1b4595
Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like:
...
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
2012-01-27 16:33:18 +02:00
Jacob Thornton
aa594501bd
change typeahead to data-source instead of data-data and add to docs
2012-01-26 23:16:02 -08:00
Jacob Thornton
11d7ef1515
Merge pull request #1272 from napoleond/2.0-wip
...
Support tab and enter in typeahead
2012-01-26 23:04:42 -08:00
Jacob Thornton
c63175dc1d
change endpoint to point to actual server...
2012-01-26 22:52:44 -08:00
Jacob Thornton
815a2ae9f2
rebuild + copy images to docs when making
2012-01-26 22:39:17 -08:00
Jacob Thornton
a25f0cce95
simplify readme
2012-01-26 22:11:32 -08:00
Jacob Thornton
ed64276e5b
move doc building into base make method + build bootstrap to doc assets
2012-01-26 22:05:45 -08:00
Jacob Thornton
dc2deb9a1b
moving structure around + more work on builder...
2012-01-26 21:48:46 -08:00
Jacob Thornton
e0e54d9c6c
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-26 20:23:28 -08:00
Jacob Thornton
1e9c2fb9d4
getting closer....
2012-01-26 20:23:15 -08:00
Mark Otto
576ae2f561
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-26 19:10:32 -08:00
Mark Otto
7a3d04d5be
scope icons to .icon
2012-01-26 19:10:09 -08:00
Mark Otto
a4a8ea2328
flip order of content on home page
2012-01-26 19:09:59 -08:00
Mark Otto
824eaff1d8
Merge pull request #1280 from mistermarco/2.0-wip
...
Fix typo in docs/scaffolding.html and mustache template in 2.0 wip
2012-01-26 19:04:22 -08:00
Marco Wise
6886022fe6
fix typo in docs/scaffolding.html
2012-01-26 18:10:36 -08:00
Mark Otto
5a48b22b83
Merge pull request #1269 from phopkins/ie_typeahead
...
[2.0-wip] Fix typehead plugin for IE7/8
2012-01-26 17:04:35 -08:00
Mark Otto
c8d2c4e442
fix height of download button
2012-01-26 16:45:01 -08:00
Jacob Thornton
12484a7471
more builder crap
2012-01-26 16:41:28 -08:00
Mark Otto
e7bc2063be
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-26 16:31:10 -08:00
Mark Otto
7d292f5acc
Merge pull request #1274 from linrock/patch-2
...
[2.0 wip] Bring back the hero unit css. Fixes #1185 .
2012-01-26 16:27:50 -08:00
Mark Otto
af96da6e89
adding white sprites
2012-01-26 16:27:37 -08:00
Jacob Thornton
c31ac846d7
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-26 16:12:51 -08:00
Jacob Thornton
d531f72645
some js for javascript for builder (stil incomplete)
2012-01-26 16:12:34 -08:00
Mark Otto
b260544de0
fix links to apple touch icons
2012-01-26 15:54:04 -08:00
Linmiao Xu
ef4e3bc0f7
Move hero-unit css out of pattern.less and include it. Fixes #1185 .
2012-01-26 15:51:11 -08:00
Mark Otto
d8e1001836
fix legend margin collapse
2012-01-26 15:39:37 -08:00
Mark Otto
2d67c34084
Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment
...
Conflicts:
bootstrap.css
bootstrap.min.css
2012-01-26 15:25:19 -08:00
David N
b9589fcb80
Enable default browser key behaviour when typeahead isn't showing.
2012-01-26 17:23:09 -06:00
Mark Otto
f398926e46
move down background iamge
2012-01-26 15:22:52 -08:00
Mark Otto
95356ee062
make css after merge
2012-01-26 15:04:36 -08:00
Mark Otto
32e57efd1f
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-26 15:04:13 -08:00
Mark Otto
40b4793dea
Merge pull request #1271 from linrock/patch-1
...
Fix icon margins in large buttons.
2012-01-26 15:03:53 -08:00
Mark Otto
5844aa550d
consistent new lines at ends of files
2012-01-26 15:00:59 -08:00
Mark Otto
945870d778
small text change on downloads page
2012-01-26 14:54:24 -08:00
Mark Otto
f82db4b95b
separate code from type css files
2012-01-26 14:53:35 -08:00
Mark Otto
7a6737512a
break scaffolding down into smaller less files
2012-01-26 14:50:55 -08:00
Mark Otto
8a6be6601d
make accordion links block level
2012-01-26 14:40:19 -08:00
Mark Otto
43c8f41895
add values to inputs for grid variables on download page
2012-01-26 14:40:09 -08:00
Linmiao Xu
2aa99d17d5
Fix icon margin in large buttons.
2012-01-26 14:36:30 -08:00
Pete Hopkins
1f04481092
Switches from Array#filter to jQuery.grep for IE<=8 support
2012-01-26 17:07:06 -05:00
Mark Otto
78652a707f
allow icons in small buttons
2012-01-26 13:51:12 -08:00
Pete Hopkins
721b8a1078
rebuild *.css
2012-01-26 16:15:09 -05:00
Pete Hopkins
b9413460af
Makes inputs and buttons align middle so they line up in all browsers
2012-01-26 16:14:54 -05:00
Pete Hopkins
f76444c858
Clears border-radius on checkboxes because they look bad on IE
2012-01-26 16:04:24 -05:00
Pete Hopkins
c13de3db60
Fixes off-by-1px between checkbox and form label (all browsers)
2012-01-26 16:04:24 -05:00
Mark Otto
b7f22e27ec
more docs homepage adjustments
2012-01-26 11:47:40 -08:00
Mark Otto
9c1ec6fb98
updated homepage docs to distill strapline
2012-01-26 11:40:29 -08:00
Mark Otto
358e3a53f7
Merge branch 'phopkins-ie_buttons' into 2.0-wip
2012-01-26 11:10:16 -08:00
Mark Otto
edef89f30e
move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9
2012-01-26 11:10:07 -08:00
Mark Otto
dd9a0a3f16
Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons
2012-01-26 10:55:26 -08:00
Pete Hopkins
62b2fdc4de
Rebuild *.css
2012-01-26 13:51:29 -05:00
Pete Hopkins
cd907067b8
Fixes background color for disabled buttons to match pre-IE fix (which prevents hover effects)
2012-01-26 13:51:03 -05:00
Mark Otto
b8c1950cbf
change label fo first subnav link on js docs
2012-01-26 10:43:08 -08:00
Mark Otto
34488a4500
fix tabs example on js docs page
2012-01-26 10:39:07 -08:00
Pete Hopkins
86e0e89ee8
More *.css building
2012-01-26 13:26:28 -05:00
Pete Hopkins
7117db499f
Makes default button the tiniest bit of gray for IE<=9
2012-01-26 13:26:14 -05:00
Mark Otto
5d465fab4c
Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons
2012-01-26 10:12:50 -08:00
Mark Otto
ef4d0dd7db
space out masthead a git more
2012-01-26 10:12:25 -08:00
Pete Hopkins
2c2f8ebe3a
Rebuild of *.css
2012-01-26 13:09:13 -05:00
Pete Hopkins
29f0e4c28b
Removes filters as a way to provide gradients for IE<=9
...
- Lets us use rounded corners in IE9
- Makes hover / active states work correctly in IE<=9
Only change for non-IE is that moving from hover -> not hovering
no longer animates (was a subtle blend) due to mismatch between the
bottom of the gradient and the background color.
Refactor: moves the primary button background to match the others.
2012-01-26 13:07:52 -05:00
Mark Otto
0ef4b6419f
overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable
2012-01-26 10:00:09 -08:00
Mark Otto
106625a2ec
fix small icons on homepage
2012-01-26 00:36:40 -08:00
Mark Otto
94ea3b62f0
fix forms examples and allow for inputs in labels
2012-01-25 21:28:24 -08:00
Mark Otto
b6b19866ac
remove some old -moz- prefixes from mixins while we're at it, dropping FF3.6 support
2012-01-25 20:32:19 -08:00
Mark Otto
af01d37ab9
Merge branch '2.0-wip' of https://github.com/kristerkari/bootstrap into kristerkari-2.0-wip
2012-01-25 20:13:52 -08:00
Mark Otto
ce467f7091
consistency in download page heading
2012-01-25 20:11:13 -08:00
Mark Otto
f62c9379fb
remove all tablesorter assets and css
2012-01-25 20:07:27 -08:00
Mark Otto
e877d125d7
fix button group shadows, update js docs to fix alert js file link
2012-01-25 20:02:32 -08:00
Mark Otto
0db2d45350
update mixins to use slightly diff variables within some parametric mixins
2012-01-25 15:04:41 -08:00
Mark Otto
b6b7d1343b
finish the rest of the less page mixins docs
2012-01-25 15:03:44 -08:00
Krister Kari
0777e391ee
Drop khtml gradient, shorten old webkit gradient
2012-01-26 01:03:36 +02:00
Mark Otto
7d83f45ebb
start filling out mixins tables
2012-01-25 14:08:51 -08:00
Mark Otto
7ca3b98d88
docs fixes
2012-01-25 13:56:44 -08:00
Mark Otto
4ea63e5261
finish off the static stuff for build and download page
2012-01-25 13:33:55 -08:00
Mark Otto
9c4a70c597
swap fieldsets for divs
2012-01-25 12:43:38 -08:00
Mark Otto
1c66779857
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-25 12:43:31 -08:00
Mark Otto
2b2c72b9aa
fix select alignment and height
2012-01-25 12:04:19 -08:00
Mark Otto
86191d898b
height auto on mutli select
2012-01-25 11:51:13 -08:00
Jacob Thornton
04f84997c1
rebuil
2012-01-25 11:49:34 -08:00
Jacob Thornton
3250ecc674
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-25 11:49:20 -08:00
Jacob Thornton
319b65e64b
prevent default
2012-01-25 11:49:00 -08:00
Mark Otto
06017b26ca
fix bottom visual bug on carousel images
2012-01-25 11:47:36 -08:00
Mark Otto
58d08a2db3
enable support for form states on select elements
2012-01-25 11:35:08 -08:00
Mark Otto
a4b8cc2a9c
darken active state on subnav with scrollspy added
2012-01-25 11:30:30 -08:00
Mark Otto
e24bd40b4a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-25 11:27:29 -08:00
Mark Otto
b851156863
change form fields back to inline-block to allow for inline-help text in default form markup
2012-01-25 11:26:45 -08:00
Jacob Thornton
25519bacd5
rebuild + add spy to template
2012-01-25 11:25:35 -08:00
Mark Otto
d3c5dd4e6a
updated comments in forms.less and added uneditable-textarea class to extend uneditable-input
2012-01-25 11:21:44 -08:00
Mark Otto
cfa925cab6
remake after merging large button group fix
2012-01-25 11:15:48 -08:00
Mark Otto
10cb7c02f9
Merge pull request #1135 from kevva/patch
...
2.0-wip: Remove specific top value from large btn-dropdown.
2012-01-25 11:15:17 -08:00
Mark Otto
fd3c6733a2
missing icon class in code example
2012-01-25 11:11:22 -08:00
Mark Otto
603aaa01ef
remake after updating variables from @lookfirst
2012-01-25 11:05:23 -08:00
Mark Otto
66f6535579
Merge pull request #1212 from lookfirst/white
...
2.0-wip: s/#fff/@white/
2012-01-25 11:04:35 -08:00
Jon Stevens
0b2dd16e72
missed a white
2012-01-25 11:02:28 -08:00
Jon Stevens
6cbf2f4024
s/#fff/@white/
2012-01-25 10:59:45 -08:00
Mark Otto
e49e49ff95
fix mention of old vertical forms class'
2012-01-25 10:51:26 -08:00
Mark Otto
97bad784b5
update remaining icons in docs
2012-01-25 10:50:08 -08:00
Mark Otto
4a3ad1aa89
update responsive to use latest grid mixins
2012-01-25 10:48:08 -08:00
Mark Otto
324ebb5990
spec'ed out an examples overview page with links to current examples; examples still need work themselves though
2012-01-25 10:47:08 -08:00
Mark Otto
1fa3eab20c
fix location of favicon
2012-01-25 10:19:29 -08:00
Mark Otto
9380ff8a06
clean up the updated container app layout a bit
2012-01-25 10:09:26 -08:00
Mark Otto
e93c536df1
Merge pull request #1196 from OpenGrid/2.0-wip
...
Fixed span sum to 10 to display properly. Grid has 12 columns.
2012-01-25 10:07:57 -08:00
Mark Otto
9553b1e3e9
update docs to include separate responsive css, update docs to highlight proper file name, updated makefile to build responsive separately
2012-01-25 10:02:52 -08:00
Mark Otto
c381199968
fix media queries in scaffolding
2012-01-25 09:57:40 -08:00
Mark Otto
29b4ba0fc5
fix modal examples on js page, update modal close button positioning
2012-01-25 09:53:53 -08:00
Mark Otto
b01de5fc56
updated icons to require a base class .icon
2012-01-25 09:51:03 -08:00
Mark Otto
d8041f7c8f
fix margin on input buttons in modals
2012-01-25 08:34:20 -08:00
Lech Wilczynski
2193866bf0
fixed columns to 7+3 for better proportions
2012-01-25 16:26:51 +01:00
Lech Wilczynski
eb3440b56a
fixed span sum to 10 to display properly. Grid has 12 columns.
2012-01-25 15:20:01 +01:00
Mark Otto
de4ada3b88
spec out all mixins on less page
2012-01-25 01:45:15 -08:00
Mark Otto
bd36e2a163
remove checkboxes from js docs page overview, they'll be on the download page instead
2012-01-25 01:25:15 -08:00
Mark Otto
f4f7296fa8
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/less.html
docs/templates/pages/less.mustache
2012-01-25 01:23:50 -08:00
Mark Otto
b8fa6cfacf
move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page
2012-01-25 01:22:29 -08:00
Mark Otto
c5103d0ad1
Merge pull request #1181 from jwieland/updatelessdoc
...
Minor doc changes about less.js version
2012-01-25 00:41:05 -08:00
Jason Wieland
64f85e0371
caught another old reference to 1.1.3
2012-01-25 00:02:37 -08:00
Mark Otto
b0fb31be5e
fix js link on chop shop
2012-01-24 23:45:48 -08:00
Mark Otto
ae70d2a8b6
refine spacing on fixed subnav
2012-01-24 23:44:59 -08:00
Mark Otto
e555f38ae4
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/less.html
2012-01-24 23:36:39 -08:00
Mark Otto
6ab56051fd
fix up docs css for responsive and subnav, fix forms error states
2012-01-24 23:35:34 -08:00
Jason Wieland
6be91368c0
minor doc updates to inform user they need the current less.js 1.2.1 or they will be hit by this bug #952
2012-01-24 23:24:46 -08:00
Jacob Thornton
5d3175e84b
fix sub navs fer the otherrzz
2012-01-24 22:48:30 -08:00
Jacob Thornton
5a54a98925
subnav spy scrolls blaawerh
2012-01-24 22:37:35 -08:00
Jacob Thornton
5e5e87fbd0
scrollspy working for sub navs
2012-01-24 22:33:33 -08:00
Mark Otto
f2fe2b1798
remove top margin from alert close, chance close line height to 18px (baseLineHeight)
2012-01-24 21:11:20 -08:00
Mark Otto
9602248ad5
Merge branch 'fix-alert-close-line-height' of https://github.com/pokonski/bootstrap into pokonski-fix-alert-close-line-height
2012-01-24 21:09:28 -08:00
Mark Otto
a5c1d1f182
adding actual images to carousel to ensure you can see things are animating; updated styles of carousel controls to work on light and dark backgrounds and use opacity for effects
2012-01-24 20:45:38 -08:00
Mark Otto
aa59f123c0
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 20:30:39 -08:00
Mark Otto
a03fbc18cb
allow for text in progress bars
2012-01-24 20:30:26 -08:00
Mark Otto
731821b78f
updated docs css to fix subnav on iOS
2012-01-24 20:26:54 -08:00
Mark Otto
8ce9b3a676
Merge pull request #1175 from Xaro/2.0-wip
...
Typo in pre type section
2012-01-24 20:16:33 -08:00
Roberto Poo
74b5dc8d3b
Fixed typo
2012-01-25 02:06:50 -02:00
Mark Otto
c1dd1f586d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 19:57:48 -08:00
Mark Otto
c6d5dcd872
remove link from transitions on js page
2012-01-24 19:50:18 -08:00
Mark Otto
da1906b037
Merge pull request #1140 from mchung/patch-1
...
Fixed typo in Makefile
2012-01-24 19:49:39 -08:00
Mark Otto
bacb05608f
redo the form examples to enable better responsive layout
2012-01-24 19:43:52 -08:00
Mark Otto
4a6d9106b8
fix the thumbnails more examples section
2012-01-24 19:36:42 -08:00
Mark Otto
672ba4c2fd
update the subnav on all pages
2012-01-24 19:19:50 -08:00
Mark Otto
f70895a605
remove rogue html elements
2012-01-24 19:01:38 -08:00
Mark Otto
8804860898
fix typo on js docs
2012-01-24 18:45:23 -08:00
Mark Otto
d362223535
refine fixed docs bar
2012-01-24 18:29:17 -08:00
Mark Otto
9ef4171d03
lighten alert on less page
2012-01-24 18:26:45 -08:00
Mark Otto
26ed8202ee
modify the scaffolding page to fix the language around preboot/grid variables
2012-01-24 18:24:38 -08:00
Mark Otto
4793a6f8fa
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 17:14:34 -08:00
Mark Otto
805a965f2e
finish updating form state and alert variables in less docs page
2012-01-24 17:14:19 -08:00
Jacob Thornton
a40d4993ed
make subnav fix
2012-01-24 17:13:02 -08:00
Mark Otto
40e92221a6
revamp alert message and error state color/text/bg to be variables
2012-01-24 16:54:35 -08:00
Mark Otto
c2312220e4
fix code type size
2012-01-24 16:19:01 -08:00
Mark Otto
b9bd5c65e7
fix mailto link
2012-01-24 16:18:12 -08:00
Mark Otto
7e6797880a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/index.html
docs/templates/pages/index.mustache
2012-01-24 16:09:32 -08:00
Mark Otto
03d2128f50
Merge pull request #1149 from Calvein/2.0-wip
...
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
2012-01-24 16:08:09 -08:00
Mark Otto
8ff621aa26
fix broken index page heading, update variables and less pages
2012-01-24 16:07:30 -08:00
Jacob Thornton
655a96869c
typo with i18n
2012-01-24 15:51:28 -08:00
Jacob Thornton
3a840075dd
rebuild
2012-01-24 15:42:16 -08:00
Jacob Thornton
4c5497bfcc
Merge pull request #1158 from pokonski/wrap-stuff
...
Wrap stuff in components.mustache
2012-01-24 15:03:30 -08:00
Piotrek Okoński
ef869776e5
Wrap stuff in components.mustache
2012-01-25 00:00:35 +01:00
Jacob Thornton
5f209ed810
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:33:52 -08:00
Jacob Thornton
fbc1ab14cc
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:31:10 -08:00
Mark Otto
58f7fd308a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/templates/pages/index.mustache
2012-01-24 14:28:14 -08:00
Mark Otto
fecd4ddd13
docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark
2012-01-24 14:25:30 -08:00
Gaëtan Muller
fea1dc906e
i18n for index page
2012-01-24 23:23:43 +01:00
Jacob Thornton
a800d6ceac
i18n index
2012-01-24 14:22:02 -08:00
Jacob Thornton
f4543ecb19
add i18n to upgrading
2012-01-24 14:14:01 -08:00
Jacob Thornton
8db0cc6fda
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-24 14:08:27 -08:00
Jacob Thornton
f03e170054
scaffolding i18n
2012-01-24 14:08:03 -08:00
Jacob Thornton
d80985443a
Merge pull request #1138 from lookfirst/fixjs
...
2.0-wip: Fixjs headers
2012-01-24 13:58:51 -08:00
Jacob Thornton
72117c3f97
add i18n for less.mustache
2012-01-24 13:57:44 -08:00
Jacob Thornton
3aea86370d
rebuild base-css
2012-01-24 13:48:05 -08:00
Jacob Thornton
9e7f4ebd77
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-24 13:47:41 -08:00
Jacob Thornton
7d52e1dcd4
remake
2012-01-24 13:47:24 -08:00
Jacob Thornton
b0a351d8f7
Merge pull request #1153 from MGaetan89/2.0-wip
...
#1122 - i18n in Base CSS documentation
2012-01-24 13:43:13 -08:00
Gaëtan Muller
425e5bfb71
Final translation tags in Base CSS
2012-01-24 22:17:32 +01:00
François Robichet
5fb31670af
Added jquery.tablesorter js file
2012-01-24 22:12:37 +01:00
François Robichet
925fef4110
Typo on tablesorter
2012-01-24 22:11:09 +01:00
François Robichet
540d229eba
Fixed a mailto typo
2012-01-24 21:57:30 +01:00
Mark Otto
3f54db9c6a
remake
2012-01-24 12:53:30 -08:00
Gaëtan Muller
a9c6dca094
More translation tags in Base CSS
2012-01-24 21:45:42 +01:00
Gaëtan Muller
bc9c89f157
Start adding tag for Base CSS translation
2012-01-24 21:29:55 +01:00
Mark Otto
f32866c2fc
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 12:28:37 -08:00
Mark Otto
e829001e5c
attempt to fix select list alignment in Firefox by removing padding. not quite fixed 100%, but getting there.
2012-01-24 12:28:20 -08:00
Jacob Thornton
b5503c4c28
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-24 12:11:26 -08:00
Jacob Thornton
222067b360
javascript pages markedup with {{_i}}
2012-01-24 12:11:05 -08:00
Marc Chung
54f04d3b13
Fixed typo in Makefile
2012-01-24 12:37:57 -07:00
Jon Stevens
84a8aa1bea
2.0-wip: fix js heads
2012-01-24 11:08:03 -08:00
Mark Otto
91780529d5
Merge pull request #1134 from trevyn/2.0-wip
...
overzealous 2011/2012 search/replace
2012-01-24 10:48:44 -08:00
Mark Otto
72861dfbf2
Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar
2012-01-24 10:45:51 -08:00
Mark Otto
b0bd1d8203
add bottom-up styles to the dropdown menus
2012-01-24 10:45:29 -08:00
Mark Otto
7d2e13f1b4
remake css
2012-01-24 10:43:13 -08:00
Mark Otto
43cbc94404
Merge pull request #1131 from XORwell/master
...
Fix textarea2's label for attribute
2012-01-24 10:41:23 -08:00
Pete Hopkins
04efc8d0a8
Fixes apostrophe in less.html
2012-01-24 12:52:06 -05:00
Pete Hopkins
37b38fe2a0
Spelling and typos in components.html and javascript.html
2012-01-24 12:49:30 -05:00
Pete Hopkins
91b32f4783
Fixes apostrophe usage in base-css.html
2012-01-24 12:12:35 -05:00
Kevin Martensson
eab4d34ea0
Remove specific top value from large btn-dropdown.
2012-01-24 17:55:01 +01:00
Eden
ec68b84123
i don't think the batch s/2011/2012/ was supposed to hit this. :)
2012-01-24 08:27:19 -08:00
Christian Nennemann
774d8d8d17
Fix typo in docs/index.html
2012-01-24 14:46:44 +01:00
Jacob Thornton
16440eea92
move translation tag for bootstrap
2012-01-23 19:59:05 -08:00
Jacob Thornton
82de03b67c
start wrapping text in {{_i}} for translation
2012-01-23 19:55:00 -08:00
Jacob Thornton
b4b1ef6839
rebuild with new templates
2012-01-23 15:17:32 -08:00
Jacob Thornton
9a68f115e7
rebuild
2012-01-23 15:07:07 -08:00
Jacob Thornton
74521e8354
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
2012-01-23 15:06:56 -08:00
Jacob Thornton
f764aee4b9
add templates for doc generation
2012-01-23 14:14:16 -08:00
Mark Otto
a074087034
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-23 13:51:12 -08:00
Mark Otto
cd5ffbe396
fix up the modals in responsive a bit
2012-01-23 13:50:55 -08:00
Mark Otto
1954cf0019
comment in forms'
2012-01-23 13:46:26 -08:00
Piotrek Okoński
cf716bbecc
Set matching line-height for .close inside .alert
2012-01-23 22:03:09 +01:00
Mark Otto
b636ccb281
Merge pull request #1118 from olvlvl/2.0-wip
...
Remove .alert-message IE hack
2012-01-23 12:49:09 -08:00
Olivier Laviale
1fa2801c2f
.alert-message no longer exists
2012-01-23 21:22:08 +01:00
Mark Otto
ff113acba8
cut margin in half on default forms
2012-01-23 12:21:00 -08:00
Mark Otto
ea8f5883fd
clean up subnav aesthetics
2012-01-23 12:04:48 -08:00
Mark Otto
a7bf0295fb
remove dropdowns, add in sub nav instead
2012-01-23 11:55:04 -08:00
Mark Otto
00d9258194
revert to negative margin on grid row
2012-01-23 11:35:39 -08:00
Mark Otto
22fa371259
Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
...
Conflicts:
bootstrap.css
bootstrap.min.css
lib/type.less
2012-01-23 11:25:16 -08:00
Jacob Thornton
1209a3756c
:focus:required:invalid: http://www.alistapart.com/articles/forward-thinking-form-validation
2012-01-22 20:50:35 -08:00
Jacob Thornton
2355ea034b
rebuild
2012-01-22 20:47:24 -08:00
Jacob Thornton
f7b5e0f6b5
Merge pull request #1046 from kevva/dropdown-menus
...
Scalable dropdown menus
2012-01-22 20:41:52 -08:00
Jacob Thornton
36d2679f83
give default valuse for border-radius-custom
2012-01-22 20:31:58 -08:00
Jacob Thornton
36d56fb1ba
don't use negative margin - use first child to set to 0
2012-01-22 20:12:26 -08:00
Jacob Thornton
b8c0388f8a
fix sans-serif order in forms.less and rebuild
2012-01-22 20:07:17 -08:00
Jacob Thornton
dc5bedda14
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-22 20:03:17 -08:00
Jacob Thornton
155b72e873
share -> share-alt
2012-01-22 20:02:56 -08:00
Jacob Thornton
1593671cb2
Merge pull request #1098 from lookfirst/fixstuff
...
2.0-wip: clean up variable usage with colors
2012-01-22 19:50:16 -08:00
Jacob Thornton
c424045c76
Merge pull request #1106 from olvlvl/2.0-wip
...
2.0 wip
2012-01-22 19:48:53 -08:00
Jacob Thornton
9dcc16fa8c
Merge pull request #1024 from gnuwilliam/master
...
Buttons Tests
2012-01-22 19:44:02 -08:00
Jacob Thornton
87c676335c
Merge pull request #1053 from scottwater/patch-1
...
Added missing 'data-dismiss="modal"' on the first example model source.
2012-01-22 19:38:48 -08:00
Olivier Laviale
a583f055b3
Using variables rather than numeric values
2012-01-22 22:32:16 +01:00
Jacob Thornton
7dbd2810e3
Merge pull request #1105 from olvlvl/2.0-wip
...
2.0 wip
2012-01-22 13:01:28 -08:00
Olivier Laviale
0523c053a7
Fixed typo
2012-01-22 21:45:20 +01:00
Jacob Thornton
a364d89936
Merge pull request #1104 from cgunther/dropdown-docs
...
Dropdown docs error in example
2012-01-22 12:25:51 -08:00
Jacob Thornton
a6eb972bf3
Merge pull request #1101 from ansman/2.0-wip
...
Fix for #1102 and #1100
2012-01-22 12:20:39 -08:00
Jacob Thornton
88596797f0
rename tooltip test file
2012-01-22 12:19:22 -08:00
Chris Gunther
c3625ebb23
Move placement of ID in docs example for dropdowns
...
The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
2012-01-22 11:46:44 -05:00
Nicklas Ansman Giertz
4882e6da2f
Rename the tooltip test file
...
It had not been renamed when twipsys became tooltips.
2012-01-22 12:33:30 +01:00
Nicklas Ansman Giertz
05fdd43e41
Add testcase to popover
...
This test case verifies that custom classes are respected.
2012-01-22 12:32:37 +01:00
Nicklas Ansman Giertz
6a9f169fd6
Make the popove respect custom classes
2012-01-22 12:06:59 +01:00
Jacob Thornton
373a54187e
add ability to cycle carousel to a particular frame
2012-01-21 23:02:29 -08:00
Jon Stevens
0f2dd75c97
remove tabs
2012-01-21 22:35:03 -08:00
Jacob Thornton
6e490628d1
more efficient matcher + bold matched query in item
2012-01-21 22:06:36 -08:00
Jacob Thornton
4fe11342d0
make case lookahead case insensitive
2012-01-21 21:46:47 -08:00
Jacob Thornton
d3817cf466
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-21 21:35:53 -08:00
Jacob Thornton
2187e0838f
change scrollspy offset to be option + fix typo in scrollspy
2012-01-21 21:35:20 -08:00
Jacob Thornton
05cc371105
Merge pull request #1097 from buraktuyan/2.0-wip
...
2.0-wip: Optimize all PNG files (without any quality loss)
2012-01-21 21:14:46 -08:00
Jon Stevens
e0238bfb08
clean up variable usage with colors
2012-01-21 15:24:06 -08:00
Burak Tuyan
4a5867b18b
Optimizing all PNG files, saving 60.02 KB in total without any quality lost. (Using PNGOUTWin 1.5.0.100, Xtreme strategy in compability mode)
2012-01-21 23:52:39 +02:00
Jacob Thornton
719713ca87
fix typo
2012-01-20 20:28:40 -08:00
Jacob Thornton
7444310c4d
only prevent default of links in sections
2012-01-20 20:05:16 -08:00
Jacob Thornton
3ed836b198
should check for alert class not alertmessage
2012-01-20 13:50:36 -08:00
Jacob Thornton
93c8152216
only prevent default if getting data-href
2012-01-20 13:42:10 -08:00
Nicolas Gallagher
782c994060
Remove global reset in favour of contextual reset.
...
Rather than having a partial reset with individual elements having
their styles built back up, only elements without replacement
styles have specific properties 'reset'.
This commit also includes: a correction to the font mixin arguments
used on forms (the output is now valid CSS); the removal of
`overflow-y:scroll` from the `html` element which is now known to
cause some problems for jQuery modal plugins in Firefox.
2012-01-20 21:21:59 +00:00
Mark Otto
c75a59e741
Merge pull request #1069 from necolas/2.0-wip
...
2.0-wip: Changes to .gitignore, clearfix mixin, and search input reset
2012-01-20 09:30:06 -08:00
Nicolas Gallagher
8825443d6e
Remove search input cancel button in WebKit-OSX.
...
On input elements with a `type` of `search`, WebKit on OS X will
display a cancel button after text has been entered. This can
look ugly or be poorly position when you've added other styles to
the input (especially additional padding).
2012-01-19 22:27:24 +00:00
Nicolas Gallagher
25ac318d33
Remove unnecessary CSS properties from the clearfix mixin.
2012-01-19 20:33:22 +00:00
Nicolas Gallagher
1c014613a9
Add various always-ignore extensions, files, and folders to .gitignore
2012-01-19 20:32:57 +00:00
Scott Watermasysk
9c94078415
Added missing 'data-dismiss="modal"' on the first example model source.
2012-01-18 14:53:59 -05:00
Kevin Martensson
87113396df
Make dropdown menus scalable.
2012-01-18 14:02:18 +01:00
Mark Otto
ab8f2e2767
don't scope placeholder text color to just inputs
2012-01-18 00:35:14 -08:00
Mark Otto
d12560c0ee
make button active state clearer by lightening the inner shadow and removing the background image
2012-01-18 00:30:49 -08:00
Mark Otto
f2fadf1f0a
rename navbar variables, change navbar search placeholder to mixin
2012-01-18 00:24:10 -08:00
Mark Otto
a920fa2993
re-org variables
2012-01-18 00:12:58 -08:00
Mark Otto
dd4140319a
revamp the mixins file to organize things a bit more, make placeholder text use a new variable instead of relying solely on @grayLight
2012-01-17 23:52:49 -08:00
Mark Otto
8c1a908754
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-17 23:39:28 -08:00
Mark Otto
47b8184bbb
scope table styles to a class, .table, instead of on the generic element as a smarter default
2012-01-17 23:39:18 -08:00
Mark Otto
51f5b7b8af
cleanup accordion css and add comments
2012-01-17 23:24:59 -08:00
Mark Otto
4f12627604
Merge pull request #1042 from boberkfell/2.0-wip
...
2.0 wip Small typo fix in docs
2012-01-17 23:21:52 -08:00
Mark Otto
9372fdbf97
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-17 23:19:50 -08:00
Mark Otto
41a410b8e6
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
docs/javascript.html
lib/accordion.less
2012-01-17 23:19:21 -08:00
Ben Oberkfell
4d098a7f8e
typo fix in component docs
2012-01-18 00:37:24 -06:00
Jacob Thornton
593b062c7a
wrap transition
2012-01-17 10:32:25 -08:00
Mark Otto
f1a88eede3
fix js link in docs nav, restyle accordion with new css
2012-01-16 17:27:30 -08:00
William Oliveira
0bc458dfd2
Creating asynchronous tests for loading buttons, because they have setTimeout() function
2012-01-16 05:32:08 -02:00
Jacob Thornton
7ec4e91324
reorder properties
2012-01-15 21:58:45 -08:00
Jacob Thornton
87bd0e0b88
do some trickery to get borders looking right
2012-01-15 21:54:58 -08:00
Jacob Thornton
036b985357
fix margin
2012-01-15 21:50:04 -08:00
Jacob Thornton
810bba97a4
make accordions little bit smoother
2012-01-15 21:48:58 -08:00
Mark Otto
1c734281c9
Merge pull request #1020 from lookfirst/fixtest
...
Fix typo in tables docs
2012-01-15 20:51:45 -08:00
Jon Stevens
b4dd2b9a10
fix typo
2012-01-15 19:38:30 -08:00
Mark Otto
f48278dac6
updated accordion and carousel; accordion still needs work
2012-01-15 18:40:17 -08:00
Mark Otto
c02501e1b7
move carousel to separate stylesheet, update popovers to fix ie7 bug, fix pagination, fix alerts
2012-01-15 16:27:36 -08:00
Mark Otto
3d9298b04b
fix the js alerts examples
2012-01-15 15:06:30 -08:00
Mark Otto
127c0d0b52
make dl and child elements less specific
2012-01-15 13:12:29 -08:00
Mark Otto
f43f2c0ea2
fix grid sized horizontal form layout
2012-01-15 12:53:35 -08:00
Mark Otto
6077b7678c
fix modal horizontal alignment
2012-01-15 11:41:46 -08:00
Mark Otto
9f732e90d4
make horizontal form labels map to default grid sizing
2012-01-15 11:33:30 -08:00
Mark Otto
fe160261e4
normalize the alert classes to match last night's flip for form and table classes
2012-01-15 11:30:24 -08:00
Mark Otto
1385540d0a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-15 11:26:21 -08:00
Mark Otto
8ceea1f559
fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code
2012-01-15 11:26:06 -08:00
Mark Otto
a63636a248
Merge pull request #1012 from pkauders/patch-1
...
Fix small typo in docs home page
2012-01-15 11:23:34 -08:00
Paul Kauders
ed9903f797
Fix typo in Responsive design content
2012-01-15 07:46:25 -06:00
Mark Otto
f989c6892f
gray out links for active state on pagination
2012-01-14 23:33:42 -08:00
Mark Otto
16eccc43d9
dates updated to 2012
2012-01-14 23:28:48 -08:00
Mark Otto
dab6d2b17c
change up classes on tables and forms, fix nav list styles in example
2012-01-14 21:28:47 -08:00
Mark Otto
6d916763f8
adding the pager component after rewriting the pagination docs and css
2012-01-14 20:54:37 -08:00
Mark Otto
1c6048bac2
restore top bar on home page
2012-01-14 19:17:48 -08:00
Mark Otto
2c3365f99e
allow btn-groups to work in navbars
2012-01-14 17:16:46 -08:00
Mark Otto
74c0fc17c8
fix duplicate icons
2012-01-14 16:56:47 -08:00
Mark Otto
55ea574f8a
update preventing double border line for bordered tables by account for th elements in tr elements
2012-01-14 16:50:36 -08:00
Mark Otto
028726a9a3
add user-select mixin
2012-01-14 16:45:01 -08:00
Mark Otto
a40b2a636c
make inline and search form labels inline-block
2012-01-14 16:38:40 -08:00
Mark Otto
ceb6836e03
move up alert message close icon
2012-01-14 16:24:23 -08:00
Mark Otto
7455dd6b45
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-14 16:18:39 -08:00
Mark Otto
f587e81b7d
rewrite alert messages to use less code, combine the look of default and block messages, simplify docs
2012-01-14 16:18:15 -08:00
Mark Otto
59673bf9f7
Merge pull request #1003 from cgunther/docs-fixes
...
Fix links in docs top bar and section ids
2012-01-14 13:08:39 -08:00
Chris Gunther
ec7f8917b1
add Progress Bars to Components narbar dropdown
2012-01-14 15:24:35 -05:00
Chris Gunther
1f54ff91b2
fix section ID for thumbnails
2012-01-14 15:21:57 -05:00
Chris Gunther
b723db1e42
fix section ID for pagination
2012-01-14 15:21:09 -05:00
Chris Gunther
f82fb2a197
fix navbar links to base CSS > typography
2012-01-14 15:18:59 -05:00
Chris Gunther
a4b107bf87
fix navbar links to scaffolding > grid system
2012-01-14 15:15:24 -05:00
Jacob Thornton
07530073dd
Merge pull request #995 from renajohn/2.0-wip
...
Fix bug on tooltips placement when passed as a function
2012-01-14 10:21:08 -08:00
Renault John Lecoultre
2cea94e892
Fixed when placement is a function
2012-01-13 22:33:05 +01:00
Mark Otto
fc053ac8b2
update dropdowns spacing and docs section spacing
2012-01-13 10:07:56 -08:00
Mark Otto
b958ac77c1
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-13 09:55:43 -08:00
Mark Otto
8f09028cff
updated js includes to make nav work everywhere
2012-01-13 09:55:15 -08:00
Jacob Thornton
e27ae9c50f
Merge pull request #986 from purwandi/2.0-wip
...
Fix id anchor javascript
2012-01-13 00:32:12 -08:00
Purwandi
7b321e9c1f
Remove sidebar with icon from my own repo
2012-01-13 15:03:23 +07:00
Purwandi
2623f325ec
Merge branch '2.0-wip' of github.com:purwandi/bootstrap into 2.0-wip
2012-01-13 14:58:13 +07:00
Purwandi
11be9cd163
Fix id anchor javascript
2012-01-13 14:57:21 +07:00
Mark Otto
391248c0e3
nuke uber footer, bring back topbar dropdowns
2012-01-12 15:29:16 -08:00
Mark Otto
ef8b27cdc7
fix heading
2012-01-12 12:30:36 -08:00
Mark Otto
f58aa16f59
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-12 10:29:16 -08:00
Mark Otto
5e3c211334
fix type shorthand in blockquote
2012-01-12 10:19:07 -08:00
Jacob Thornton
8b5c8a3a90
Merge pull request #972 from billmn/2.0-wip
...
Fixed broken anchors on js docs page
2012-01-12 09:50:49 -08:00
Davide Bellini
1fa94bdbf4
Fixed broken anchors on js docs page
2012-01-12 12:04:17 +01:00
Mark Otto
620d987f9f
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-11 21:59:33 -08:00
Jacob Thornton
19090ea333
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-11 21:43:43 -08:00
Jacob Thornton
6f2f947a43
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
2012-01-11 21:42:55 -08:00
Mark Otto
32c6287259
comments and borders for multiple tbody
2012-01-11 09:43:13 -08:00
Mark Otto
a2ebf0c0c1
account for multiple tbody with 2px border between
2012-01-10 21:54:11 -08:00
Mark Otto
f2fdbd9113
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-10 16:22:19 -08:00
Mark Otto
a34231d94d
typo
2012-01-10 15:58:44 -08:00
Jacob Thornton
51e4e77034
remove some tabs from demo + fix dropdowns for pills
2012-01-09 19:53:52 -08:00
Mark Otto
5c2bf0feef
remove empty margin property
2012-01-09 09:15:42 -08:00
Mark Otto
5032ef9b54
remove static popovers, modals, and twipsies from components in favor of full javascript page
2012-01-08 23:14:07 -08:00
Mark Otto
83c0896999
updated js pages to put examples first
2012-01-08 21:48:07 -08:00
Mark Otto
eaa8220d70
add utilities.less file for generic classes
2012-01-08 15:38:57 -08:00
Mark Otto
e654ec1336
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-08 15:33:55 -08:00
Mark Otto
4b79443bba
fix dropdowns for active state in dropdown menus
2012-01-08 15:33:44 -08:00
Jacob Thornton
a24cdb3e40
Merge pull request #932 from blizzy78/typo
...
Tiny typo fix
2012-01-08 15:13:56 -08:00
Jacob Thornton
7aca72322e
move hover state out of timeout duh
2012-01-08 15:12:34 -08:00
Maik Schreiber
dbe5e666af
fix typo
2012-01-09 00:02:13 +01:00
Jacob Thornton
91d393fd47
change prepend to append
2012-01-08 15:01:23 -08:00
Jacob Thornton
6e8a3bba32
add note about firefox persisting disabled state on buttons
2012-01-08 14:54:36 -08:00
Jacob Thornton
aa0c4acd80
fix modal insertion boolean
2012-01-08 14:38:21 -08:00
Jacob Thornton
76cadd1d2a
only append modal to dom if not already present
2012-01-08 14:36:41 -08:00
Mark Otto
ac68bc39ff
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-08 14:33:52 -08:00
Mark Otto
2c79030439
fix navbar styles for .brand
2012-01-08 14:33:14 -08:00
Mark Otto
cb38d08ed4
updated js docs page to use grid of plugins instead of table
2012-01-08 14:33:03 -08:00
Jacob Thornton
5a33c1b96e
make dropdowns toggle when clicked (for mobile)
2012-01-08 14:19:53 -08:00
Jacob Thornton
561fc8cf2a
document slide and slid methods
2012-01-08 13:54:00 -08:00
Jacob Thornton
93a8b331bb
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-08 13:39:50 -08:00
Jacob Thornton
f83240a8f9
add slide and slid events + disable sliding during slide
2012-01-08 13:39:27 -08:00
Mark Otto
6226b14e3b
fix placement of dropdowns in navbar after getting to general in those styles
2012-01-08 13:30:23 -08:00
Mark Otto
0d62778b28
correct navbar scaffolding code snippet
2012-01-08 13:22:20 -08:00
Mark Otto
cb9be7bd0c
clean up dup css in responsive, fix navbar dropdown caret
2012-01-08 13:21:44 -08:00
Mark Otto
1ef9cbc6e4
rejigger z-index ranks for popovers/topbar/etc
2012-01-08 12:40:30 -08:00
Jacob Thornton
fbd686ad65
get tabs working in ie9
2012-01-08 12:08:00 -08:00
Jacob Thornton
d4ded76a8f
get carousel working in firefox
2012-01-08 11:33:55 -08:00
Jacob Thornton
c78016e3ac
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-08 11:24:16 -08:00
Jacob Thornton
f1cbd22b99
fix buttons for firefox
2012-01-08 11:23:51 -08:00
Mark Otto
cb52458698
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-08 03:19:06 -08:00
Mark Otto
21eb2dac8a
add icons in nav list example and markup
2012-01-08 03:18:48 -08:00
Mark Otto
2376da40fb
cleanup organization of tabbable nav section
2012-01-08 03:11:51 -08:00
Mark Otto
b7acbd8476
move collapsing navbar nav to 480 and below, unfloat nav for 768 and below to wrap links with position absolute
2012-01-08 03:00:06 -08:00
Purwandi
b14426c176
Added example sidebar navigation with icon in docs
2012-01-08 17:44:19 +07:00
Mark Otto
9e7acc6370
fix responsive navbar nav treatment by using hover instead of click
2012-01-08 02:30:18 -08:00
Mark Otto
cf05dc8677
adjust navs for fine details on dropdowns in stacked nav and improved open state there
2012-01-08 02:15:47 -08:00
Jacob Thornton
0bbb64be4d
add nav class to tabs in javascript demo
2012-01-08 02:04:23 -08:00
Mark Otto
916761d568
fix styles on right aligned blockquote to flip padding and border appropriately
2012-01-08 01:57:05 -08:00
Mark Otto
9daf1661c5
fix docs for fluid layout, update topbar to fix active text color for links
2012-01-08 01:54:59 -08:00
Mark Otto
b780034a65
clean up some spacing on the dropdown for typeahead
2012-01-08 01:50:12 -08:00
Mark Otto
19986b3dd8
remove / on js, fix link to typeahead, remove old gradient on dropdown hover
2012-01-08 01:45:49 -08:00
Jacob Thornton
bc505560a0
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
2012-01-08 00:50:48 -08:00
Jacob Thornton
4478df7681
first pass at ultra basic autocomplete
2012-01-08 00:49:38 -08:00
Mark Otto
3c2f82f469
recomment out the moz stuff for progress bars since less can't compile it right now
2012-01-07 23:31:00 -08:00
Mark Otto
d170224457
fix progress bars by removing border and negative margins
2012-01-07 23:21:40 -08:00
Mark Otto
961c479422
remove unused css and reorder the toggle classes
2012-01-07 22:07:36 -08:00
Mark Otto
22e0c5f7c8
redoing the tabs on bottom, left, and right
2012-01-07 22:06:44 -08:00
Mark Otto
d0eecc85f8
remove tabbable stuff to try new approach
2012-01-07 21:18:47 -08:00
Mark Otto
ecffa03890
nuke unused code, add to upgrading page
2012-01-07 21:10:17 -08:00
Mark Otto
95f47026cf
fix up dropdowns and navbar docs for the new dropdown styles
2012-01-07 21:09:02 -08:00
Mark Otto
343dd9616d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-07 20:40:49 -08:00
Mark Otto
2948d1c3b2
overhaul the entire tabs component structure and docs; remove side nav and make it a nav list to build on new .nav base class
2012-01-07 20:40:28 -08:00
Jacob Thornton
04e251cefa
Merge pull request #923 from purwandi/2.0-wip
...
Fix line number pretyprint in javascript docs
2012-01-07 18:04:08 -08:00
Purwandi
4961aa8c23
Fix line number pretyprint in javascript docs
2012-01-08 08:17:54 +07:00
Mark Otto
1438b14f74
overhauled docs to include example markup, add language around browser support and classes
2012-01-07 15:52:57 -08:00
Mark Otto
418e2c7d58
Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip
...
Conflicts:
bootstrap.css
2012-01-07 13:52:36 -08:00
Mark Otto
b81b0e2b15
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-07 13:42:35 -08:00
Mark Otto
28420311d8
more table docs cleanup
2012-01-07 13:40:05 -08:00
Mark Otto
a339f0051b
fixing tablesorter styles by adding the jquery plugin back to the lib, fixing the docs examples
2012-01-07 12:22:51 -08:00
Jacob Thornton
402c480097
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-07 10:56:28 -08:00
Jacob Thornton
fbb42ccbbb
update link to collapse plugin
2012-01-07 10:56:00 -08:00
Jacob Thornton
5217131657
Merge pull request #919 from groodt/master
...
Commit fixes #918
2012-01-07 10:31:03 -08:00
Greg Roodt
62e504715a
Small spelling correction.
2012-01-07 17:30:47 +00:00
Mark Otto
95c88a2953
scratch that, tweaking dropdowns in tabs
2012-01-07 04:41:51 -08:00
Piotrek Okoński
3eb80591b2
Progress bars
2012-01-07 13:39:46 +01:00
Mark Otto
6dee40f469
adding back table grid sizing; will need support for responsive perhaps
2012-01-07 04:34:30 -08:00
Mark Otto
7728f7b824
add html5 invalid state for super fancy errors via browser
2012-01-07 04:28:30 -08:00
Mark Otto
b6d50c892d
scope close icon in modal to modal-header to allow alerts in modals to use close icons
2012-01-07 04:20:56 -08:00
Mark Otto
e594107f37
change up the z-indexing and add some popover/twipsy content to the test modal on the js docs to help avoid future bugs
2012-01-07 04:17:33 -08:00
Mark Otto
5ba7c14afe
another quick pass at ranking all zindexes and listing them in variables for quick overview and editing later
2012-01-07 04:07:53 -08:00
Mark Otto
8bdaf1f364
better ranking of z-indexes for tipsies so they appear above dropdown menus but below fixed topbar
2012-01-07 04:01:09 -08:00
Mark Otto
2540caeddd
quick stab at fixing modal placement on 480px and down
2012-01-07 03:58:48 -08:00
Mark Otto
33dad13014
update fluid layout to use variable for sidebar width
2012-01-07 03:53:20 -08:00
Mark Otto
8ccc3bcf03
overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section
2012-01-07 03:45:24 -08:00
Mark Otto
5fb2c666ac
update the fluid examples to use new classes and clear the floats properly from sidebar
2012-01-07 01:59:53 -08:00
Mark Otto
45d671d97f
tweak spacing once more on prettify; add support for uneditable inputs to input-append and prepend
2012-01-07 01:22:52 -08:00
Mark Otto
e23448ab1b
make fixed navbars have lower z-index
2012-01-07 01:08:58 -08:00
Mark Otto
d6a1402f2a
update form shadows and tweak prettyprint styles
2012-01-07 01:03:26 -08:00
Mark Otto
bcf1136f2c
fix form field sizing for selects, document form field grid sizing
2012-01-07 00:47:53 -08:00
Mark Otto
0cb2866409
fix reponsive 1200+ media query to resolve mismatched gutters and negative margins on the row
2012-01-07 00:29:36 -08:00
Mark Otto
36e7660383
fix forms in navbars, fix examples' navbars
2012-01-07 00:26:58 -08:00
Mark Otto
94b825abc8
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-07 00:01:52 -08:00
Mark Otto
cfc2353059
front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates
2012-01-06 23:59:22 -08:00
Jacob Thornton
dd99e2d048
start of autocomplete plugin
2012-01-06 18:30:32 -08:00
Jacob Thornton
1f0d8b22a4
Merge pull request #910 from manveru/patch-1
...
Use `date` instead of `DATE`, that's the POS*X way.
2012-01-06 11:09:51 -08:00
Jacob Thornton
64c8623533
Merge pull request #907 from ansman/2.0-wip
...
Twipsy now respects custom classes
2012-01-06 11:07:59 -08:00
Michael Fellinger
49de3bef79
Use date instead of DATE, that's the POS*X way.
2012-01-06 13:15:18 +01:00
Nicklas Ansman Giertz
969fbe7150
Add a test case for issue #908 (twipsy doesn't respect custom classes)
...
The test case verifies that a custom class is respected.
2012-01-06 11:33:18 +01:00
Nicklas Ansman Giertz
f07bcafd39
Make twipsy respect custom classes when using a custom template
...
If you had a custom class to the root object twipsy would overwrite
that class ($tip[0].className = 'twipsy'), now this has been changed
so it removes only classes that twipsy adds.
2012-01-06 11:16:29 +01:00
Mark Otto
5cb76037ae
fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar
2012-01-05 23:24:19 -08:00
Mark Otto
7582520808
docs cleanup and navbar brand hover
2012-01-05 22:37:23 -08:00
Mark Otto
9bedfa447c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-05 21:43:54 -08:00
Mark Otto
c56e9d2d35
massive docs update, mostly to all our new forms, and to the buttons
2012-01-05 21:43:28 -08:00
Jacob Thornton
314feb702f
listen to window for dropdown clear
2012-01-05 18:32:08 -08:00
Mark Otto
90e3a706ba
add jank js back to docs application.js for responsive dropdown in topbar
2012-01-05 16:03:05 -08:00
Mark Otto
aa5342888b
default cursor for disabled links in pagination
2012-01-05 15:48:40 -08:00
Mark Otto
03d7c1a65e
make dropdowns use unicode character for :after
2012-01-05 15:46:48 -08:00
Mark Otto
621dd13d87
move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body
2012-01-05 15:43:07 -08:00
Mark Otto
23e5fc2133
Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly
2012-01-05 14:11:41 -08:00
Mark Otto
20add59de3
breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs
2012-01-05 10:01:42 -08:00
Mark Otto
bdc22e71c8
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-05 01:37:06 -08:00
Mark Otto
a13ab64870
add a quick little example of icons in buttons
2012-01-05 01:36:05 -08:00
Mark Otto
fb9401b355
tweaks abound, updated prettify styles, new sidenav component started, sprite icons started
2012-01-05 01:34:14 -08:00
Jacob Thornton
fcfa231131
Merge pull request #886 from giveo/master
...
Changing copyright year in footer examples from 2011 to 2012
2012-01-04 10:03:28 -08:00
Jacob Thornton
3237047ac3
Merge branch 'master' of https://github.com/twitter/bootstrap
2012-01-04 10:03:11 -08:00
Jacob Thornton
eb123f6b83
switch to async widget.js script
2012-01-04 10:02:51 -08:00
Jeff Nunn
175c3226b7
Changing copyright in example footers from 2011 to 2012
2012-01-04 09:28:48 -07:00
Jacob Thornton
5661855be3
actuall use interval option :P
2012-01-02 22:57:04 -08:00
Jacob Thornton
e89618a47f
clean up options implementation for carousel
2012-01-02 22:55:51 -08:00
Jacob Thornton
f5bcfaec2c
ease-in-out slide transition
2012-01-02 22:33:49 -08:00
Jacob Thornton
3fb6f6ee86
basic carousel implementation
2012-01-02 22:30:57 -08:00
Jacob Thornton
8b58a1c3d9
placeholder design for carousel
2012-01-02 19:13:02 -08:00
Jacob Thornton
0c3bf7275c
add quotes to courier new
2012-01-02 16:05:14 -08:00
Jacob Thornton
f8c0efbcb4
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2012-01-02 16:04:35 -08:00
Jacob Thornton
2d092dfeea
start playing with carousel stuff
2012-01-02 16:04:01 -08:00
Mark Otto
553030ca7d
missing parantheses
2011-12-30 16:01:29 -08:00
Mark Otto
704d713aad
border radius on large button toolbar
2011-12-27 17:39:34 -06:00
Mark Otto
53c6dbff0d
add appended input example to docs, fix help-text wrapping issue by clearing float
2011-12-27 17:04:55 -06:00
Mark Otto
550879cf66
fix quotes in font-family usage
2011-12-27 16:50:27 -06:00
Mark Otto
e78d5f8ff3
fix tables for rowspan
2011-12-27 16:25:22 -06:00
Mark Otto
46d2ad5e22
allow select with size attr to not have fixed height
2011-12-27 16:08:07 -06:00
Mark Otto
3426877c89
add ie7 inline block mixin and add ability to center pagination
2011-12-27 15:51:36 -06:00
Mark Otto
fec02f5045
clean up some css for github issues: input prepend z-index, modals revamped for responsive
2011-12-27 15:40:58 -06:00
Mark Otto
5801c4d766
capitalize Less in makefile, add print less file (not yet compiled)
2011-12-27 13:51:50 -06:00
Mark Otto
b9adae14fc
remove button from topbar for testing
2011-12-27 12:40:30 -06:00
Mark Otto
324246e4f9
remove negative margin from .brand in docs, update navbar to support buttons up thurr
2011-12-27 12:39:39 -06:00
Mark Otto
058f47b33b
clean up some comments and fix a bug with buttons in navbar by removing too generic of a link color
2011-12-26 17:25:25 -06:00
Mark Otto
544120264d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-12-26 16:47:10 -06:00
Jacob Thornton
1c7c5f750f
Merge pull request #850 from sferik/scrollable_modal
...
Make modal windows scrollable
2011-12-25 20:35:44 -08:00
Erik Michaels-Ober
7fbb3660ef
Rebuild CSS
2011-12-25 20:18:49 -08:00
Erik Michaels-Ober
791fd6a141
Make modal windows scrollable
...
Closes #849 .
2011-12-25 20:17:35 -08:00
Jacob Thornton
12868933b9
clean up dead elements in firefox (which is droping transitionEnd events :(
2011-12-24 23:06:16 -08:00
Jacob Thornton
4ef5a90445
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2011-12-24 22:56:40 -08:00
Jacob Thornton
823d89dbb2
move position of twipsy into getPosition so it can easily be extended for svg use
2011-12-24 22:56:01 -08:00
Jacob Thornton
076370f3f9
fix for linux
2011-12-24 22:31:39 -08:00
Jacob Thornton
a3822cfa84
Merge pull request #842 from jonathaningram/patch-2
...
Add close and closed hooks for alert
2011-12-24 22:16:48 -08:00
Jacob Thornton
04fee21121
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2011-12-24 22:15:29 -08:00
Jacob Thornton
1a295491b2
update docs for placement
2011-12-24 22:15:04 -08:00
Jacob Thornton
4be29ab3c4
Merge pull request #846 from purwandi/2.0-wip
...
Fix id tabs on docs component
2011-12-23 08:20:47 -08:00
Purwandi
3aba68f832
Fix id tabs on docs component
2011-12-23 21:39:29 +07:00
Jacob Thornton
ea23461970
fix unit test for twipsy
2011-12-22 19:28:58 -08:00
Jacob Thornton
49fb910b11
more js cleanup after gnarly merge
2011-12-22 19:25:29 -08:00
Jacob Thornton
3396fc0542
check for prettyprint on window
2011-12-22 19:17:41 -08:00
Jacob Thornton
35fdbad24b
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
2011-12-22 19:15:09 -08:00
Jacob Thornton
87ac818253
change above below to top bottom and add "inside" placement option
2011-12-22 19:10:32 -08:00
Jonathan Ingram
2ebc0ad2ef
Update docs to show available events on alert
2011-12-22 16:47:42 +11:00
Jonathan Ingram
5de1e39a8f
From #822
2011-12-22 16:41:26 +11:00
Jacob Thornton
efacac0d6c
clean up all the js across all the doc pages
2011-12-21 18:42:43 -08:00
Jacob Thornton
6d5b506517
minor cleanups
2011-12-21 17:38:05 -08:00
Mark Otto
690d3f4d1a
remove inline input field CSS since that's not required as all inputs are inline-block anyway
2011-12-21 19:32:14 -06:00
Mark Otto
369cedd87c
update comment on select bg bug and confirmed it was fixed, scoped responsive .span* to .row
2011-12-21 19:31:01 -06:00
Mark Otto
9fb380151d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
docs/javascript.html
2011-12-21 18:39:02 -06:00
Mark Otto
12a0d69454
fix dropdowns in components docs page
2011-12-21 18:38:03 -06:00
Mark Otto
00cbadf994
update thumbnails to keep images from going past edges of thumbnails
2011-12-21 18:21:55 -06:00
Mark Otto
af5793e1cd
fix mobile example sites, remove unused JS from docs index
2011-12-21 16:41:46 -06:00
Mark Otto
c854ed167c
rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones
2011-12-21 16:26:21 -06:00
Mark Otto
20aecb9838
updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file
2011-12-21 16:22:20 -06:00
Jacob Thornton
a5a98a8a98
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-12-21 14:03:18 -08:00
Mark Otto
8a7abc7493
docs updates, forms updated to include error states and more examples, remove text-shadow from gradientbar mixin to fix bug
2011-12-21 16:00:50 -06:00
Jacob Thornton
80cb760fac
animate -> animation
2011-12-21 13:29:12 -08:00
Jacob Thornton
f72a94ae28
update more readme changes - introduce target specificty convention to more plugins
2011-12-20 23:28:48 -08:00
Jacob Thornton
c4364285e4
add default margin for popover and twipsy
2011-12-20 22:12:23 -08:00
Jacob Thornton
0980a33b47
update all to new on api + add animation support to tabs
2011-12-20 19:37:41 -08:00
Jacob Thornton
1ef5fa7d6b
giant refactor - all spec passing again...
2011-12-20 18:02:47 -08:00
Mark Otto
069ef6a020
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-12-19 22:59:20 -08:00
Mark Otto
72a536393c
mostly docs updates, but also some bug fixes per github issues
2011-12-19 22:58:56 -08:00
Jacob Thornton
7df0d1c7d1
rename transitions to transition and fix scrollspy example
2011-12-14 18:45:33 -08:00
Jacob Thornton
e71a532185
Merge pull request #808 from piscis/patch-1
...
changed npm package name to less
2011-12-14 16:06:17 -08:00
Alexander Pirsig
e28b080c79
changed npm package name to less
2011-12-14 16:48:50 +01:00
Mark Otto
aa69286c30
rename transitions js file, fix link in js docs
2011-12-13 10:05:19 -08:00
Mark Otto
d681ae9f51
updated docs to include other less apps
2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409
updated buttons docs
2011-12-11 02:38:58 -08:00
Mark Otto
54a84f0f7f
clearer grid vars docs language
2011-12-11 02:05:50 -08:00
Mark Otto
ecbc9ec4a2
updated footers everywhere
2011-12-11 02:03:16 -08:00
Mark Otto
401f84a7ec
center example sites in docs on mobile
2011-12-11 01:58:06 -08:00
Mark Otto
95048c271e
fix specificity on pills
2011-12-11 01:03:57 -08:00
Mark Otto
6de3ed5322
Merge branch 'add-vertical-nav-divider' of https://github.com/evnm/bootstrap into evnm-add-vertical-nav-divider
...
Conflicts:
bootstrap.css
2011-12-11 00:58:10 -08:00
Mark Otto
200fe25d0a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-12-10 22:30:17 -08:00
Mark Otto
d2e56ad53d
unstyle image inputs
2011-12-10 22:29:49 -08:00
Mark Otto
d587845149
tweaks and increase specificity of pills and active classes
2011-12-10 22:21:08 -08:00
Jacob Thornton
2dd0db8aa3
Merge pull request #773 from cgunther/label-in-dropdown-menu
...
Fix: remove text-shadow from labels
2011-12-10 15:21:27 -08:00
Jacob Thornton
a0270dc7d2
Merge pull request #778 from talltroym/master
...
Add code block for condensed table example
2011-12-10 15:19:49 -08:00
Mark Otto
e240aac6cb
Merge pull request #777 from ceejayoz/2.0-wip
...
Updated bordered-table example to use correct class in docs
2011-12-10 15:05:09 -08:00
Mark Otto
4d55356e9b
remove uber large responsive stuff
2011-12-09 14:39:23 -08:00
Mark Otto
5c8df1d285
updated index page to add featured sites, more docs tweaks
2011-12-09 14:34:38 -08:00
Mark Otto
97b285896f
help tables not look like shit on mobile maybe? also fix bordered table example
2011-12-09 12:51:54 -08:00
Mark Otto
7b810bf9a6
update js in footer, add max-width to img
2011-12-09 12:10:01 -08:00
Mark Otto
1d1805ee5c
add jank js for prototyping new topbar to all docs pages
2011-12-09 11:41:00 -08:00
Mark Otto
312ee6cdfb
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-12-09 11:33:02 -08:00
Mark Otto
b12b71bf7c
updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings
2011-12-09 11:32:07 -08:00
Troy Murray
5f54e4aad1
Add code block for condensed table example
2011-12-09 11:34:58 -05:00
Chris Sternal-Johnson
e603009fca
fix docs for bordered-table
2011-12-08 14:42:42 -05:00
Chris Gunther
40604548ce
remove text-shadow from labels
2011-12-07 20:16:19 -05:00
Evan Meagher
6e70d490e1
Add vertical nav divider example in components doc page.
2011-12-02 11:37:39 -08:00
Evan Meagher
3726df695e
Merge remote-tracking branch 'upstream/2.0-wip' into add-vertical-nav-divider
2011-12-02 10:47:46 -08:00
Jacob Thornton
cee2f61898
define constructor on prototypes
2011-11-30 22:42:22 -08:00
Jacob Thornton
b1cba98aab
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
2011-11-30 22:05:49 -08:00
Jacob Thornton
dc628c9115
start of carousel
2011-11-30 22:05:09 -08:00
Mark Otto
bc51c15709
adding temp idea for subnav to docs
2011-11-30 01:00:55 -08:00
Mark Otto
f2c40ee24d
adding step nav to components
2011-11-30 00:39:38 -08:00
Mark Otto
447c9322e9
update all leads on docs pages
2011-11-29 23:56:01 -08:00
Mark Otto
90c190d4ef
updates to add warning for bordered tables to docs, fix to spacing on prettyprint pre blocks
2011-11-29 23:48:27 -08:00
Mark Otto
0c8d2e37e7
adding bordered table to docs and showing it works with colspan
2011-11-29 23:16:38 -08:00
Evan Meagher
61e84d8762
Add vertical nav divider.
2011-11-29 23:16:09 -08:00
Mark Otto
8f3150cf71
Merge branch 'form-feedback-fix' of https://github.com/tinyfly/bootstrap into tinyfly-form-feedback-fix
...
Conflicts:
bootstrap.css
2011-11-29 22:53:12 -08:00
Mark Otto
cbb291b8ab
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310
misc docs updates, revamped tables CSS save for grid columns and tablesorter options
2011-11-29 22:35:03 -08:00
Mark Otto
08d0aff19f
Merge pull request #722 from tinyfly/grid-input-size-fix
...
Match input grid classes to the new 12-col grid.
2011-11-29 19:17:12 -08:00
Jeff Adams
1da19bf65f
scope form feedback states to .control-group instead of unused .clearfix
2011-11-29 14:06:31 -06:00
Jeff Adams
d48027d495
add input width calculation fix from #408 to the 2.0 branch
2011-11-29 11:12:32 -06:00
Mark Otto
ba17414d77
Merge pull request #711 from smaboshe/updates-to-2.0-docs
...
Updates to 2.0 docs to address typos and capitalization
2011-11-28 11:43:36 -08:00
Silumesii Maboshe
1af3596a5e
Capitalising 'Bootstrap' and abbreviations. Fixing typos.
2011-11-28 08:13:54 +02:00
Jacob Thornton
7eb340ec58
add code to reset data for collapsed element so that item can be intitialized with correct options
2011-11-27 17:31:12 -08:00
Jacob Thornton
7522517b47
derp
2011-11-27 17:12:58 -08:00
Jacob Thornton
f77d0c21df
turn attribute rules to list
2011-11-27 17:12:17 -08:00
Jacob Thornton
76f95f4ea2
change even was removed, in favor of show shown
2011-11-27 17:11:31 -08:00
Jacob Thornton
7f74f11262
fix heading for js readme...
2011-11-27 17:09:31 -08:00
Jacob Thornton
46fe38386a
rename tabs to tab - clean up lots of api stuff make href acceptable target val
2011-11-27 17:04:55 -08:00
Jacob Thornton
3925ea9986
remove trailing semicolons - we'll be hosting minified files with semicolons - no reason to make the dev source ugly
2011-11-27 16:01:26 -08:00
Mark Otto
ecc9764c83
Remove static github buttons and replace with iframe versions
2011-11-27 00:44:30 -08:00
Jacob Thornton
3157de8d1d
clean up comments for better built files
2011-11-25 21:34:55 -08:00
Jacob Thornton
bd8745a98b
allow scrollspy to target a specific nav
2011-11-25 17:30:52 -08:00
Jacob Thornton
98fddaa355
new plugin "collapse" for collapsible lists and "accordion" like support
2011-11-25 17:23:14 -08:00
Jacob Thornton
96adf8f918
fix copy paste bug
2011-11-24 20:27:55 -08:00
Jacob Thornton
53ff2682cd
clean up scrollspy a bit - add public api method
2011-11-24 20:27:18 -08:00
Jacob Thornton
b14f551c9c
fix some more modal things
2011-11-24 20:12:13 -08:00
Jacob Thornton
1fa02fbda2
refactor modal
2011-11-24 20:04:07 -08:00
Jacob Thornton
69372701cf
refactor dropdown in accordance with readme
2011-11-24 19:40:25 -08:00
Jacob Thornton
71654cbf69
refactor alerts + add new readme which idefientifies goals for 2.0 js
2011-11-24 18:55:44 -08:00
Jacob Thornton
b2650859d6
update buttons js for button groups
2011-11-24 14:43:26 -08:00
Jacob Thornton
296fad37b4
Merge pull request #694 from martinbean/patch-1
...
Fixed a typo (redux)
2011-11-24 11:13:33 -08:00
Martin Bean
fe68f708ce
Removed funky characters.
2011-11-24 19:06:00 +00:00
Martin Bean
2b5b87db7d
Fixed a typo. Because I'm a Grammar Nazi.
2011-11-24 11:37:08 +00:00
Jacob Thornton
e5fb1da164
push disable setting to the event loop - this allows for form submit to begin
2011-11-20 21:59:31 -08:00
Jacob Thornton
13a59a0124
remove js min from repo
2011-11-20 21:45:09 -08:00
Jacob Thornton
721e7b85d7
add minified source to min dir in js + add uglify to make process
2011-11-20 21:42:52 -08:00
Jacob Thornton
36a7eb3851
add build script for minified files and allow elements to be returned to getContent and title in popovers
2011-11-20 21:36:26 -08:00
Jacob Thornton
47c7f655ac
update comment numbers
2011-11-20 21:13:28 -08:00
Jacob Thornton
8a891f2a7b
act on all twipsy instances
2011-11-20 21:06:32 -08:00
Jacob Thornton
bc65b58551
merge in js from 1.4... start working through js docs
2011-11-20 20:58:04 -08:00
Jacob Thornton
0b1d5d9189
revert all js stuff back to 1.4 :/
2011-11-20 18:19:50 -08:00
Mark Otto
4e6275d0fe
update property order and do some misc cleanup
2011-11-17 01:28:42 -08:00
Mark Otto
159c7a7fda
remove code styling if it's in a pre tag
2011-11-17 00:52:11 -08:00
Mark Otto
ba9fcd8b57
make uneditable inputs work with span* classes
2011-11-17 00:49:51 -08:00
Mark Otto
6418a40675
spelling mistake in comment
2011-11-17 00:41:26 -08:00
Mark Otto
18d2a879ae
Merge pull request #621 from vshih/master
...
Fix tab event selector in tabs JS docs example
2011-11-17 00:40:42 -08:00
Mark Otto
160970560b
updated font mixins courtesy of @apancutt
2011-11-17 00:37:14 -08:00
Mark Otto
da4390ee24
Merge pull request #645 from mkaschenko/master
...
Fix anchor to JS dropdown docs
2011-11-17 00:10:59 -08:00
Mark Otto
5abb4b3200
update tables docs after merging in the condensed styles
2011-11-17 00:09:12 -08:00
Mark Otto
b1ce89c24a
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-11-17 00:07:34 -08:00
Mark Otto
1d95ee5a2e
Merge pull request #647 from lookfirst/condensed
...
Add .condensed-table example to docs
2011-11-17 00:06:32 -08:00
Mark Otto
a8e88d14a4
make form classes match table classes (readable left to right), update docs associated with it
2011-11-17 00:06:16 -08:00
Mark Otto
a017932285
start breaking down patterns.less into more distinct files, update docs for forms to use correct classes
2011-11-16 23:58:36 -08:00
Jon Stevens
275da020c2
added condensed example
2011-11-16 11:10:27 -08:00
Maxim Kaschenko
4be902741b
Fix dropdown anchor
2011-11-17 01:25:36 +07:00
Jacob Thornton
978dfb9216
clean up var defintion
2011-11-16 00:30:11 -08:00
Jacob Thornton
90f8eb6c14
Merge branch 'master' of https://github.com/twitter/bootstrap
...
Conflicts:
bootstrap.css
2011-11-16 00:28:20 -08:00
Jacob Thornton
a6f055ee5e
improve alert api - $("#fat").alert("close") should just work.
2011-11-16 00:27:04 -08:00
Mark Otto
270def40f7
Merge pull request #629 from leocassarani/patch-1
...
Fix grammatically incorrect sentence in form docs
2011-11-13 15:56:33 -08:00
Leo Cassarani
e3cfd2f5b3
Fix grammatically incorrect sentence (copy-paste oversight?)
2011-11-13 21:45:43 +00:00
Vic
638211b896
Fixes tab event selector in tabs example
2011-11-12 13:18:08 -08:00
Mark Otto
cabf993bc6
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-11-12 01:23:37 -08:00
Mark Otto
1f51ce058b
ensure two-thirds grid offsets work the same as the others
2011-11-12 01:05:19 -08:00
Mark Otto
a4d6e7e9a3
Merge pull request #579 from raulriera/2.0-wip
...
Add meta tag to all new docs pages for mobile responsiveness
2011-11-12 01:03:16 -08:00
Mark Otto
ceeeffc145
fix broken state of active buttons
2011-11-12 00:52:18 -08:00
Mark Otto
1fb98bed91
updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage
2011-11-12 00:46:02 -08:00
Raul Riera
0e6cd670ca
Removed trailing backslash :)
2011-11-08 20:32:28 +01:00
Jacob Thornton
0c7a80c79b
remove selector options for popover, in favor of more generic content selector
2011-11-08 11:04:26 -08:00
Mark Otto
c5115d55ab
Merge pull request #577 from smaboshe/updates-to-2.0-docs
...
Updates to 2.0 docs
2011-11-08 08:24:10 -08:00
Jacob Thornton
b37a336417
Merge pull request #554 from rvagg/poveropt
...
optionable selectors for title & content elements
2011-11-07 09:58:42 -08:00
Raul Riera
74dc83f211
Added the view port meta tag for proper responsiveness
2011-11-07 10:22:28 +01:00
Silumesii Maboshe
ae5badc9fb
Removed the 'View javascript docs' link because it is the page we are currently on. Copy tweak for intro paragraphy of the javascript docs.
2011-11-07 09:09:17 +02:00
Silumesii Maboshe
4af6dac20e
Use 'fluid-container' instead of 'container-fluid' in the docs.
2011-11-07 09:06:13 +02:00
Rod Vagg
1b43c87eaf
removed twipsy options
2011-11-07 12:11:08 +11:00
Rod Vagg
d725ac2feb
Merge remote-tracking branch 'twitter/master' into poveropt
...
Conflicts:
js/bootstrap-popover.js
2011-11-07 12:02:51 +11:00
Jacob Thornton
b15e24e3d4
don't include data-content/data-title as specifications for options in twipsy/popover
2011-11-06 13:49:00 -08:00
Rod Vagg
4d2e32e809
tests & docs & twipsy too
2011-11-06 13:20:09 +11:00
Rod Vagg
3628eb79ae
Merge branch 'master' into poveropt
2011-11-06 12:41:55 +11:00
Jacob Thornton
c3c700fd02
rebuild
2011-11-05 17:07:55 -07:00
Jacob Thornton
5d1c721636
Merge branch 'master' of https://github.com/twitter/bootstrap
2011-11-05 17:07:39 -07:00
Jacob Thornton
f03679805e
update to jquery 1.7 + add toggle method to twipsy/popover
2011-11-05 17:06:41 -07:00
Jacob Thornton
8f353bcae6
Merge pull request #557 from JulianBirch/master
...
Fixed compilation under dotLess
2011-11-05 15:31:41 -07:00
Julian Birch
c53347db79
Add a missing bracket back in. (Prevents dotLess from compiling.)
2011-11-05 04:25:31 +00:00
Rod Vagg
f6a258ef36
optionable selectors for title & content elements
2011-11-05 10:50:08 +11:00
Jacob Thornton
32086c7de5
add the tab-pane class back to example
2011-11-04 13:46:03 -07:00
Jacob Thornton
e87daa9078
make .tab-content backwards compat with 1.3
2011-11-04 13:44:25 -07:00
Jacob Thornton
0a268389ce
Merge branch 'master' of https://github.com/twitter/bootstrap
2011-11-04 13:35:31 -07:00
Jacob Thornton
de44b4c653
fix > & bug and point to 1.1.4 less version
2011-11-04 13:34:44 -07:00
Jacob Thornton
36b5864412
Merge pull request #537 from hermanschutte/master
...
Small change to correct the incorrect description for bootstrap-buttons.js in the Javascript section
2011-11-04 11:20:41 -07:00
Jacob Thornton
77a315d69d
Merge branch 'master' of https://github.com/twitter/bootstrap
2011-11-04 11:18:06 -07:00
Jacob Thornton
913d84d7d3
update button comment
2011-11-04 11:17:28 -07:00
Jacob Thornton
ec8d783799
Merge pull request #544 from nikcub/master
...
bump version number in docs
2011-11-04 11:14:01 -07:00
Nik Cubrilovic
3b611357aa
bump version number in docs
2011-11-05 00:17:12 +11:00
Herman Schutte
79a01b7fcb
Add correct description for bootstrap-buttons.js in Javascript section
2011-11-04 09:34:12 +02:00
Jacob Thornton
a560eb651d
remove preserve-3d
2011-11-03 18:40:18 -07:00
Jacob Thornton
f92759b36d
update 1.4 docs
2011-11-03 17:39:50 -07:00
Mark Otto
5a702cc6ee
no idea
2011-11-03 17:14:19 -07:00
Jacob Thornton
2187703144
rebuild
2011-11-03 17:08:12 -07:00
Jacob Thornton
9defc21218
Merge branch 'master' of https://github.com/twitter/bootstrap into dev
2011-11-03 17:06:13 -07:00
Jacob Thornton
869f11305a
update 1.3 to 1.4 stuffs
2011-11-03 17:03:03 -07:00
Jacob Thornton
1b4b97d530
rebuild css, add preserve-3d for faster animations, fix whitespace in mixins.less
2011-11-03 14:45:53 -07:00
Jacob Thornton
f285048b34
Merge pull request #525 from mchung/patch-1
...
Fixed typo in Makefile
2011-11-02 10:13:58 -07:00
Marc Chung
09743c8996
Fixed typo in Makefile
2011-11-02 00:38:44 -07:00
Mark Otto
d811808494
fix tipsies, modals, and popovers from overlaying topbar
2011-11-02 00:04:43 -07:00
Mark Otto
0e91eddb66
fix pagination inconsistencies
2011-11-01 23:57:48 -07:00
Mark Otto
2534fee753
adding unofficial github buttons
2011-11-01 13:56:00 -07:00
Mark Otto
5c86074fa9
Merge branch 'kriansa-patch1' into dev
...
Conflicts:
bootstrap.css
2011-10-31 23:28:05 -07:00
Mark Otto
602919aae8
tweak alignment for IE7 and chrome
2011-10-31 23:27:20 -07:00
Mark Otto
f4ba190821
Merge branch 'patch1' of https://github.com/kriansa/bootstrap into kriansa-patch1
2011-10-31 23:22:55 -07:00
Mark Otto
a21363a749
Merge branch 'dev' of github.com:twitter/bootstrap into dev
...
Conflicts:
bootstrap.css
2011-10-31 23:22:13 -07:00
Mark Otto
98007b8394
remove fixed height from select elements for IE7
2011-10-31 23:18:36 -07:00
Jacob Thornton
8f726dc6ef
issue #240 - firefox drop css transition events :{o
2011-10-31 22:44:42 -07:00
Mark Otto
f459f826af
recompiling and pushing just to be sure
2011-10-31 21:46:45 -07:00
Mark Otto
31ea003046
remove alt tab styles for now, too complicated to accomplish both static and tabble; fix up CSS a bit
2011-10-31 21:45:46 -07:00
Mark Otto
ac9073e1e4
Merge branch '2.0-left-and-right-tabs' of https://github.com/avalanche123/bootstrap into avalanche123-2.0-left-and-right-tabs
2011-10-31 21:25:21 -07:00
Mark Otto
27b8e5e4fc
small docs tweak
2011-10-31 21:24:57 -07:00
Mark Otto
02bf27592c
overhaul the table styles and update those everywhere in the docs, update the button docs, spec out the forms docs
2011-10-31 19:37:10 -07:00
Mark Otto
ba597ef845
updating table documentation, jumping to dev to bring over new table styles from there
2011-10-31 16:32:13 -07:00
Mark Otto
3f512adf95
updated docs and type styles for blockquotes and a few fixes for type
2011-10-30 20:14:27 -07:00
Jacob Thornton
169b4b5dcb
add template option and make title an optional attribute for popover
2011-10-29 19:59:51 -07:00
Jacob Thornton
640fd15464
allow the use of data attributes to define popover options
2011-10-29 19:27:02 -07:00
Jacob Thornton
ea50e8aeee
add active class to css for buttons, write new spec for button, "use strict"
2011-10-29 18:49:35 -07:00
Mark Otto
0218d079ad
fix some of the docs styles at 480 to 768
2011-10-29 18:11:17 -07:00
Jacob Thornton
e8b66a9626
star work on bootstrap-buttons.js
2011-10-29 17:58:58 -07:00
Jacob Thornton
9a30b8c05d
Merge branch 'master' of github.com:twitter/bootstrap into dev
...
Conflicts:
bootstrap.css
bootstrap.min.css
lib/forms.less
2011-10-29 17:08:35 -07:00
Mark Otto
61937a803b
adding resizable class and mixin
2011-10-28 18:57:37 -07:00
Mark Otto
2764cfda6d
remove html from body background
2011-10-28 18:38:06 -07:00
Chris Aniszczyk
d3b8a96589
Update README.md
2011-10-28 08:57:58 -07:00
Chris Aniszczyk
9f0b79da7e
Update LICENSE
2011-10-28 08:57:09 -07:00
Mark Otto
15e0068979
remove background color from html tag
2011-10-27 23:45:48 -07:00
Mark Otto
9fd4e459fe
adding more icons for the homepage for open source, twitter, and html5/css3
2011-10-27 23:34:48 -07:00
Mark Otto
f3128d0fa1
overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs
2011-10-27 23:00:09 -07:00
Bulat Shakirzyanov
cb13f010e2
implement left and right tabs styles
2011-10-27 18:51:49 -07:00
Mark Otto
20b9390a9e
update docs for responsive
2011-10-27 09:35:58 -07:00
Kriansa
c9b7118a47
Fixed a bug that wasn't working as expected on Linux
2011-10-27 12:36:28 -02:00
Mark Otto
19feb1b1ff
fix new navbar in components
2011-10-26 23:25:57 -07:00
Mark Otto
b4c894961c
address issue #414 and fix up a number of docs loose ends
2011-10-26 23:24:22 -07:00
Mark Otto
648c468927
breaking down the main page into subpages for easier, more comprehensive documentation
2011-10-26 23:11:56 -07:00
Mark Otto
58bbc754b6
Merge branch 'patch1' of https://github.com/kriansa/bootstrap into kriansa-patch1
2011-10-26 21:29:23 -07:00
Mark Otto
646870135b
fix vertical position of dropdown menu in .tabs
2011-10-26 21:28:43 -07:00
Mark Otto
5736ba549c
fix prettyify and update the table styles to include a condensed flavor
2011-10-26 21:22:05 -07:00
Mark Otto
e616026d67
update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies
2011-10-26 21:04:14 -07:00
kriansa
3045ce4692
Aligned close buttons to the middle of alert message
2011-10-27 01:29:34 -02:00
Mark Otto
b4c0d2a6b2
tweaks to the responsive layout to improve type
2011-10-22 22:49:37 -07:00
Mark Otto
fb7fbdb278
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
lib/responsive.less
2011-10-22 15:51:24 -07:00
Mark Otto
2e09ffe383
Merge pull request #461 from tinyfly/responsive-row-fix
...
Undo negative margin on .row for responsive layouts
2011-10-22 15:50:17 -07:00
Mark Otto
d4675bf4ef
updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin
2011-10-22 15:49:42 -07:00
Jacob Thornton
0810b7bcf4
Merge pull request #462 from southpolesteve/master
...
Use proper span classes for three column layout in hero example
2011-10-22 11:23:48 -07:00
Steve Faulkner
7002a01978
Use proper classes for three column layout
2011-10-21 14:00:39 -05:00
Jeff Adams
2c0a60a777
remove negative margin on .row so we don't hang off the left edge of the screen
2011-10-21 11:56:13 -05:00
Mark Otto
41ada302ec
tweaking prettify styles to introduce dark theme
2011-10-21 00:37:01 -07:00
Mark Otto
d28f3d86f6
move javascript to le footer
2011-10-21 00:12:47 -07:00
Mark Otto
80332e8340
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-10-20 09:14:02 -07:00
Mark Otto
12d7fc82f3
fix the popover background color to work in ie7
2011-10-20 09:13:22 -07:00
Mark Otto
b62475a22e
updated fluid example to not use floated sidebar and instead use position absolute; not ideal, but it works in most cases
2011-10-19 23:50:41 -07:00
Jacob Thornton
523e02f7df
fix scrollspy simplify stuff more - break everything.
2011-10-19 23:12:50 -07:00
Mark Otto
35793d98e7
update docs to streamline the tables section, remove redundant css for tables to simplify borders
2011-10-19 23:11:22 -07:00
Jacob Thornton
5ab84f942d
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-10-19 22:42:49 -07:00
Mark Otto
6ad0559e0f
remove redundant styles from inline forms
2011-10-19 22:26:14 -07:00
Mark Otto
958e55f6a4
update docs copy to include mention of info alert messages
2011-10-19 22:22:44 -07:00
Jacob Thornton
8545fe9787
greatly simply js plugins - remove js api where reasonable
2011-10-19 21:56:06 -07:00
Mark Otto
a5d2450e88
refinement to the responsive section
2011-10-18 08:11:18 -07:00
Mark Otto
369b9720c6
adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags
2011-10-17 23:45:35 -07:00
Mark Otto
ae5c5e1063
update docs to change topbar to navbar
2011-10-17 20:44:52 -07:00
Mark Otto
b91d210a3c
overhauled tables section of docs to minize copy and emphasize code
2011-10-17 14:43:43 -07:00
Mark Otto
27cbe7f63a
add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content
2011-10-17 14:17:29 -07:00
Mark Otto
d035fa731a
update all code elements in docs
2011-10-17 12:59:03 -07:00
Mark Otto
f48baceeda
remove bottom margin from h1
2011-10-17 12:45:09 -07:00
Mark Otto
6d2e39950d
updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page
2011-10-17 00:03:52 -07:00
Mark Otto
e7d2218b20
few tweaks to responsive stuff, updated docs for grid system (still needs copy editing)
2011-10-16 23:04:31 -07:00
Mark Otto
c62a0239bd
update to responsive to fix new masthead
2011-10-16 19:12:33 -07:00
Mark Otto
1888511d67
updated docs to include quick links and twitter buttons, added updated blueprint pattern to background
2011-10-16 18:45:11 -07:00
Mark Otto
2a82b38cff
tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks
2011-10-16 18:01:05 -07:00
Mark Otto
756e7c8739
more tweaks to responsive
2011-10-16 12:11:48 -07:00
Mark Otto
6f44a90edb
tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles
2011-10-16 11:35:24 -07:00
Mark Otto
d1d3807958
add responsive.less file
2011-10-16 03:15:36 -07:00
Mark Otto
3a4760637f
tweak navbar styles for static version to not cause problems on responsive layouts
2011-10-16 03:15:17 -07:00
Mark Otto
be926a04bc
fix uber size in responsive; remove @extraspace variable by changing grid to use :first-child over negative margin
2011-10-16 03:08:14 -07:00
Mark Otto
9e9109469e
biiiiiig update coming for responsiveness
2011-10-16 03:00:58 -07:00
Mark Otto
fbe22f0580
updated index of docs to use html5 self closing tags, add responsive shell to bootstrap file
2011-10-15 17:21:39 -07:00
Mark Otto
f4fc56b1b3
first pass at moving over the new tabs stuff to 2.0
2011-10-12 08:31:16 -07:00
Mark Otto
740e64a2c9
remove new tab stuff since it breaks backwards compatability
2011-10-11 23:49:43 -07:00
Mark Otto
e2a0ce2062
adding new tabble stuff, still a huge work in progress
2011-10-11 23:46:42 -07:00
Mark Otto
12af75eef4
updated pills to include vertical (stacked) variation in patterns and documentation
2011-10-11 21:49:37 -07:00
Mark Otto
fa8b1dc12d
remove color scheme variables, remove font-face mixin
2011-10-11 19:31:25 -07:00
Mark Otto
b644390541
update navbar search form
2011-10-11 09:52:50 -07:00
Mark Otto
8c2bb99085
share new navbar in examples
2011-10-11 09:46:02 -07:00
Mark Otto
8ba005d38d
new navbar introduced to replace topbar
2011-10-11 09:44:51 -07:00
Mark Otto
70b1a6b562
Merge pull request #408 from tinyfly/grid-input-size-fix
...
adjust width calculations for formColumns to fix issue #404
2011-10-10 19:44:06 -07:00
Mark Otto
b8a4921b57
fixing form input width sizing, removing unused CSS
2011-10-10 19:38:24 -07:00
Jeff Adams
12cb0822e8
adjust width calculations for formColumns to fix issue #404
2011-10-10 14:32:59 -05:00
Mark Otto
1b19799d70
cleanup tabs and pills to prep css for new stuff
2011-10-09 23:02:34 -07:00
Mark Otto
770e7647d1
start adding examples to docs for alternate tabs and pills
2011-10-09 22:55:12 -07:00
Mark Otto
a05be0cba3
small tweak to dropdowns for autocomplete if you implement dropdowns that way
2011-10-09 22:44:45 -07:00
Mark Otto
0c1c236414
improve text color and borders for legibility
2011-10-09 22:38:48 -07:00
Mark Otto
b74776281d
new form state styles with lighter footprint
2011-10-09 22:32:19 -07:00
Mark Otto
831f279011
add extra states to the form examples
2011-10-09 22:02:40 -07:00
Mark Otto
7c98f1e1fc
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-10-09 21:25:50 -07:00
Mark Otto
dd1efdf0d5
update input prepend and append to use baseline variable
2011-10-09 21:25:28 -07:00
Mark Otto
f61fe3c474
refactor fluid layout to be more specific to not interfere with modal content while adding right sidebar option
2011-10-09 21:13:26 -07:00
Mark Otto
8f0671adfb
remove bottom margin from form in modals for temp fix"
2011-10-09 20:57:38 -07:00
Mark Otto
13cc27a6b4
modal was not centered correctly
2011-10-08 09:21:25 -07:00
Mark Otto
eddc59c634
remove select from docs form sizes
2011-10-08 00:27:52 -07:00
Mark Otto
464c2d5295
remove select from the new form grid sizes and let them inherit the default grid ones
2011-10-08 00:26:57 -07:00
Mark Otto
0692530efc
add better handling to the tables so that the thead and tbody first row can have rounded corners where applicable
2011-10-08 00:19:01 -07:00
Mark Otto
aa3a8af2d0
place popovers and twipsies above modals for use there
2011-10-08 00:16:21 -07:00
Mark Otto
7b665affd7
fix problems with scope in tables when using th in tbody
2011-10-08 00:14:38 -07:00
Mark Otto
e025de9a83
bring hover state back to the .brand element in the topbar to fix a bug
2011-10-07 23:56:14 -07:00
Mark Otto
970c51dd99
update docs to simplify first table example and introduce nested documentation
2011-10-07 23:54:50 -07:00
Mark Otto
9991f3faa1
resolve problem with nested tables having double borders
2011-10-07 23:53:32 -07:00
Mark Otto
c85e93cd90
Merge pull request #381 from smaboshe/docs
...
Docs
2011-10-07 23:27:19 -07:00
Silumesii Maboshe
df773debab
.gitignore update.
2011-10-07 06:02:02 +02:00
Silumesii Maboshe
b7d4be584a
For consistency, updated rendered 'pre' in docs to '<pre>' in the 'Presenting code' section.
2011-10-07 05:59:34 +02:00
Silumesii Maboshe
527521b502
Updated rendered '>html<' in docs to '<html>' in the 'Presenting code' section.
2011-10-07 05:56:45 +02:00
Jacob Thornton
c9669be1ec
get modal working with new data-attrs
2011-10-05 00:14:55 -07:00
Jacob Thornton
356227ef50
pass more args to placement function
2011-10-04 22:56:23 -07:00
Jacob Thornton
a2c263493a
add dropdown tab selection support
2011-10-04 22:11:44 -07:00
Jacob Thornton
a91a407bd6
start updating to data- driven js
2011-10-04 21:48:53 -07:00
Jacob Thornton
100954eeda
remake
2011-10-04 21:26:29 -07:00
Jacob Thornton
607795e37a
Merge branch 'master' of github.com:twitter/bootstrap
2011-10-04 21:25:41 -07:00
Jacob Thornton
d7e3bf722d
add selector option to alerts, update modal settings strategy
2011-10-04 21:24:59 -07:00
Mark Otto
d74dee5e0f
fixing multi select on chromium ubuntu by setting background color explicitly
2011-10-04 01:16:07 -07:00
Mark Otto
913338f930
fixing multi select on chromium ubuntu by setting background color explicitly
2011-10-04 01:15:31 -07:00
Mark Otto
088a9efa4c
merging master which has the label fix
2011-10-04 00:58:12 -07:00
Mark Otto
5cae222022
Merge branch 'master' into dev
2011-10-04 00:57:37 -07:00
Mark Otto
bdbc352066
adding new mixins
2011-10-04 00:55:35 -07:00
Mark Otto
cde17c9491
adding placeholder font-face mixin which doesn't work yet
2011-10-04 00:48:31 -07:00
Mark Otto
96dd7a2903
update variables to inlude @baseFontSize, @baseFontFamily, @baseLineHeight for easier customization; added placeholder for @primaryButtonColor, but didn't implement
2011-10-04 00:20:38 -07:00
Mark Otto
3c31d8a258
more small changes to compiled css to try things out
2011-10-03 23:50:14 -07:00
Mark Otto
45c9b489ee
scope the label back to the form element
2011-10-03 22:44:35 -07:00
Mark Otto
1b245ffdf8
make links in error messages not be blue, but instead match the text color and be bold:
2011-10-03 22:36:51 -07:00
Mark Otto
c843e202b5
make it so that checkboxes and radio options-list can have wrapping labels; needs to be cross browser tested yet
2011-10-03 22:27:15 -07:00
Mark Otto
a968d300b4
overhaul the grid CSS to make it more durable for tables and forms to use the same sizing methods; need to see about improving this in the future
2011-10-03 22:14:50 -07:00
Mark Otto
948c59ddb3
resolve issue with form fields and errors causing no space between fields with consecutive errors; needs more work, but will address later
2011-10-03 21:43:53 -07:00
Mark Otto
0caa484aeb
fix the popover bug in the app example by making the custom css more specific for .content
2011-10-03 21:36:51 -07:00
Mark Otto
2edf16c034
Merge pull request #346 from alepee/master
...
Add a white-space: nowrap; for .label elements.
2011-10-03 21:32:26 -07:00
Jacob Thornton
b41175f030
Merge pull request #362 from purcell/safe-dropdown-initialization
...
Add jquery.ready hook after defining plugin, to avoid breakage with modernizr/yepnope
2011-10-03 11:46:42 -07:00
Steve Purcell
bdbb1c92aa
Add jquery.ready hook after defining plugin, to avoid breakage when used with modernizr/yepnope
...
See https://gist.github.com/1258742 for an example, which results in the error
"TypeError: Object has no method 'dropdown' at bootstrap-dropdown.js line 31"
It looks like in these circumstances, the functions hooked into
jquery.ready get run immediately, and so applying the dropdown
behavior to specific elements before defining the 'dropdown' method
causes breakage.
2011-10-03 10:05:43 +01:00
Jacob Thornton
7e01ff8a15
Merge branch 'master' of github.com:twitter/bootstrap
2011-10-02 23:00:47 -07:00
Jacob Thornton
823b063c56
preboot.less > variables.less in docs
2011-10-02 23:00:11 -07:00
Jacob Thornton
5f52c5cfc3
Merge pull request #361 from samuelcarlton/patch-1
...
Fixed comment to show appropriate file name.
2011-10-02 22:44:33 -07:00
Jacob Thornton
0b625d0cb5
Merge branch 'master' of github.com:twitter/bootstrap
2011-10-02 22:33:02 -07:00
Jacob Thornton
f8be7a8052
remove options check in modal.js
2011-10-02 22:26:26 -07:00
Sam Carlton
6fb0eb8833
Fixed comment to show appropriate file name.
2011-10-02 20:12:50 -05:00
Antoine Lépée
a61a624e1d
white-space: nowrap; for .label
...
Add white-space: nowrap; for .label elements.
2011-09-30 14:19:56 +02:00
Jacob Thornton
fda10a609c
Merge pull request #329 from lmjabreu/master
...
make tabs plugin play well with nested tabs
2011-09-29 23:42:58 -07:00
Jacob Thornton
b2b8a78971
wait for transition to end before triggering shown event
2011-09-29 23:38:11 -07:00
Jacob Thornton
2715a1e09e
whitespace
2011-09-29 23:32:10 -07:00
Jacob Thornton
7a153ac817
Merge branch 'fix_hide_before_show_bug' of https://github.com/aaronj1335/bootstrap into aaronj1335-fix_hide_before_show_bug
2011-09-29 23:31:26 -07:00
Jacob Thornton
a0c3250b97
add note about making sure to include boostrap-twipsy before popover script
2011-09-29 23:24:34 -07:00
Jacob Thornton
fb749eee5e
show should be fals for modal default
2011-09-29 23:12:27 -07:00
Jacob Thornton
87d9343a30
@dmyers settings fix #255
2011-09-29 23:09:53 -07:00
Jacob Thornton
d2de00f1df
Merge branch 'kasperp-tab-event'
2011-09-29 23:01:06 -07:00
Jacob Thornton
a0bf8b67ff
change event to use target and relatedTarget (which more closely resembles actual event api)
2011-09-29 23:00:10 -07:00
Jacob Thornton
b827303511
changed event should be change event
2011-09-29 22:21:55 -07:00
Jacob Thornton
24b05fe94a
Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event
2011-09-29 22:18:08 -07:00
Jacob Thornton
28c770bf67
Merge pull request #332 from pamelafox/patch-2
...
JS Docs Typo
2011-09-29 11:28:37 -07:00
Mark Otto
0a6d8c30db
adding button groups and toolbars like a boss
2011-09-29 02:21:02 -07:00
Mark Otto
f54568fa31
round the corners on the search form inputs like a boss
2011-09-29 01:47:55 -07:00
Mark Otto
00204a80cf
change h4 back to lineheight * 2
2011-09-29 01:44:51 -07:00
Mark Otto
4e9849966d
update topbar dropdown arrow to match link and hover colors
2011-09-29 01:43:14 -07:00
Mark Otto
ecdba931ec
remove that test gradient
2011-09-29 01:41:03 -07:00
Mark Otto
f919f6f94f
huge update to forms, docs for the new forms, added a new link for js example to tabs/pills, add some new mixins
2011-09-29 01:40:27 -07:00
Mark Otto
2d81d65533
initial idea for handling closing of modals from whatever element you want with .js-dismiss class
2011-09-28 20:21:09 -07:00
Mark Otto
1b21d5e321
updated forms.less to have better comments while pulling out all the old classes for input elements
2011-09-28 19:15:31 -07:00
Mark Otto
6d541a6066
pulling out more stuff and fixing file name at top of file
2011-09-28 19:06:10 -07:00
Pamela Fox
1be7e09b97
Think the option is supposed to be 'keyboard' in the docs, not 'closeOnEsc'.
2011-09-28 14:56:54 -07:00
Luis Abreu
9a2440aafa
tweaked bootstrap-tabs plugin active tab selector to allow for nested tabs
2011-09-28 22:08:26 +01:00
Aaron Stacy
616f136371
return this
2011-09-23 16:09:18 -05:00
Aaron Stacy
1066ec4a79
updated if statement form
2011-09-23 13:38:08 -05:00
Aaron Stacy
d541eceb51
added bug fix for hide-before-show bug
...
this commit fixes a bug where .modal('hide') is called on a modal object before
.modal('show'). this can be viewed here:
http://jsfiddle.net/aaronj1335/7hH89/8/
(notice the JS exception that is thrown)
2011-09-23 08:46:08 -05:00
Jacob Thornton
68605bdd51
add semicolon to end of file while i think about better solution...
2011-09-22 13:13:55 -07:00
Jacob Thornton
46958b2b67
Merge branch 'master' of github.com:twitter/bootstrap
2011-09-22 12:55:34 -07:00
Jacob Thornton
41983bbe67
update table to support header and arrows
2011-09-22 12:54:57 -07:00
Jacob Thornton
323de40e80
Merge pull request #278 from adamnbowen/patch-1
...
Fixes typos of "bootstrap"
2011-09-21 10:59:58 -07:00
Adam Bowen
7c637bc51c
Fixes typos of "bootstrap"
2011-09-21 10:38:08 -03:00
Jacob Thornton
6ec1abc53c
Merge branch 'master' of github.com:twitter/bootstrap
2011-09-20 14:50:50 -07:00
Jacob Thornton
f2e15402c8
fix reflow typo - should be $element not $backdrop
2011-09-20 14:50:14 -07:00
Jacob Thornton
a7134dbf43
Merge pull request #268 from workwithnano/patch-1
...
Typo fix: "you're" to "your".
2011-09-20 10:46:26 -07:00
Nano
bc6e4b8ed2
Typo fix: "you're" to "your".
2011-09-20 14:09:28 -03:00
Jacob Thornton
01ab4caa5b
Merge branch 'master' of github.com:twitter/bootstrap
2011-09-19 20:14:33 -07:00
Jacob Thornton
0c6a2acd7e
remove var O_O
2011-09-19 20:13:51 -07:00
Jacob Thornton
75cbf0d251
Merge pull request #259 from jacobfike/master
...
fixes #258 , clicking a tab remove .active class from all elements on the page
2011-09-19 13:07:28 -07:00
Jacob Fike
9b61f71835
fixes #258 , clicking a tab remove .active class from all elements on the page
2011-09-19 11:54:20 -07:00
Jacob Thornton
fc6effae51
listen to document for ie
2011-09-18 21:13:56 -07:00
Jacob Thornton
ac8001190a
force reflow instead of relying on eventloop (firefox)
...
listen to window for escape press
2011-09-18 21:03:52 -07:00
Jacob Thornton
ba6f4f03da
lemme smang it giiiirl
2011-09-18 19:05:21 -07:00
Jacob Thornton
89c5eb4491
Merge pull request #241 from asmega/javascript_docs_favicon
...
fixing locations of favicon + apple icons
2011-09-18 13:45:12 -07:00
asmega
159ccc9de3
fixing locations of favicon + apple icons
2011-09-18 16:10:36 +01:00
Kasper Bøgebjerg Pedersen
e16de59260
Added changed event to bootstrap-tabs.js
2011-09-18 10:15:24 +02:00
Mark Otto
b5acabe4fd
fix broken topbars in javascript
2011-09-17 22:55:29 -07:00
Jacob Thornton
3eafbe5c89
change version in makefile to 1.3
2011-09-17 18:25:40 -07:00
Jacob Thornton
39a16811eb
Merge pull request #233 from cheeaun/patch-1
...
Documentation typo/error on scrollSpy.
2011-09-17 18:20:56 -07:00
Lim Chee Aun
7da0e5cc0c
Documentation typo/error on scrollSpy.
2011-09-18 08:35:34 +08:00
Mark Otto
ec8619a980
update docs to remove old stuff, update to all new classes; no more backwards compatibility
2011-09-17 17:21:43 -07:00
Jacob Thornton
7b614cfa01
allow backdrop option to accept "static" option
2011-09-17 14:20:51 -07:00
Nick Veys
2cb233319d
Adding flag to prevent backdrop click hiding modal
2011-09-17 15:08:16 -05:00
Mark Otto
732ff9ed1c
fix fluid example
2011-09-16 14:07:18 -07:00
Mark Otto
08d017592b
Fix spelling mistake in pre on js page (/ul instead of /div).
2011-09-16 13:01:49 -07:00
Jacob Thornton
f03f7da08b
fix readme link spacing
2011-09-16 12:30:30 -07:00
Jacob Thornton
cd556cfacd
remake for version 1.3
2011-09-16 11:24:45 -07:00
Jacob Thornton
c7c5ce8dcd
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
...
Conflicts:
Makefile
README.md
bootstrap.css
bootstrap.min.css
lib/bootstrap.less
lib/scaffolding.less
2011-09-16 11:24:07 -07:00
Jacob Thornton
aa43239088
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-16 11:09:46 -07:00
Jacob Thornton
f0d5caf054
check for jquery/ender on window
2011-09-16 11:09:26 -07:00
Mark Otto
e8d9eb264c
update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing
2011-09-16 10:51:44 -07:00
Mark Otto
29033316e4
Merge pull request #219 from caniszczyk/1.3-wip
...
Merge in pull request to clarify docs licensing as CC BY 3.0
2011-09-16 10:37:52 -07:00
Chris Aniszczyk
08b6c47ad7
Clarify documentation license to be CC BY 3.0
...
Signed-off-by: Chris Aniszczyk <zx@twitter.com >
2011-09-16 10:30:47 -07:00
Mark Otto
597590c15d
add active class back to tabs
2011-09-16 10:15:45 -07:00
Mark Otto
e663cfb43f
fix tabs jitter bug when there is no active class
2011-09-16 10:14:35 -07:00
Mark Otto
c579e4d550
expanding comment in application.js
2011-09-16 09:55:12 -07:00
Mark Otto
8ff18a9ffc
fixing conflict and recompiling
2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b
updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having
2011-09-16 09:41:58 -07:00
Jacob Thornton
d1b594db7a
$(document).ready instead of $(function() {}) for ender support
2011-09-15 23:16:06 -07:00
Jacob Thornton
472632ba51
mv 1.3.0 file names to plane bootstrap.css for submodulers
2011-09-15 23:09:56 -07:00
Jacob Thornton
5675d8f00a
remove table border seperate for ie
2011-09-15 22:40:50 -07:00
Jacob Thornton
39aca918d0
move clearfix logic back onto clearfix class for ie7
2011-09-15 22:36:32 -07:00
Jacob Thornton
68f89d109f
little fixes for ie 7
2011-09-15 22:27:41 -07:00
Jacob Thornton
8896497ea8
update attributes for js and make tooltips reposition on resize
2011-09-15 21:19:39 -07:00
Mark Otto
dcf6a051e7
allow multi-select lists in forms
2011-09-14 08:58:20 -07:00
Mark Otto
32a690af98
apply clearfix to appended input pattern to clear the floats
2011-09-13 22:23:08 -07:00
Mark Otto
01d9cd88e8
updated browsers image
2011-09-13 20:24:30 -07:00
Mark Otto
2af3eb6ce2
fix tab-content and pre funkiness, convert p in tab content to div
2011-09-13 14:47:18 -07:00
Mark Otto
121b62d54e
updates to docs to include more example html, include links to javascript docs where necessary
2011-09-13 10:08:24 -07:00
Mark Otto
35bc3ae8d2
remove theming section from docs
2011-09-13 09:44:43 -07:00
Mark Otto
1d50fa77e4
adding quick and dirty favicons and touch icons for iOS
2011-09-13 09:35:43 -07:00
Mark Otto
bc2ae90e3a
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 22:19:44 -07:00
Mark Otto
5249483850
comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :"
2011-09-12 22:19:28 -07:00
Jacob Thornton
e34bc6e294
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 21:06:53 -07:00
Jacob Thornton
5ee11ec8bd
fix docs for opera
2011-09-12 21:06:29 -07:00
Mark Otto
206334ba70
remove theme.less and split preboot.less to mixins.less and variables.less to isolate customization from function
2011-09-12 20:07:26 -07:00
Mark Otto
2978934bd5
remove adaptive, recomment theme.less to avoid comments in compiled
2011-09-12 19:40:48 -07:00
Mark Otto
218976a7d8
resolve conflict
2011-09-12 19:00:59 -07:00
Mark Otto
3f64aaf82b
fix topbar link with button bug
2011-09-12 19:00:44 -07:00
Mark Otto
427a001c47
Link Twitter account in readme
2011-09-12 14:33:39 -07:00
Mark Otto
a218475ffc
Edited README.md via GitHub
2011-09-12 14:33:00 -07:00
Jacob Thornton
4c5320b18f
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
...
Conflicts:
bootstrap-1.3.0.css
2011-09-12 14:29:29 -07:00
Jacob Thornton
997c2cd6a0
make file shouldn't say file built successfully if error occurs
2011-09-12 14:28:26 -07:00
Mark Otto
8f5f35e6db
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 13:32:58 -07:00
Mark Otto
7af4a4cfa1
really make modals cover topbars and not cover the modal itself
2011-09-12 13:32:46 -07:00
Mark Otto
bc41c58472
make modals cover topbars
2011-09-12 13:31:58 -07:00
Jacob Thornton
ad87e11f03
add version number to js comments
2011-09-12 11:15:32 -07:00
Jacob Thornton
7396cb8c51
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 11:14:35 -07:00
Jacob Thornton
1645b57efe
prevent default for hover click
2011-09-12 11:14:09 -07:00
Mark Otto
b729ade54f
quick fix for .clearfix with unqualified selector in forms.less
2011-09-12 09:25:57 -07:00
Mark Otto
72ce695cfd
add links
2011-09-12 09:24:54 -07:00
Mark Otto
6a5fb52bb1
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 08:58:46 -07:00
Jacob Thornton
89465f8ce1
few more js doc wording changes
2011-09-12 00:03:24 -07:00
Jacob Thornton
cc05bce597
docs coppyy
2011-09-11 23:56:44 -07:00
Jacob Thornton
44e2c73668
data-attribute="x" annndddd... now all js with ie7+ support
2011-09-11 23:48:43 -07:00
Jacob Thornton
fcf816a236
index to use data attr for scrollspy initilizing
2011-09-11 23:36:59 -07:00
Jacob Thornton
02d668fd2e
data-attributes need values to be picked up by jquery in ie8 and below :/
2011-09-11 23:29:34 -07:00
Jacob Thornton
dcf9aabc44
get all spec passing again
2011-09-11 22:58:51 -07:00
Mark Otto
0c46ade4d0
Merge pull request #194 from samsoffes/patch-1
...
Add pretty code coloring to readme
2011-09-11 22:15:49 -07:00
Mark Otto
88f2f848b3
change modal buttons back to be primary first
2011-09-11 22:02:26 -07:00
Sam Soffes
86bb0733a2
Add pretty code coloring to readme
2011-09-11 21:56:54 -07:00
Mark Otto
c73533ac73
fix problem with error styles in forms that clashed with alert-messages by qualifying the .error with .clearfix
2011-09-11 21:43:23 -07:00
Mark Otto
0afba3867d
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-11 21:13:09 -07:00
Mark Otto
b77e3e2f30
theme.less file cleanup; fixing blockquotes in wells
2011-09-11 21:12:55 -07:00
Jacob Thornton
f8aaec5260
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-11 21:04:01 -07:00
Jacob Thornton
200f5817ba
method invocation jqueryui style
2011-09-11 21:03:17 -07:00
Mark Otto
c876835a02
update preboot comments about color scheme
2011-09-11 20:47:35 -07:00
Mark Otto
96e59eed20
update theme.less todos and darken link hover color more
2011-09-11 20:46:40 -07:00
Mark Otto
af2223efb1
remove border from dropdowns in topbar to prevent it from looking 1px off
2011-09-11 20:38:45 -07:00
Mark Otto
b7c9a639d6
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-11 20:17:49 -07:00
Mark Otto
bd3448cf78
make input prepend styles look a bit better
2011-09-11 20:17:34 -07:00
Jacob Thornton
e255b4f51d
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-11 20:09:20 -07:00
Jacob Thornton
173be3f1e8
change hella js... broke all the tests. i <3 wip
2011-09-11 20:08:43 -07:00
Mark Otto
2674210ff0
move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7
2011-09-11 20:00:45 -07:00
Mark Otto
6bc867ed5c
change template diagrams to be .media-grid
2011-09-11 19:53:48 -07:00
Mark Otto
53812bc2d8
remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles
2011-09-11 18:44:25 -07:00
Mark Otto
f3f60b21a6
oops, double commit last time; apply fixes to make select elements line up in IE7 with their labels, but no height fix
2011-09-11 18:09:01 -07:00
Mark Otto
18a5ef83ef
fix legends in ie7
2011-09-11 18:01:29 -07:00
Mark Otto
3ad034ea96
fix legends in ie7
2011-09-11 17:36:15 -07:00
Mark Otto
1ae603fda0
make the less compile docs text now have widows, fix broken table markup
2011-09-10 23:05:30 -07:00
Mark Otto
62edafa1a4
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 22:55:59 -07:00
Jacob Thornton
d9cbcfc20d
wait for window load event before positioning images, doi
2011-09-10 22:54:47 -07:00
Mark Otto
0c656e29fc
updated styles for the media grids
2011-09-10 22:50:59 -07:00
Jacob Thornton
b781f6ca59
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 22:49:05 -07:00
Jacob Thornton
a5964b07b1
add static sizes for images so tooltips get right size on load
2011-09-10 22:48:39 -07:00
Mark Otto
d0f7637a7d
adding more media sizes
2011-09-10 22:47:38 -07:00
Jacob Thornton
68865002af
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 22:44:22 -07:00
Jacob Thornton
2655117747
add some notes on installing from command line and from makefile
2011-09-10 22:43:52 -07:00
Mark Otto
3755ee158f
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 22:31:55 -07:00
Mark Otto
40693f2618
adding media grid styles
2011-09-10 22:31:43 -07:00
Jacob Thornton
709789d16d
clicking open dropdown shoud close it
2011-09-10 22:28:17 -07:00
Jacob Thornton
7e5b304dbf
add liscense to js files
2011-09-10 22:24:31 -07:00
Jacob Thornton
c40e0de3c1
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
...
Conflicts:
docs/index.html
2011-09-10 22:17:37 -07:00
Jacob Thornton
64176caa97
add bootstrap-scrollspy
2011-09-10 22:14:57 -07:00
Mark Otto
536fe2c743
add footer to js docs
2011-09-10 21:54:11 -07:00
Mark Otto
8130b113bb
add stubbed out table for how to compile less
2011-09-10 21:50:12 -07:00
Mark Otto
6a74a313a8
tweak css for topbar to bring back z-index fix; update javascript markup and some heading text
2011-09-10 21:10:18 -07:00
Mark Otto
3407ed948d
resolved conflict
2011-09-10 21:06:09 -07:00
Mark Otto
00b7dff359
overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out
2011-09-10 21:05:23 -07:00
Jacob Thornton
a71d5d8e99
add the dhg flavor back
2011-09-10 19:01:16 -07:00
Jacob Thornton
235246d6fc
not feeling the slide in
2011-09-10 18:26:37 -07:00
Jacob Thornton
9c76070cbd
rework the transitions for the modal a bit
2011-09-10 18:13:37 -07:00
Jacob Thornton
57a8672b77
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 16:51:03 -07:00
Jacob Thornton
23d2fed905
tooltip 1 word
2011-09-10 16:50:42 -07:00
Mark Otto
0914027609
spelling mistake
2011-09-10 15:32:06 -07:00
Mark Otto
f556da42fc
zebra stripe that shit
2011-09-10 15:30:42 -07:00
Mark Otto
a95a0ed71c
conflict
2011-09-10 15:29:53 -07:00
Mark Otto
99ede580cf
adding code and .label sections to type section
2011-09-10 15:29:38 -07:00
Jacob Thornton
a8d4475827
adds twipsy js to regular index for positioning
2011-09-10 14:52:45 -07:00
Jacob Thornton
39fc13093e
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 14:04:51 -07:00
Jacob Thornton
5f65df9e2d
add some more events to alerts and modal and update docs
2011-09-10 14:04:22 -07:00
Mark Otto
6d99ae5659
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 13:18:24 -07:00
Mark Otto
e5b4a1ced5
adding .brand to topbar for alternative to using an h3 for wordmark; spelling mistakes fixed
2011-09-10 13:18:10 -07:00
Jacob Thornton
5bc455d370
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-10 13:17:43 -07:00
Jacob Thornton
1041977d0a
finish up rounding out tests for all js plugins
2011-09-10 13:17:08 -07:00
Mark Otto
c797cb61a6
conflict
2011-09-10 13:04:17 -07:00
Mark Otto
5b16150159
trying to solve firefox active outline, make .input less specific
2011-09-10 13:00:07 -07:00
Jacob Thornton
48aa209348
more tests, more js goodness
2011-09-10 12:49:21 -07:00
Jacob Thornton
79d5f90713
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
...
Conflicts:
bootstrap-1.3.0.css
2011-09-09 22:48:57 -07:00
Jacob Thornton
5f4e30ed1d
move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like
2011-09-09 22:47:49 -07:00
Mark Otto
0b43bc9bb9
adding docs for customizing the grid
2011-09-09 21:50:41 -07:00
Mark Otto
a0c3d48342
fix the stacked form legend style
2011-09-09 21:43:19 -07:00
Mark Otto
a40690a17c
fix the grid before 1.3.0 drops soon
2011-09-09 20:48:45 -07:00
Mark Otto
c56e229ed7
start updating the grid docs for customizing it
2011-09-09 20:47:38 -07:00
Mark Otto
dad058326e
add version # to docs
2011-09-09 16:00:59 -07:00
Mark Otto
53135839f5
adding nested columns to the grid section
2011-09-09 10:04:07 -07:00
Mark Otto
df3ca4d94a
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-09 00:03:01 -07:00
Mark Otto
1d4e345ec1
bug fixing
2011-09-09 00:02:47 -07:00
Jacob Thornton
b086d94253
remove aria-control stuff
2011-09-09 00:00:03 -07:00
Mark Otto
3a99b98ad9
make dropdown menus appear above other elements on the page with a z-index
2011-09-08 23:08:38 -07:00
Mark Otto
1a8fb2dbf7
resolve conflict
2011-09-08 23:02:13 -07:00
Mark Otto
ba08055a7b
update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding
2011-09-08 23:01:28 -07:00
Jacob Thornton
5960711d0f
some more js love - update the docs with tabs/pills plugin
2011-09-08 20:21:03 -07:00
Jacob Thornton
346122a0c7
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-08 19:13:26 -07:00
Jacob Thornton
8d2f14d8d0
tabssss
2011-09-08 19:13:08 -07:00
Mark Otto
c474f996a9
tweaks to table styles to make them use @basefont and @baseline
2011-09-08 10:47:05 -07:00
Mark Otto
1c03a07591
bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere
2011-09-08 10:36:56 -07:00
Mark Otto
1af96b9a58
what up breadcrumbs, we added you
2011-09-08 09:43:37 -07:00
Mark Otto
f6d20a8939
remove active state from dropdown
2011-09-06 23:32:20 -07:00
Mark Otto
daf903f847
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-06 23:30:45 -07:00
Mark Otto
d640c3b14b
update diagrams to use smaller border radius, add new container-app example
2011-09-06 23:30:21 -07:00
Jacob Thornton
fb8987148a
move javascript from examples into docs
2011-09-06 23:20:56 -07:00
Mark Otto
d0882c580d
first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown
2011-09-06 21:54:00 -07:00
Mark Otto
dfbb591953
addng docs for the themes stuff and examples
2011-09-04 14:02:56 -07:00
Jacob Thornton
43b01d1b80
Merge pull request #149 from yury/version_var
...
use VERSION var in build script
2011-09-03 23:12:36 -07:00
Mark Otto
7882f0f64b
adding temp theme file to help with customization; still needs work
2011-09-03 22:53:21 -07:00
yury
fe8cb55cc1
use @VERSION var in build script
2011-09-03 20:10:42 +04:00
Mark Otto
0b70eb630e
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-02 23:35:44 -07:00
Mark Otto
bfa5ce70d4
updated address examples
2011-09-02 23:35:28 -07:00
Mark Otto
df8eccbfe1
adding support for and example ul in block-messages
2011-09-02 23:28:01 -07:00
Jacob Thornton
cf23dc4f24
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-02 23:16:06 -07:00
Jacob Thornton
2883888a57
adds small js section to docs index
2011-09-02 23:15:38 -07:00
Mark Otto
168551cd4f
adding link support to regular text in the topbar
2011-09-02 23:09:59 -07:00
Mark Otto
4dbd2334bd
updated hero example, added fluid example, resolved issue with tabs and fluid nav
2011-09-02 23:01:38 -07:00
Mark Otto
6d118411e1
resolve conflict
2011-09-02 22:09:49 -07:00
Mark Otto
1625341391
fix repeated margin-left
2011-09-02 22:09:12 -07:00
Mark Otto
5c3f0e32e6
updated container mixin to be fixed-container instead so we can keep the .container in scaffolding while removing the repeated code
2011-09-02 22:08:38 -07:00
Mark Otto
d5e42cf81a
tweak readonly, disabled, and uneditable form elements
2011-09-02 21:54:11 -07:00
Jacob Thornton
3c9c85b1ed
Merge branch 'js-examples' into 1.3-wip
...
Conflicts:
bootstrap-1.2.0.css
2011-09-02 21:06:49 -07:00
Jacob Thornton
41242b5ce6
more js chagnes
2011-09-02 21:06:20 -07:00
Jacob Thornton
0e13f8dca1
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
...
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
c4481b54a8
improve CSS properties for centering content, the container, and fluid container so as to not override properties where possible
2011-09-02 21:00:01 -07:00
Jacob Thornton
2589c0ac4e
welcome to 1.2.0
2011-09-02 15:07:12 -07:00
Mark Otto
298e1b59bb
fix broken checkbox in ie7
2011-09-02 12:46:47 -07:00
Mark Otto
2f4c84bba9
remove rounded corners on buttons from IE9 so gradients don't bleed out
2011-09-02 12:35:41 -07:00
Mark Otto
cb244d5d51
fix docs.css spacing, add gradient support for ie9 back
2011-09-02 12:31:14 -07:00
Mark Otto
e0722fcb1b
cleanup docs and fix gradient in masthead
2011-09-02 12:24:28 -07:00
Mark Otto
8c1e60c638
add reset filter to preboot for turning off gradients in IE when necessary; make :disabled [disabled] for crossbrowser usage
2011-09-02 12:19:43 -07:00
Mark Otto
ac57331323
resolve
2011-09-02 12:02:36 -07:00
Mark Otto
b9a53b1468
button tweaks
2011-09-02 12:02:20 -07:00
Jacob Thornton
60409660d7
\9 for 8 or less ie
2011-09-02 12:01:41 -07:00
Mark Otto
6638f87f50
resolve conflicts
2011-09-02 11:54:17 -07:00
Mark Otto
62f8916407
update the file input to undo the damage of the generic input selector
2011-09-02 11:53:58 -07:00
Jacob Thornton
db43777ddf
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
...
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
2011-09-02 11:49:41 -07:00
Jacob Thornton
3f242bc70c
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
...
Conflicts:
bootstrap-1.2.0.css
2011-09-02 11:49:03 -07:00
Mark Otto
a4dc2c8955
merge in master after merging a pull request, add comment
2011-09-02 09:52:33 -07:00
Mark Otto
f29c8abcbb
Merge pull request #138 from pthrasher/master
...
Fix for popover issue from #136
2011-09-02 09:51:32 -07:00
pthrasher
55698b303d
ran make build
2011-09-02 12:48:32 -04:00
Mark Otto
b18633ee14
cleanup and tweaks
2011-09-02 09:48:31 -07:00
pthrasher
5960afc349
incorporated idea from @markdotto in #138
2011-09-02 12:45:03 -04:00
Mark Otto
3f22925144
remove fixed width from topbar form to allow for applying classes to resize it
2011-09-02 09:35:26 -07:00
pthrasher
ce1d1c2146
ran make build, issues #136 and #138
2011-09-02 11:19:05 -04:00
pthrasher
e6ffd3a86f
Fix for issue #136 . Now nests fine in both layouts.
2011-09-02 10:43:26 -04:00
Mark Otto
db830140ee
add old dropdown support to tabs dropdowns
2011-09-02 01:03:16 -07:00
Mark Otto
411e324340
fix dropdown bug, remove second topbar from docs now
2011-09-02 00:58:07 -07:00
Mark Otto
46e4fb3133
remove active state from buttons by moving the :active before :disabled
2011-09-02 00:56:03 -07:00
Mark Otto
251882892f
resolve conflicts
2011-09-02 00:52:22 -07:00
Mark Otto
fa94b264fa
add temp second topbar to nav section, fix it's compatibility issues
2011-09-02 00:50:05 -07:00
Jacob Thornton
2a5d829c4a
add doc styles back to topbar-inner
2011-09-02 00:47:06 -07:00
Jacob Thornton
813c55489f
fix for dropdown
2011-09-02 00:42:22 -07:00
Jacob Thornton
75afad4325
remake
2011-09-02 00:32:57 -07:00
Jacob Thornton
ec82b613d3
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
...
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
2011-09-02 00:32:09 -07:00
Jacob Thornton
462287e25e
div > ul ftw
2011-09-02 00:31:19 -07:00
Mark Otto
5ef4519ca8
move comment so less compiles
2011-09-02 00:29:54 -07:00
Mark Otto
1b06f3e84e
resolve conflict
2011-09-02 00:29:27 -07:00
Mark Otto
479e0ccd6b
add backwards compatability for dropdowns in topbar
2011-09-02 00:28:54 -07:00
Jacob Thornton
c098225cd5
this works O_O
2011-09-02 00:26:58 -07:00
Jacob Thornton
3f1706f5f6
> seems to work O_O
2011-09-02 00:21:55 -07:00
Jacob Thornton
0ed544a82e
backwards compat for old nav o_O
2011-09-02 00:17:13 -07:00
Mark Otto
02abdd6037
remove inset shadow from disabled buttons
2011-09-02 00:02:44 -07:00
Jacob Thornton
0159524413
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
...
Conflicts:
bootstrap-1.2.0.css
2011-09-01 22:54:59 -07:00
Jacob Thornton
72da5dd54d
for html5 style all inputs -- then unstyle checkbox, radio, button, reset, submit
2011-09-01 22:53:24 -07:00
Mark Otto
0cb6804b69
merging in remote and recompiling
2011-08-31 16:27:28 -07:00
Mark Otto
6258832776
spelling mistakes and undo of one comment
2011-08-31 16:26:47 -07:00
Jacob Thornton
f6a4dd95b6
try daves background thing again...
2011-08-31 10:55:53 -07:00
Jacob Thornton
90d174a34d
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
...
Conflicts:
README.md
bootstrap-1.2.0.css
2011-08-30 23:37:46 -07:00
Jacob Thornton
4fb1c5bd4b
rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html
2011-08-30 23:34:19 -07:00
Jacob Thornton
588cb1c06d
revert dhg mdo suggestion for fixing ie
2011-08-30 23:25:37 -07:00
Jacob Thornton
49e343c464
ie7 background toggle open
2011-08-30 23:08:34 -07:00
Jacob Thornton
2ed869c2ee
remove * hack for ie7 + remove -1 margin bug for ie7
2011-08-30 23:03:01 -07:00
Mark Otto
44b18f4911
Merge pull request #126 from DHS/fix-select-labels
...
Fixed duplicate element ids in documentation
2011-08-30 18:26:11 -07:00
Mark Otto
89b5fd949b
Merge pull request #125 from DHS/readme-spelling
...
Fixed readme spelling mistake, closes #123
2011-08-30 18:25:32 -07:00
Mark Otto
ed1139e838
change type of comment
2011-08-30 08:27:55 -07:00
David Haywood Smith
55022228bc
Fixed duplicate element ids
...
Also updated labels where required
2011-08-30 11:47:40 +01:00
David Haywood Smith
a16dfb735a
Fixed readme spelling mistake, closes #123
2011-08-30 11:19:46 +01:00
Jacob Thornton
afec7859cc
fix background color for ie7 -- negative margin bug still there though ;_;
2011-08-29 22:43:40 -07:00
Jacob Thornton
efd6fd609c
fix open ui for ie 7
2011-08-29 22:36:05 -07:00
Jacob Thornton
fc0471a450
lulz nbsp
2011-08-29 22:34:13 -07:00
Jacob Thornton
e8f1ae0073
btn's need &nbps; seperating them for ie7
2011-08-29 21:52:45 -07:00
Mark Otto
d42a00c19d
remove repeated table reset
2011-08-29 21:42:44 -07:00
Mark Otto
7070d44aed
adding more grid docs
2011-08-29 21:41:32 -07:00
Jacob Thornton
589204803b
remove duplicate defined btn class O_O
2011-08-29 21:41:12 -07:00
Mark Otto
f17fc367f7
le merging conflicts
2011-08-29 21:26:53 -07:00
Mark Otto
654cc5ad3f
resolving deltas between that epic css selector specifity pull request and latest changes here
2011-08-29 21:24:00 -07:00
Jacob Thornton
b4a84e1e7d
window -> body for ie
2011-08-28 17:52:55 -07:00
Jacob Thornton
7b041f8419
move removeClass up
2011-08-28 17:52:00 -07:00
Jacob Thornton
58cc70531a
drop top position a bit
2011-08-28 17:50:14 -07:00
Jacob Thornton
484ed088fc
blah
2011-08-28 17:45:57 -07:00
Jacob Thornton
ebff554430
remake with opacity thin
2011-08-28 17:42:09 -07:00
Jacob Thornton
9059a72bf8
try using tricker opacity thingy
2011-08-28 17:40:25 -07:00
Jacob Thornton
d8d6e40097
listen to delegation for ie
2011-08-28 17:32:31 -07:00
Jacob Thornton
f1d17223b8
wrap for domready
2011-08-28 16:47:38 -07:00
Jacob Thornton
a0cb72f9ae
change window to 'body'
2011-08-28 16:36:44 -07:00
Jacob Thornton
1a5f8205ff
alpha for ie
2011-08-28 16:23:57 -07:00
Jacob Thornton
0b1d2cc03c
change backdrop for ie
2011-08-28 14:06:37 -07:00
Jacob Thornton
c263504709
add google code prettify
2011-08-28 13:30:04 -07:00
Jacob Thornton
ed96f181c8
add topbar dropdown js
2011-08-27 21:46:50 -07:00
Jacob Thornton
e91353f362
blahsdfasldflaskdfj
2011-08-27 18:09:03 -07:00
Jacob Thornton
a00b849a51
rebuild and change data-attr to have priority over options
2011-08-27 18:05:10 -07:00
Jacob Thornton
e05d39d4cc
make generic fade animation css class
2011-08-27 18:03:01 -07:00
Jacob Thornton
2ee7c20692
adds popover js
2011-08-27 17:22:49 -07:00
Mark Otto
650251228b
redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere
2011-08-27 15:30:18 -07:00
Jacob Thornton
038a9809c4
remake
2011-08-27 13:06:01 -07:00
Jacob Thornton
11721f376d
add boostrap-twipsy and bootstrap-alerts
2011-08-27 13:03:06 -07:00
Mark Otto
315af8e18b
Edited readme to include the versioning approach we'll be striving to use
2011-08-27 00:49:48 -07:00
Jacob Thornton
b68b53dca2
rename escape method
2011-08-27 00:42:20 -07:00
Jacob Thornton
1cbda504a0
clean up show logic
2011-08-27 00:28:58 -07:00
Jacob Thornton
db706a2596
white space junk
2011-08-27 00:19:05 -07:00
Jacob Thornton
52c624079e
sometimes i get emotional about semicolons
2011-08-27 00:07:42 -07:00
Jacob Thornton
24c4ca0391
display none for inactive modals
2011-08-27 00:03:11 -07:00
Jacob Thornton
c26eb016fb
starting up bootstrap-js...
2011-08-26 23:57:35 -07:00
Mark Otto
b552281558
make dropdowns in the topbar black again
2011-08-26 23:18:39 -07:00
Mark Otto
4f67e135dc
adding dropdowns to tabs by refactoring the shizzzz out of them
2011-08-26 20:38:23 -07:00
Jacob Thornton
df8b65445c
small typo in offset generation
2011-08-26 19:31:50 -07:00
Mark Otto
b9c9f1d8d6
Merge remote branch 'origin/master' into 1.2-wip
2011-08-26 16:08:03 -07:00
Mark Otto
a5e6265726
remove common-table class in the docs
2011-08-25 15:53:25 -07:00