Arnold Daniels
fcfb33b3e0
Merge branch 'dev.fileupload'
...
+ build bootstrap
Conflicts:
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/javascript.mustache
less/bootstrap.less
2012-04-03 13:57:39 +02:00
Arnold Daniels
32bd4d9f98
Added fileupload
...
Added fileupload.less and bootstrap-fileupload.js
Added file/image upload to docs
2012-04-03 13:38:58 +02:00
Arnold Daniels
67f39e1a79
Removed git merge comment from javascript doc
2012-03-28 01:32:06 +02:00
Arnold Daniels
692a67bbe7
Merge branch 'dev.editor'
2012-02-23 18:13:02 +01:00
Arnold Daniels
d707f5232a
Added css for .editor form element
...
Also added `.editor-ckeditor` for style when using ckeditor
Added editor textarea to docs
2012-02-23 18:12:02 +01:00
Arnold Daniels
ce8b3acc6c
Merge branch 'dev.uneditable'
...
Conflicts:
less/forms.less
2012-02-21 23:47:40 +01:00
Arnold Daniels
7f550882d6
There are 15 javascript plugins
2012-02-21 23:45:49 +01:00
Arnold Daniels
dc77bd68d6
Implemented table-href
...
Added bootstap-table-href.js
Added css for `td[data-href]` in tables.less
Conflicts:
Makefile
docs/templates/layout.mustache
docs/templates/pages/javascript.mustache
2012-02-21 23:45:34 +01:00
Arnold Daniels
e477955786
There are now 14 javascript plugins
2012-02-21 23:41:10 +01:00
Arnold Daniels
853c9b0613
Added inputmask javascript plugin
2012-02-21 23:41:10 +01:00
Arnold Daniels
909ece76d4
Added placeholder js plugin
2012-02-21 23:41:10 +01:00
Arnold Daniels
56dd09da45
Added support for .tabbable-bordered
...
Using padding instead of margin for spacing between tabs and tab-content
Set 10px padding for tabs below and 20px for others
Added example to docs
2012-02-21 23:41:09 +01:00
Arnold Daniels
34335a5935
Added uneditable form and textarea
...
Adding `.uneditable-form`
Adding `.uneditable-textarea`
Changed padding for uneditable inputs
Make uneditable-input and uneditable-textarea look like editable counterparts
2012-02-21 23:39:47 +01:00
Arnold Daniels
0c37f1de63
New feature: iconic icons
...
Added iconic.less
Added iconic fonts
Section 'iconic icons' in documentation
Added copying fonts to Makefile
2012-02-13 11:37:59 +01:00
Arnold Daniels
9a1dd55617
Added .page-alert
...
Know those nice little alerts after you save your profile? With `.page-alert` the alert will be shown on top op your page.
2012-02-13 11:37:09 +01:00
Arnold Daniels
0d131f3d5f
Added 'Extended by Jasny' to docs
...
Added h2 on index page
Added jasny logo
Changed link on index page to jasny bootstrap project
Changed title
2012-02-13 11:37:08 +01:00
Arnold Daniels
9399807717
Fixed issue with tabbable, that contents wraps around tabs
...
Note that the seperator for `.tabs-right` doesn't reach the bottom. The width
of tab-content can't be guaranteed, so we can set `border-right`.
Changed docs: put large text in tab 'Section 3'
2012-02-13 11:37:08 +01:00
Arnold Daniels
e2aa1de7b7
New feature: action links .act
...
Added action-links.less
Added action links to documentation
Action links in `.form-actions` are as high as buttons
2012-02-13 11:37:07 +01:00
Jacob Thornton
c8c4d5b392
fix alert tests + add show option back to modals
2012-02-06 00:17:31 -08: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
Hendy Tanata
906028abdb
Fix alerts JavaScript code example.
2012-02-02 20:45:58 -08:00
Mikael Brevik
8c0b47a6a8
Fixed duplicate and wrong IDs and label fors in forms.
2012-02-02 14:09:27 +01:00
Mark Otto
c1f0da7cce
Merge branch 'master' of github.com:twitter/bootstrap
2012-02-01 22:13:26 -08: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
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
e36496fd84
Merge pull request #1490 from amenonsen/master
...
Typo fix: Sprited => Striped
2012-02-01 17:59:19 -08:00
Mark Otto
2fd6a2e9f6
remove excess td in less docs
2012-02-01 17:55:32 -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
Jacob Thornton
59016d2198
only add the anyalytics to production
2012-02-01 16:38:58 -08: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
Mark Otto
c8fad25902
update upgrade page
2012-01-31 17:24:20 -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
Mark Otto
013de18e6b
remove warning alert on less docs
2012-01-31 14:00:26 -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
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
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
