Commit Graph

4634 Commits

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