Commit Graph

945 Commits

Author SHA1 Message Date
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
fbd8edcace Rebuild bootstrap 2012-03-28 01:50:23 +02:00
Arnold Daniels
f1c0778aee Rebuild bootstrap 2012-03-28 01:43:32 +02:00
Arnold Daniels
a31945f0e9 Updated bootstrap 2012-03-28 01:35:29 +02:00
Arnold Daniels
67f39e1a79 Removed git merge comment from javascript doc 2012-03-28 01:32:06 +02:00
Arnold Daniels
563016cf44 Made bootstrap.css 2012-03-19 16:58:18 +01:00
Arnold Daniels
a4e800fa43 Build bootstrap + docs 2012-02-23 18:13:28 +01: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
eff81df820 Build bootstrap + docs 2012-02-21 23:48:21 +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
61bc092e63 Build bootstrap + docs 2012-02-21 23:41:10 +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
f3e15176be Changed docs.css, so it doesn't seperate sections using margin 2012-02-21 23:41:09 +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
Jacob Thornton
e26da36b9a remove 2.0-wip ref 2012-02-01 22:30:51 -08:00
Jacob Thornton
e1deb4e767 fix makefile to reset zips 2012-02-01 22:27:46 -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
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
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