Commit Graph

1663 Commits

Author SHA1 Message Date
Arnold Daniels
d0a50f3bc2 Using 'p' instead of 'j' in version v2.0.0-p0 2013-07-12 13:42:15 +02:00
Arnold Daniels
0b589bcaeb Rebuild bootstrap 2012-04-03 23:50:31 +02:00
Arnold Daniels
3946a836fd Merge branch 'dev.uneditable' 2012-04-03 14:12:43 +02:00
Arnold Daniels
668588c278 Changes uneditable elements
Uneditable input/textarea always `cursor:text`
Overflow hidden / nowrap for uneditable input
2012-04-03 14:12:23 +02:00
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
ea5a1a1214 Merge branch 'dev.uneditable' 2012-03-28 01:50:04 +02:00
Arnold Daniels
cca8c2f37f Fixed height for uneditable-textarea with rows attribute 2012-03-28 01:48:35 +02:00
Arnold Daniels
01cd2f0a9f Fix margin-left for .spanX on .uneditable-textarea 2012-03-28 01:48:35 +02:00
Arnold Daniels
f1c0778aee Rebuild bootstrap 2012-03-28 01:43:32 +02:00
Arnold Daniels
fbb07db876 Merge branch 'dev.uneditable' 2012-03-28 01:42:58 +02:00
Arnold Daniels
402aa82341 Fixed height for uneditable-textarea with rows attribute 2012-03-28 01:42:38 +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
f921fd0861 Merge branch 'dev.uneditable' 2012-03-28 01:28:31 +02:00
Arnold Daniels
127a4ca1e3 Fix margin-left for .spanX on .uneditable-textarea 2012-03-28 01:28:02 +02:00
Arnold Daniels
5c9d752d6a Merge branch 'dev.forms' 2012-03-28 01:25:21 +02:00
Arnold Daniels
ee7679ec96 No bottom margin for input-append, input-prepend 2012-03-28 01:25:06 +02:00
Arnold Daniels
563016cf44 Made bootstrap.css 2012-03-19 16:58:18 +01:00
Arnold Daniels
b092237cbc Merge branch 'dev.tabbable'
Conflicts:
	less/navs.less
2012-03-19 16:58:00 +01:00
Arnold Daniels
b053e4e0e6 Set padding for tabs if tabbable is a container 2012-03-19 16:56:45 +01:00
Arnold Daniels
1eef8b449d Added CSS for table row-actions 2012-03-08 16:33:34 +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
93688552a2 Fix for margin form in modal 2012-02-22 00:03:28 +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
ddb03c21ee Added .table-actions for buttons under a table 2012-02-21 23:46:33 +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
9ad493e724 Fixed make release 2012-02-21 23:41:11 +01:00
Arnold Daniels
61bc092e63 Build bootstrap + docs 2012-02-21 23:41:10 +01:00
Arnold Daniels
601bffc748 Added make release to build release branch 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
76bc3617bc Improve form styles
Combining horizontal and vertical form
Wells in forms
Vertical align for checkbox/radio in label
Smaller labels
2012-02-21 23:41:09 +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
a30bad4ab5 Seperate sections (with a 40px margin) 2012-02-21 23:41:09 +01:00
Arnold Daniels
05f0f00254 More subtle hover effect for action links 2012-02-21 23:41:09 +01:00
Arnold Daniels
76f5babeee Better solution for overflowing .tab-content
Using `overflow: hidden` instead of `display: table` as suggested by @necolas
Fix the border between tabs and content for `.tabs-right`
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
8298a16ffa Don't use ouline for tabs and pills 2012-02-21 23:41:09 +01:00
Arnold Daniels
4f5366c7ee Fix issue with using tabbable in tabbable
Use `.tabbable > .nav-tabs` (etc)
2012-02-21 23:41:09 +01:00
Arnold Daniels
fde3f4be37 Added .page-header .header-actions 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
8c1f94f0af Improve form styles
Combining horizontal and vertical form
Wells in forms
Vertical align for checkbox/radio in label
Smaller labels
2012-02-13 13:58:39 +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