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