rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-13 01:08:58 +01:00
Code Issues Actions Packages Releases Activity
13,349 Commits 108 Branches 89 Tags 553 MiB
e3eaeb96e8
Commit Graph

13349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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