Mark Otto
3a27b4e6f6
remake again after pull
2012-05-15 09:07:55 -07:00
Mark Otto
a9d4b667ff
finish fixing uneditable-input and remake
2012-05-15 09:07:19 -07:00
Mark Otto
ecf84bdac5
correct regressions against 2.0.3
2012-05-15 00:17:02 -07:00
Mark Otto
a0809ceebe
add forms test page for all html5 input types and refactor selectors
2012-05-14 23:40:06 -07:00
Mark Otto
826a8714e2
#3257 : share .navbar-fixed-top styles with .navbar-fixed-bottom
2012-05-13 22:11:35 -07:00
Mark Otto
ea15660973
#3420 : properly scope dropdown open state to immediate children only
2012-05-13 21:52:18 -07:00
Mark Otto
a2fb9ed42f
#3449 : make legend and form-actions the same border color
2012-05-13 17:43:04 -07:00
David Hirtle
452d8c1df0
Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params
2012-05-04 13:50:16 -07:00
Mark Otto
59ec4c7154
make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3)
2012-04-30 15:40:49 -07:00
Mark Otto
6e9756ebb6
#3228 : update docs to list dependencies from 2.0.3 for compiling via make
2012-04-30 15:30:56 -07:00
Jacob Thornton
aaabe2a46c
fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild)
2012-04-24 18:06:41 -07:00
Giuliano Velli
4fbb400754
Added Medias code and documentation
...
Fix for Issue #1711
Added media.less and edited bootstrap.less and responsive.less to
manage media components.
Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos
Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
2012-04-24 17:19:17 +02:00
Mark Otto
5be84ad0b7
restore margins on thumbnails, add comments about it's changes and how responsive affects it
2012-04-24 06:45:21 -07:00
Mark Otto
f9744ff522
make component animations work cross browsers with opacity mixin, restore float on thumbnails > li
2012-04-24 06:39:14 -07:00
Mark Otto
79d7092a39
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-24 02:12:09 -07:00
Mark Otto
d8aaf50798
implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid
2012-04-24 02:11:59 -07:00
Jacob Thornton
fc871a4821
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
2012-04-24 02:02:28 -07:00
Jacob Thornton
73453c7f79
changes for build in preperation for 2.0.3 release
2012-04-24 02:02:06 -07:00
Mark Otto
1c2db11d58
fix ie7 button group toggles and button borders
2012-04-24 01:46:20 -07:00
Mark Otto
805ca03457
fix #3179 : cut off radios and checkboxes
2012-04-24 01:33:00 -07:00
Mark Otto
7f6f3ff462
fix #3202 : add cursor to .accordion-toggle
2012-04-24 01:23:24 -07:00
Mark Otto
419e50e339
fix up buttons after recess property order
2012-04-23 10:06:35 -07:00
Mark Otto
091a97c01c
white bg on docs again
2012-04-23 03:06:30 -07:00
Mark Otto
99a916d5eb
remove background color from radios and checkboxes for IEs
2012-04-23 03:05:10 -07:00
Jacob Thornton
edb52a82d8
make bootstrap compile with Recess instead of Less
2012-04-18 16:16:42 -07:00
Mark Otto
47b6e6bd80
fix #3111 , badge and label alignment with surrounding text
2012-04-18 09:47:30 -07:00
Jacob Thornton
2881269e16
lots of property ordering
2012-04-16 16:34:08 -07:00
Jacob Thornton
457859feba
Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip
2012-04-16 15:09:26 -07:00
Jacob Thornton
498b7d984a
a few property reordering things
2012-04-16 15:09:05 -07:00
Mark Otto
13e4d1d5ac
fix #2990 : text wrapping in .uneditable-input
2012-04-15 00:35:30 -07:00
Mark Otto
9e9be2dc0d
fix #2989 : clear .checkbox/.radio floats
2012-04-14 23:19:42 -07:00
Mark Otto
a6f27ebed4
ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous
2012-04-14 23:06:00 -07:00
Mark Otto
8dc1a0eade
Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse
...
Conflicts:
docs/assets/bootstrap.zip
2012-04-14 22:43:26 -07:00
Mark Otto
490eb1bd16
fix #3068 : compile after changing comment
2012-04-14 20:56:50 -07:00
Mark Otto
fc7ae48c95
fix #1823 : styles of tabs within other tabs resolved
2012-04-14 18:47:27 -07:00
Mark Otto
dbde2dc9e4
adding icon classes to finish off glyphicons 1.6 update
2012-04-14 17:15:16 -07:00
Mark Otto
8575a45294
alt fix to #3029 : change to single border-radii properties
2012-04-14 13:31:48 -07:00
Mark Otto
a7d8145a32
fix #3036 : add bg color to inputs
2012-04-14 13:18:37 -07:00
Bryan Petty
5b85ed181a
Fixed extra margin on Navbar buttons.
2012-04-10 15:22:17 -06:00
Mark Otto
0b2d23d443
add larger .input-* to block reset for responsive <767
2012-04-07 23:41:09 -07:00
Mark Otto
3ecf109835
fix conflicts, add docs example for two buttons on an append
2012-04-07 16:44:03 -07:00
Mark Otto
798363eda7
fix left margin on .thumbnails for responsive <767
2012-04-07 14:31:55 -07:00
Mark Otto
10ff5f16a6
fix #2968 manually: add consolas to monospace font stack
2012-04-07 14:25:58 -07:00
Bryan Petty
4b81c0dff3
Changed .nav-collapse to clear both instead of left, and added compiled files.
2012-04-05 14:13:16 -06:00
Mark Otto
2ea437f353
fix #2908 : unfloat inputs using .span* in fluid row
2012-04-02 22:49:19 -07:00
Mark Otto
2988de6377
fix #2913 : get more specific with button group selectors
2012-04-02 22:38:12 -07:00
Mark Otto
647f1c98ed
fix #2296 : allow fluid thumbnails
2012-04-01 01:05:00 -07:00
Mark Otto
fe05f9aeb2
fix #2572 : streamline thumbnails css to allow for offsets
2012-04-01 00:59:34 -07:00
Mark Otto
33fa705c7f
fix #2811 : left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width
2012-04-01 00:15:04 -07:00
Mark Otto
d652af1097
fix #2860 : truncate .dl-horizontal terms and reset to stacked for <767px layouts
2012-03-31 23:53:54 -07:00
Mark Otto
f37d9aeaef
fix #2856 : make inputs using .span* classes responsive at <767px layout
2012-03-31 21:31:01 -07:00
Mark Otto
2355fd224d
remove @shadow instances and replace with escaped values, update mixins to not use a default value at all
2012-03-31 21:06:16 -07:00
Mark Otto
37745cd899
fix fluid grid selectors to remove > in selectors
2012-03-31 00:53:38 -07:00
Mark Otto
3308d1968f
fix #2846 : Firefox required two clicks on selects to get to options dropdown
2012-03-28 18:18:41 -07:00
Mark Otto
e41584afb5
fix #2829 : redeclare .pull-right for navs since they get more specific floats
2012-03-28 17:02:13 -07:00
Mark Otto
cffadd8c71
add position relative to .dropup
2012-03-25 22:28:43 -07:00
Mark Otto
473e5714f7
change all anchor alert closes to buttons
2012-03-25 20:41:59 -07:00
Mark Otto
95c2877ffc
remove > in fluid grid selectors, fix double padding issue on fluid layout and example
2012-03-25 16:41:46 -07:00
Mark Otto
4c3e7690ba
jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728
2012-03-25 14:46:47 -07:00
Mark Otto
cbd77d0aeb
give IE7 inline-block behavior for input-prepend/append
2012-03-25 14:37:19 -07:00
Mark Otto
d0526e31fa
remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius
2012-03-25 14:31:04 -07:00
Mark Otto
c0f28d81b0
Remove black border on buttons in IE7:
...
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
2012-03-25 14:28:24 -07:00
Jacob Thornton
a62810918f
fix responsive navbar
2012-03-25 13:33:36 -07:00
Mark Otto
a5552a1d70
revert bart's mixin fix
2012-03-25 12:42:47 -07:00
Mark Otto
b81a082cd1
add navbarheight support to .brand and .nav links in navbar
2012-03-25 12:32:29 -07:00
Mark Otto
6c5c29ada2
introduce .navbar-link to resolve issue with buttons in .navbar-text
2012-03-25 01:21:47 -07:00
Mark Otto
a7b8e52f8e
Overhaul the responsive utility classes:
...
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
2012-03-25 01:12:51 -07:00
Mark Otto
1837b8ef2c
remove height: auto on images since it interferes with inline dimensions
2012-03-25 00:20:30 -07:00
Mark Otto
223c8358ce
Merge branch 'andreasbovens-master' into 2.0.3-wip
2012-03-25 00:07:09 -07:00
Andreas Bovens
de0aaff433
Added -o- and -ms- prefixes to animations CSS
...
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
2012-03-24 18:53:27 +01:00
Mark Otto
f9f03d8976
Merge branch 'bartt-master' into 2.0.3-wip
...
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
less/button-groups.less
2012-03-23 20:56:48 -07:00
Mark Otto
c7afe382a2
fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition
2012-03-23 20:56:04 -07:00
Mark Otto
0b41984920
Fix #2758 : Uneditable inputs in input-prepend/append
...
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add to the .uneditable-input in forms to remove the float as we do with all other form controls
2012-03-23 09:47:57 -07:00
Mark Otto
de7aee2465
fix broken tables with double borders and such, add css tests page to start with table edge cases
2012-03-23 01:28:04 -07:00
Mark Otto
622b8fa3f0
adding blog link to docs homepage
2012-03-23 01:13:20 -07:00
Mark Otto
281e058ef2
fix #2613 : labels hang too low
2012-03-23 00:40:10 -07:00
Mark Otto
ee3fc11add
fix #2617 : add negative margin to fixed-bottom navbar
2012-03-23 00:38:13 -07:00
Mark Otto
2729d15742
fix #2625 manually: account for dropup caret on large button
2012-03-23 00:37:15 -07:00
Mark Otto
b8d8ab1aad
run make on merge of progress bars change
2012-03-23 00:28:58 -07:00
Mark Otto
a28fa20018
remove redundant max-width img from docs css
2012-03-22 23:49:39 -07:00
Mark Otto
c4fb703269
fix left and right tab-content alignment with width: auto;
2012-03-22 23:38:50 -07:00
Mark Otto
ac64d9405b
Dropdowns overhaul:
...
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
2012-03-22 23:09:31 -07:00
Mark Otto
50b2245be5
restore max-width 100% for images
2012-03-22 22:06:23 -07:00
Mark Otto
ab068f6fda
bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization
2012-03-22 21:33:06 -07:00
Mark Otto
1852d077bf
add shell of tests page, lighten form actions background and give it a variable
2012-03-22 21:08:41 -07:00
Mark Otto
edca6f28f0
fix #2718 , misaligned uneditable inputs in prepends/appends
2012-03-22 17:41:20 -07:00
Mark Otto
b7b84c7a0d
remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append
2012-03-22 17:36:32 -07:00
Mark Otto
ceab161324
fix unescaped reset filter per #2575
2012-03-22 17:31:09 -07:00
Mark Otto
b59cb505f8
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-22 17:12:22 -07:00
Mark Otto
d7af2714c6
remove separate badges and labels, add single file instead, remove hover from non-link badges/labels
2012-03-22 16:02:00 -07:00
ctalkington
bf09c979ca
make brand links follow navbarLinkColor but also be customizable in advanced cases.
2012-03-15 14:21:27 -05:00
Jacob Thornton
8e0afbeaa4
update hide text to h5bp technique #2586
2012-03-14 12:00:27 -07:00
Jacob Thornton
59503e71ff
2.0.2 derp
2012-03-12 14:09:38 -07:00
Jacob Thornton
cd89c34d99
can't have overflo: visible for "in" which is present during entirity of transition.
2012-03-12 13:31:38 -07:00
Mark Otto
7f3a2b3813
button group sizes for ie7 fixes
2012-03-12 12:44:47 -07:00
Mark Otto
685039d608
add a super jank fix for horizontal-forms and .input-prepend/append in IE7
2012-03-12 00:16:01 -07:00
Mark Otto
c35b04cccd
enable buttons in input-append and input-prepend
2012-03-11 23:43:19 -07:00
Mark Otto
d36f3d0a59
clean up links on docs homepage and add link to direct download with docs
2012-03-11 23:33:08 -07:00
Mark Otto
7c2ed0c095
resolve #1972 , allowing add-ons at beginning and end of input-prepend/append
2012-03-11 23:21:38 -07:00
Mark Otto
5eed370856
fix more spacing issues with input append/prepend
2012-03-11 23:14:36 -07:00
Mark Otto
58cb7c631d
simplify code for input-prepend/append in inline and search forms
2012-03-11 23:12:45 -07:00
Mark Otto
91eef351e4
remove need for floats and IE hacks for input-prepend and input-append--boom
2012-03-11 22:58:14 -07:00
Mark Otto
0090fa1a6e
fix overflow on .collapse.in to enable dropdowns within an open collapse
2012-03-11 22:43:35 -07:00
Mark Otto
ac7f571e53
enable button groups in modal-footer by removing 5px added margin between .btn
2012-03-11 22:28:37 -07:00
Mark Otto
5a28bd1e78
fix vertical align issue with labels in IE9
2012-03-11 21:44:00 -07:00
Mark Otto
ee5d2ec91a
add block level input mixin for border-box box-sizing
2012-03-11 21:21:51 -07:00
Mark Otto
c8f4325c19
remove text indent on carets (not needed) and add inline replacement mixin
2012-03-11 21:12:59 -07:00
Mark Otto
67714d8347
remove the unused text-indent on dropdown carets
2012-03-11 20:38:17 -07:00
Mark Otto
0f23883283
fix broken dropdowns in ie7 per #2333
2012-03-11 20:16:39 -07:00
Mark Otto
2e52946fd3
fix lingering tables bug
2012-03-11 20:03:55 -07:00
Mark Otto
4109c62cf7
fix table border bug with double borders on theads and use of colgroup
2012-03-11 18:18:18 -07:00
Mark Otto
8fd126ba1b
updated apple touch icons and moved input responsive fix from <480 to <767
2012-03-11 17:28:28 -07:00
Mark Otto
ce292a8bb8
fix overflowing thumbnails in responsive <767px layouts
2012-03-11 15:15:55 -07:00
Mark Otto
a97b9c1122
in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width
2012-03-11 14:41:52 -07:00
Mark Otto
bf6cdff88a
vertical align middle on images, run make to rebuild
2012-03-11 13:48:47 -07:00
Mark Otto
635ee36e11
fix gradient mixins by escaping them, add notes on progress bars
2012-03-10 18:03:59 -08:00
Mark Otto
5de8b277c6
add vars for navbar search
2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c
clean up search form in navbar, add new variable for placeholder text color
2012-03-10 16:15:54 -08:00
Mark Otto
1dbb942d5b
massive update to customize page to include all the new variables (and ensure they're being used in the .less files)
2012-03-10 16:01:06 -08:00
Mark Otto
67aa00d0bb
make pre font-size a percentage of @baseFontSize
2012-03-10 14:36:58 -08:00
Mark Otto
f7d4fb61ce
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-03-10 14:12:29 -08:00
Mark Otto
dd5cffc308
add button sizes to docs for button dropdowns, clean up styles for them
2012-03-10 13:40:58 -08:00
Mark Otto
c7eb1ab49a
make nav padding and negative margins the same
2012-03-10 13:24:46 -08:00
Jacob Thornton
a07851d6af
stop doing oldschool escape substitution
2012-03-10 13:01:17 -08:00
Jacob Thornton
1fd5e55881
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
2012-03-10 12:42:39 -08:00
Jacob Thornton
1a8d7576e0
Merge branch 'new_grid' into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
less/mixins.less
2012-03-10 12:41:41 -08:00
Mark Otto
5d961eaeb3
rebold headings
2012-03-10 11:29:57 -08:00
Mark Otto
f4e879a936
fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron
2012-03-10 11:27:07 -08:00
Mark Otto
305374ab1a
clear up nav variables
2012-03-10 11:23:05 -08:00
Jacob Thornton
426feeef6a
give pages custom titles based on names
2012-03-08 11:09:33 -08:00
Mark Otto
6b9f70797d
adding well sizes
2012-03-06 21:12:43 -08:00
Mark Otto
738fac18de
move padding from container to body for max-width: 767; responsive layout
2012-03-05 23:50:03 -08:00
Mark Otto
79090ac121
fix input grid sizing, fix background color on form actions and append add-ons
2012-03-05 23:06:27 -08:00
Mark Otto
bcd9294cc4
clearing up progress bar docs and resetting the striped one to match default bar (blue instead of green)
2012-03-05 23:00:37 -08:00
Mark Otto
d98a2e9234
adding table variables
2012-03-05 22:47:39 -08:00
Mark Otto
ac6eff280d
Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
...
Conflicts:
less/dropdowns.less
2012-03-05 20:49:39 -08:00
Mark Otto
20b10b5d66
change dropdown hover/active color back to link color
2012-03-05 20:15:35 -08:00
Mark Otto
eaf464a2c5
increase specifity of .pills li.active for dropdowns
2012-03-05 20:14:54 -08:00
Mark Otto
cb9234ba46
fix warning button issue per #2392 and add warning buttons to components
2012-03-05 00:47:13 -08:00
Mark Otto
7a8d6b1976
clean up horizontal dl option and docs
2012-03-05 00:42:37 -08:00
Mark Otto
1fa42e2f71
fix ie7 breadcrumbs per #2224
2012-03-05 00:36:57 -08:00
Mark Otto
a95c15a530
utilize new dropdown variables
2012-03-05 00:32:02 -08:00
Mark Otto
d3e922f0c8
add a ton new variables for type, buttons, inputs
2012-03-05 00:29:16 -08:00
Jacob Thornton
3524aa909c
make sure to pass child var through
2012-03-04 14:21:54 -08:00
Jacob Thornton
1aeca545c8
new approach to grid with recursive mixins :D
2012-03-04 14:06:30 -08:00
Mark Otto
fbebb046f7
fix navbar container for default 940px grid per #2194
2012-02-27 22:34:25 -08:00
Mark Otto
9ee77f2c11
set line-height for labels to prevent change in height when floated per #2222
2012-02-27 21:50:54 -08:00
Mark Otto
a7b96b3e59
set list-style to none for breadcrumbs to resolve cross browser issues per #2224
2012-02-27 21:32:48 -08:00
Mark Otto
7525aac830
make .input-prepend/append .add-on text color the same as labels, #333 , to close out #2276
2012-02-27 19:44:16 -08:00
Mark Otto
af8261af93
simplify selector for .modal-form per #2218
2012-02-27 19:09:44 -08:00
Jacob Thornton
8615987243
add guard for child spans
2012-02-27 18:21:21 -08:00
Jacob Thornton
ae3382d797
working through new grid implementation...
2012-02-27 18:15:59 -08:00
Mark Otto
4309153051
add version to docs homepage, fix docs example for forms
2012-02-24 21:02:24 -08:00
Mark Otto
0e8427e7b1
update modal footers to use text-align instead of float on buttons for alignment
2012-02-22 22:38:54 -08:00
Mark Otto
8609a77bd2
add clearfix to .form-actions for .pull-right and .pull-left supported buttons, per #1978 and #2173
2012-02-22 11:16:32 -08:00
Mark Otto
a0ec422444
fix #1954 : icons in tabs add jank border
2012-02-22 08:36:07 -08:00
Mark Otto
b86969f762
restore fixed navbar container reset to grid mixin, add override for inputs within grid mixins to fix #2080
2012-02-22 08:21:29 -08:00
Mark Otto
4410ede8ed
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-22 08:12:51 -08:00
Mark Otto
92a54a7b72
tighten padding on labels and badges given default line-height
2012-02-22 08:12:25 -08:00
Jacob Thornton
f3b6cf1d6d
Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
less/mixins.less
2012-02-21 23:18:18 -08:00
Jacob Thornton
5ad5dde1e2
rewrite the grid system. Clean shit up tons - only generate 12 columns by default - custom builder will do differently if you request it.
2012-02-21 23:16:06 -08:00
Mark Otto
a139167489
set width to auto for default navbar container, then override it later for fixed navbars (done all via the #gridSystem mixins)
2012-02-21 23:15:43 -08:00
Mark Otto
9b524a16e9
clear up table styles and docs to fix rowspan and colspan issues for bordered tables, per #1918
2012-02-21 23:00:02 -08:00
Mark Otto
8bd67bb124
clean up and simplify support for bottom navbar by automagically turning dropdowns into dropups
2012-02-21 22:09:51 -08:00
Mark Otto
20221a67c2
Merge branch '2.0/fork/components/dropup' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/fork/components/dropup
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/navbar.less
2012-02-21 22:01:39 -08:00
Mark Otto
b4cc6c74f5
add support and docs for .navbar-fixed-bottom
2012-02-21 21:12:16 -08:00
Mark Otto
e3ae517555
move container up in default grid mixin
2012-02-21 15:21:18 -08:00
Mark Otto
8665fa8c50
move table columns mixin to mixins.less
2012-02-21 15:18:05 -08:00
Mark Otto
664a5c4438
update forms help-block
2012-02-21 13:43:13 -08:00
Mark Otto
d908731566
Merge branch '2.0.2-wip-nowrapfix' of https://github.com/andriijas/bootstrap into andriijas-2.0.2-wip-nowrapfix
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-21 09:05:04 -08:00
Mark Otto
f3ad4c7183
adding responsive utility classes and matching docs section with super neato table and test
2012-02-21 08:24:18 -08:00
Andreas Cederström
dfd0326186
Bring back nowrap to labels and badges
2012-02-21 08:17:16 +01:00
Mark Otto
06d4756114
adding basic badges support
2012-02-20 21:20:06 -08:00
Mark Otto
d2630ff84e
introduce new mixin to do navbar vertical centering
2012-02-20 19:14:26 -08:00
Mark Otto
143b3db2c9
update inline forms to resolve checkbox label with space in it and overlapping content, per #1969
2012-02-20 18:56:05 -08:00
Mark Otto
331c85724a
remove max-width on img from reset and put in docs only, per #1552
2012-02-20 16:18:13 -08:00
Mark Otto
9c74f21966
fix overflow issue on tabbed content per #2079
2012-02-20 16:06:42 -08:00
Mark Otto
91fe8bc0f4
remake after merging buttons update
2012-02-20 13:37:24 -08:00
Mark Otto
7ef7547a14
add horizontal divider support to nav list, including documentation for it, per #2106
2012-02-20 12:38:49 -08:00
Mark Otto
6df925bc75
enable use of span in place of a for .disabled in pagination, per #1406
2012-02-19 23:51:59 -08:00
Mark Otto
9b09d1de86
move overflow and max-height on modal to modal-body instead
2012-02-19 21:55:09 -08:00
Mark Otto
8247cb3362
add new global styles docs section for mentioning doctype requirements, base body changes, and type/links; also tightened up code styles
2012-02-19 16:28:46 -08:00
Mark Otto
f4f34ab12f
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 16:00:54 -08:00
Mark Otto
59d570fc16
Merge branch 'abbr' of https://github.com/jacobrask/bootstrap into jacobrask-abbr
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:38:34 -08:00
Mark Otto
3470c0dc49
Merge branch 'alert-headers' of https://github.com/jacobrask/bootstrap into jacobrask-alert-headers
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:04:52 -08:00
Mark Otto
89ccbdf8d1
Merge branch 'gridcontainer' of https://github.com/jacobrask/bootstrap into jacobrask-gridcontainer
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 15:01:25 -08:00
Mark Otto
adbbf17ee4
Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-02-19 14:54:53 -08:00
Mark Otto
16d12396d0
simplify text color in navbar by placing the color on global .navbar component
2012-02-19 14:53:07 -08:00
Jacob Rask
e145619f6d
Remove underscore hack for IE6
...
IE6 does not seem to be supported by Bootstrap, and reducing the number
of unused and invalid properties is always nice.
2012-02-19 21:54:38 +01:00
Jacob Rask
82457603b6
Separate span12 and container classes
...
If you have less than 12 columns, container is too wide. Instead
generate container width using the @gridColumns variable.
Also remove duplicate container width property.
2012-02-19 21:49:17 +01:00
Jacob Rask
51ec513b5c
Use inherit on alert-heading color
...
Heading then inherits from the parent alert.
Avoids a lot of extra unneccessary CSS.
2012-02-19 21:29:32 +01:00
Jacob Rask
c1775da187
Add class for upper case abbreviations, aka initialisms
...
Read more:
* http://en.wikipedia.org/wiki/Abbreviation
* http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:24:06 +01:00
Jacob Rask
f08b407667
Only show help cursor/border for abbr with title
2012-02-19 21:23:17 +01:00
Jacob Rask
df757fb040
All abbreviations are not upper case initialisms
...
Read more:
* http://developers.whatwg.org/text-level-semantics.html#the-abbr-element
* http://en.wikipedia.org/wiki/Abbreviation
* http://en.wikipedia.org/wiki/Initialism
2012-02-19 21:21:44 +01:00
Mark Otto
1948e985a3
merge in and remake for responsive navbar dropdown fix
2012-02-18 20:09:34 -08:00
Mark Otto
bbb2fb3395
fix right aligned dropdowns
2012-02-18 20:06:38 -08:00
Mark Otto
b776cae902
add mention of js compilation to single file in customize page per #2003
2012-02-17 21:18:08 -08:00
Mark Otto
1455bc9f8f
removing duplicate reset filter since we changed the main button to use buttonBackground mixin, per #2024
2012-02-17 20:47:02 -08:00
Mark Otto
b559f2b8d0
fix duplicate input prepend/append css selectors per #2026
2012-02-17 20:40:56 -08:00
Mark Otto
e7d45184f1
swap last .btn-dark reference
2012-02-17 20:25:49 -08:00
Andreas Cederström
1e6d386b8d
Keep origin in track
2012-02-17 13:31:36 +01:00
Jacob Thornton
7ec09d0db9
2.0.1
2012-02-16 22:42:38 -08:00
Mark Otto
091622644a
bring back checkbox borders to iOS by conditionalizing the border: 0; on it to IE7-9; fix word break on pre in IE
2012-02-16 22:34:30 -08:00
Mark Otto
6f6adfb52f
change clearfix mixin to drop parens that prevent it from being a class, too
2012-02-16 22:04:11 -08:00
Mark Otto
268e7d67ab
add mini buttons per #1971
2012-02-16 21:28:16 -08:00
Mark Otto
61e2201c64
fix buttons focus state and swap a buttons for button buttons
2012-02-16 21:25:40 -08:00
Mark Otto
489276f5be
fix responsive media queries to use 979 and 980 where appropro
2012-02-16 21:08:52 -08:00
Mark Otto
64ea59234f
change up fonts on form elements to remove unnecessary font-family on label element, per #1950
2012-02-13 08:18:19 -08:00
Andreas Cederström
60826077e7
Clean up inverse button using variables, adding button group examples. Also adding inverse inline label
2012-02-13 09:41:28 +01:00
Mark Otto
ce5976fb29
ensure help-block is block per #1937
2012-02-12 22:49:06 -08:00
Mark Otto
cbe10bd591
clean up nav-header in responsive
2012-02-12 21:11:56 -08:00
Mark Otto
3e00c1261f
allow .input-prepend/.input-append to work in .navbar per #1681
2012-02-12 20:28:22 -08:00
Mark Otto
5fc62c5fcc
clear up scaffolding page to separate fixed from fluid grid systems
2012-02-12 16:59:29 -08:00
Mark Otto
163c98ea7e
clean up modals.less comments, add new class for optional use on modal forms to remove bottom margin
2012-02-12 15:43:04 -08:00
Mark Otto
a57dbada0f
change classname from .btn-dark to .btn-inverse, change use text
2012-02-12 15:18:20 -08:00
Mark Otto
0ff88f2db3
enable the use of .nav-header in dropdowns per #1827
2012-02-12 14:10:07 -08:00
Mark Otto
a9e469e75a
add navbar background hover variable and fix uneditable-input with append/prepend controls
2012-02-12 14:01:58 -08:00
Mark Otto
86b6ea4b5f
lower z-index of fixed subnav to prevent overlap of dropdown items in .navbar-fixed
2012-02-12 13:33:23 -08:00
Mark Otto
ebe547b6a0
Merge branch 'patch-2' of https://github.com/cwiederspan/bootstrap into cwiederspan-patch-2
2012-02-12 13:20:17 -08:00
Mark Otto
a2bc22bad5
standardize default button gradient styles to match other buttons, reset it's IE filter to improve IE7 hover
2012-02-12 11:14:13 -08:00
Mark Otto
2eedf60d62
write out icon classes explicitly to enable find via browser
2012-02-11 22:34:41 -08:00
Mark Otto
b327420e52
update comment to reflect ie support
2012-02-11 20:58:10 -08:00
Mark Otto
158419c045
reset line-height for file input in ie9
2012-02-11 20:00:44 -08:00
Mark Otto
5bb55e4615
change fixed height on responsive textareas to min-height
2012-02-11 19:21:23 -08:00
Mark Otto
5b22cf5cc3
fix tabs content wrapping per #1620
2012-02-11 17:27:08 -08:00
Mark Otto
5a3dfb72bf
support small for legend per #1544
2012-02-11 16:50:57 -08:00
Mark Otto
4ddc8fd0e4
remove color on :active of buttons
2012-02-11 16:43:53 -08:00
Mark Otto
8f1db4321a
fix inline form checkbox/radios
2012-02-11 00:24:06 -08:00
Mark Otto
efac5441d8
move legend fix out of horizontal and to all forms
2012-02-11 00:11:34 -08:00
Mark Otto
722c75d1b1
update selectors for icons to include matcher for icon class in middle of class attr, remove docs mention of requiring icon-* first
2012-02-11 00:07:05 -08:00
Mark Otto
89205d9db4
manually address #1895
2012-02-10 23:59:00 -08:00
Mark Otto
d7aefe67e3
scope th bottom vertical-align to only thead, update code styles to include more comments in less file and scrollable option for pre tag
2012-02-10 23:07:32 -08:00
Mark Otto
c10661cf5d
Merge branch 'barsoom-ol-unstyled' into 2.0.1-wip
2012-02-09 23:20:05 -08:00
Chris Wiederspan
4c7b9b8fce
Added an overriding filter: progid:DXImageTransform.Microsoft.gradient(enabled=false) to the .subnav-fixed class that fixes the bug caused on nav dropdown menus when "docked" in the fixed position.
2012-02-09 14:28:12 -07:00
Henrik N
25bf0af249
Add ol.unstyled
2012-02-07 19:29:45 +01:00
Mark Otto
7ce62ffc98
make after merging in breadcrumbs wrap fix
2012-02-06 23:42:57 -08:00
Mark Otto
575b82473f
rearrange some of the docs on buttons to show examples of all possible renderings along with code snippets and note about usage; also fix the portrait tablet media query
2012-02-06 23:34:03 -08:00
Mark Otto
85e401a656
add label hover style for ability to make it a link
2012-02-05 02:36:21 -08:00
Mark Otto
546332d85d
resolve #1602 and add table hover style
2012-02-05 02:28:42 -08:00
Mark Otto
59b32586af
close #1628 to add padding to all inline checkboxes/radios
2012-02-05 02:16:46 -08:00
Mark Otto
91475c865d
fix #1631 by adding focus to radio buttons
2012-02-05 02:14:25 -08:00
Mark Otto
4a09cf04d8
clean up labels per #1656
2012-02-05 02:01:28 -08:00
Mark Otto
35fdddbc4f
correct css selector for .control-label, required in the docs but not in the CSS files
2012-02-04 22:55:47 -08:00
Mark Otto
87a8c9b677
#1707 : remove rgba() background override on navbar active items for customization
2012-02-04 22:40:50 -08:00
Mark Otto
468688638d
#1715 : strip code of styles when in a pre
2012-02-04 22:23:20 -08:00
Mark Otto
7e81f84b29
buttons and icons updated for improved placement and variable support for icon paths
2012-02-04 22:22:19 -08:00
Mark Otto
81d1f3b96e
remove max-width on dropdown menus
2012-02-04 18:52:25 -08:00
Mark Otto
ac98cee609
allow alternate form layouts to hide inputs with .hide on them
2012-02-04 18:26:04 -08:00
Mark Otto
4211f21e39
#1571 : remove fixed width on file inputs
2012-02-01 22:27:11 -08:00
Mark Otto
3a2f0765bf
fix hover state on .nav-list for active links
2012-02-01 17:54:21 -08:00
Mark Otto
9b9e1d309b
fix that jank hack
2012-02-01 16:44: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
cfc1c8a8cd
clean up responsive media queries and docs css
2012-01-31 13:16:11 -08:00
Mark Otto
b7713b83fa
chance icon class
2012-01-31 00:11:19 -08:00
Mark Otto
4d93b63916
disable cursor on disabled and active pagination links
2012-01-30 23:27:58 -08:00
Mark Otto
d533310bd2
once more, overhaul the icons and use the css regex selector on our icons
2012-01-30 23:24:35 -08:00
Mark Otto
5c9a687665
fix button styles on active and disabled
2012-01-30 23:16:27 -08:00
Mark Otto
61b47e91b8
update layout docs
2012-01-30 23:10:29 -08:00
Mark Otto
1cff29c33f
restore a few commented out responsive items
2012-01-30 23:02:24 -08:00
Mark Otto
47a68ae3aa
update icons everywhere to be scoped per other components, fix broken elements on js docs page
2012-01-30 22:57:00 -08:00
Mark Otto
31911659a2
refactor the navs to use prefixed classes, because you know, consistency is beast mode
2012-01-30 21:29:50 -08:00
Mark Otto
0f3a073b8d
*really* refactor the buttons and update them all over the docs
2012-01-30 21:15:57 -08:00
Mark Otto
21bebe77fe
refactor buttons.less
2012-01-30 20:50:51 -08:00
Jacob Thornton
155047c3e6
speed up topbar animation for responsive
2012-01-30 13:59:05 -08:00
Mark Otto
e94e0f1cf9
implement @textColor for body text
2012-01-30 09:41:31 -08:00
Mark Otto
ac581eebac
large carousel images and margin bottom added
2012-01-30 09:19:25 -08:00
Mark Otto
3722c34b50
account for floated inputs in the .navbar-form
2012-01-30 08:20:37 -08:00
Mark Otto
2d40b07afc
adding warning (orange) button, fix responsive navbar problem
2012-01-30 08:15:28 -08:00
Mark Otto
9ba70796e2
remove top 5px padding from first inline radio/checkbox
2012-01-30 07:40:24 -08:00
Mark Otto
f4e5bc1c53
namespace popover values
2012-01-30 01:20:51 -08:00
Mark Otto
8f448610a9
rename vertical-divider to divider-vertical, add more space around the divider
2012-01-30 01:09:34 -08:00
Mark Otto
0f088af855
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
less/responsive.less
2012-01-30 00:43:57 -08:00
Mark Otto
ae7f94eeff
overhaul grid mixins and variables, standardize fluid grid system and enable it across responsive layouts
2012-01-30 00:39:44 -08:00
Jacob Thornton
0de951f4f4
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/bootstrap.zip
2012-01-29 19:07:14 -08:00
Jacob Thornton
fae04c8ac1
add license for responsive and rebuild
2012-01-29 19:04:26 -08:00
Mark Otto
2ba1b01f8d
subnav adjustments
2012-01-29 17:03:05 -08:00
Mark Otto
702d3b6dfe
fix broken navbar collapse
2012-01-29 16:35:55 -08:00
Burak Tuyan
97b3057824
Extending the dropup support to tabs and pills
...
This was needed to match the color of the carets that are used for tabs and pills
2012-01-30 01:13:21 +02:00
Burak Tuyan
918a17a30b
Adding dropup support to split buttons and navbar
...
* Documents the hidden .dropdown-menu.bottom-up option (to be used for dropups)
* Extends the .bottom-up class to carets and all relevant caret styles
* Adds .dropdown-menu.pull-right class for right-aligned dropdowns and dropups
* Adds examples and some information to the "split dropdown" and "navbar" sections of the Docs
2012-01-30 00:50:47 +02:00
Mark Otto
9e7f5025b4
update collapsible nav in navbar
2012-01-29 14:07:58 -08:00
Mark Otto
278858e706
fix form styles on prepend/append for consistency, update code docs with examples of the code snippets
2012-01-29 13:25:13 -08:00
Mark Otto
9fa8bde44d
fix animated/striped gradients in progress bars
2012-01-29 13:15:38 -08:00
Mark Otto
4e5b0e185e
refined pager styles to give a border on the links and improved hover state
2012-01-29 13:12:13 -08:00
Mark Otto
48529ad01f
last minute addition of a simple fluid grid for our fluid examples; it needs work, so we're not documenting it now
2012-01-29 13:06:57 -08:00
Mark Otto
7bf2767452
remove form docs from the styles and markup, it's no longer needed
2012-01-29 00:07:01 -08:00
Mark Otto
15a1c0ce79
add swatches to the color variables in less docs page
2012-01-28 23:58:39 -08:00
Mark Otto
bca269299b
removing required .navbar-static class, rewrote docs to reflect the change, and updated the upgrade docs page to include the navbar section
2012-01-28 23:40:52 -08:00
Mark Otto
62f4a1571a
revamped the thumbnails examples to make them work and look better at higher resolution
2012-01-28 22:48:25 -08:00
Mark Otto
487dbfdda4
namespace progress bars and labels classes
2012-01-28 22:14:51 -08:00
Mark Otto
59d9983ebc
updates to responsive and docs for responsive navbar
2012-01-28 22:03:14 -08:00
Mark Otto
f1e520badd
clarify and tweak media queries
2012-01-28 20:34:07 -08:00
Mark Otto
3e462f1fb2
update docs to simplify some css
2012-01-28 20:26:27 -08:00
Mark Otto
cf1b46bda4
fix alert close position
2012-01-28 18:46:41 -08:00
Mark Otto
e17c9249d2
fix dropdowns in subnav
2012-01-28 18:27:09 -08:00
Mark Otto
e532228721
more responsive tweaks for tablet
2012-01-28 18:25:05 -08:00
Mark Otto
4fa931e403
fix the navbar click and a few jank responsive problems
2012-01-28 18:11:31 -08:00
Mark Otto
06df91ac55
remove background from accordion, and use border instead
2012-01-28 16:48:03 -08:00
Mark Otto
475b985a0e
remove padding from first-child of inline radios/checkboxes
2012-01-28 16:37:43 -08:00
Jacob Thornton
22d52fca46
fix goign between small view large view with responsive collapse
2012-01-28 16:21:55 -08:00
Jacob Thornton
b8a683d7f2
turn off brand hover for now + get nav toggling in mobile
2012-01-28 15:42:07 -08:00
Jacob Thornton
ea1c21d62d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 15:15:38 -08:00
Jacob Thornton
6493cd22c0
blah
2012-01-28 15:14:57 -08:00
Mark Otto
23e076c1bb
add in a navbar button for toggling the nav items
2012-01-28 15:09:23 -08:00
Mark Otto
7843a665fd
vertical align inline checkboxes/radios to improve rendering in topbar
2012-01-28 14:50:56 -08:00
Mark Otto
9db4f2a344
change .span* inputs to use content-sizing: border-box; to make them behave as block level elements
2012-01-28 14:30:45 -08:00
Mark Otto
1a22c3b30a
restore IE filters, but reset them on buttons
2012-01-28 13:13:01 -08:00
Mark Otto
296d06a285
add checkbox/radio border for ios in responsive
2012-01-28 13:07:01 -08:00
Mark Otto
70c6a6cd85
fix border and border radius on radios/checkboxes for iOS, fix forms docs alignment on small devices
2012-01-28 12:58:26 -08:00
Mark Otto
b77161f864
reset border-radius only for ie9?
2012-01-28 12:49:26 -08:00
Mark Otto
698d4b414c
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 12:43:45 -08:00
Mark Otto
2bfda031ce
darken buttons, uncomment out firefox keyframes from progress bars
2012-01-28 12:43:19 -08:00
Jacob Thornton
e1a1fdd35d
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 12:09:16 -08:00
Jacob Thornton
12d3c2fe74
fix z-index issue with modals for popovers,tooltips,and dropdowns
2012-01-28 12:08:41 -08:00
Mark Otto
f1dc214977
increase padding on modal-header after decreasing h3 line-height
2012-01-28 11:24:34 -08:00
Mark Otto
2452768259
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 11:22:07 -08:00
Mark Otto
28ba9d69c8
nav, buttons, and docs updates to account for outline: 0; on :active
2012-01-28 11:21:39 -08:00
Jacob Thornton
d465952138
clean up js api for dropdowns
2012-01-28 11:03:39 -08:00
Mark Otto
f1851ab133
change text on js docs page to improve rendering on iphone, update responsive for carousel considerations
2012-01-28 00:43:25 -08:00
Mark Otto
edee985b96
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-28 00:39:34 -08:00
Mark Otto
967030cb53
modal refinements in docs and general responsiveness
2012-01-28 00:39:22 -08:00
Jacob Thornton
7ffec335ca
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
2012-01-28 00:37:12 -08:00
Jacob Thornton
4737d693e0
remove quick start section to simplify landing page + start rewriting application js to work ie7
2012-01-28 00:36:37 -08:00
Mark Otto
cc01d3c367
extend block level smalls to h2s in docs
2012-01-28 00:31:55 -08:00
Mark Otto
342a99f1d0
block level page-header h1 small for readability on 480px and under
2012-01-28 00:29:38 -08:00
Mark Otto
963e5e0eda
scope subnav link styles to first child, and no dropdowns
2012-01-28 00:27:49 -08:00
Mark Otto
d448e6921e
rewrite the code section of the type docs
2012-01-28 00:23:30 -08:00
Mark Otto
ce69b70719
give append/prepend inputs higher z-index on focus
2012-01-27 23:53:56 -08:00
Mark Otto
7a756168b5
fix regression in textarea shadows
2012-01-27 22:56:48 -08:00
Mark Otto
1d44f37fc9
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-27 22:52:56 -08:00
Mark Otto
cb8606f2c8
adding wells and close icon to the docs under misc in components, with a new subnav style
2012-01-27 22:52:45 -08:00
Jacob Thornton
e726b231ba
add toggle to docs for popover/tooltip
2012-01-27 21:59:06 -08:00
Mark Otto
ad78caa726
fix right aligned dropdowns in navbar by adding left: auto; to nix default alignment
2012-01-27 21:25:35 -08:00
Mark Otto
78120edf72
add clearfix to control-group for longer labels and any other unforeseen circumstances
2012-01-27 21:20:58 -08:00
Mark Otto
d0447e9aa5
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 21:09:24 -08:00
Mark Otto
3934d1b6c4
rgba text color on active buttons for a bit more contrast from their non-active siblings
2012-01-27 21:08:04 -08:00
Jacob Thornton
15d3a4797f
simplify build process more - remove really annoying date.
2012-01-27 21:06:09 -08:00
Mark Otto
4e191c423d
update progress bars to have a solid edge until 100% filled
2012-01-27 20:17:03 -08:00
Mark Otto
9800196bf7
use quotes on attr selectors more consistently
2012-01-27 20:05:03 -08:00
Mark Otto
0fa6422918
icon spacing in small buttons and nav lists
2012-01-27 19:57:53 -08:00
Mark Otto
d02c6957d4
fixing up buttons and examples of implementing icons
2012-01-27 19:49:56 -08:00
Mark Otto
7fc6e12b79
comment icons that are 1px off
2012-01-27 18:49:00 -08:00
Mark Otto
aaa530c27e
combined .disabled and [disabled] and confirmed in ie7/8
2012-01-27 18:44:17 -08:00
Mark Otto
7e72eb5063
new tab focus style and mixin
2012-01-27 18:33:25 -08:00
Mark Otto
997fc33af9
clean up use of mixins to highlight them appropriately in your fav editor
2012-01-27 16:40:14 -08:00
Mark Otto
d9759abeeb
Merge branch 'ie_7_components' of https://github.com/phopkins/bootstrap into phopkins-ie_7_components
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 16:35:32 -08:00
Mark Otto
f6dc566963
overhaul navbar behavior in responsive css
2012-01-27 16:26:55 -08:00
Mark Otto
800d0b24e0
remove page-header from docs and add to type.less
2012-01-27 15:28:09 -08:00
Mark Otto
91e9f6fa91
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 14:49:02 -08:00
Mark Otto
22359f9dfd
update examples and restore icons
2012-01-27 14:48:35 -08:00
Jacob Thornton
065ed01b1f
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 14:44:58 -08:00
Jacob Thornton
748696a553
add missing paren
2012-01-27 14:44:05 -08:00
Mark Otto
003da1e089
fix inputs in navbar
2012-01-27 14:21:17 -08:00
Mark Otto
3807a88ee9
update the docs for icons
2012-01-27 13:56:50 -08:00
Mark Otto
8da1c176ec
Merge branch '2.0-wip' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0-wip
2012-01-27 13:43:51 -08:00
Mark Otto
335a8686da
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:43:28 -08:00
Pete Hopkins
84b9a1bfb6
Rebuild css and html
2012-01-27 16:39:38 -05:00
Mark Otto
b1f38bbea8
update icon examples to show icons in differently sized buttons
2012-01-27 13:39:19 -08:00
Jacob Thornton
3c7e3eb7d3
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 13:37:14 -08:00
Jacob Thornton
6fd1e9f4c0
rebuil update layout
2012-01-27 13:36:31 -08:00
Mark Otto
d7b8a9c930
align text in buttons so folks can easily make them different widths
2012-01-27 13:36:08 -08:00
Mark Otto
a0b40b361a
i18n download page
2012-01-27 13:35:25 -08:00
Mark Otto
ccd963e622
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
2012-01-27 13:21:01 -08:00
Mark Otto
e8647c1b11
huuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuge update to doces and stuff
2012-01-27 13:20:02 -08:00
Jacob Thornton
3b3dbd7229
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-01-27 11:07:17 -08:00
Burak Tuyan
16a28d881c
Merge branch '2.0-wip' of git://github.com/twitter/bootstrap into 2.0-wip
2012-01-27 20:48:37 +02:00
Pete Hopkins
f51e703ba6
Rebuild bootstrap.css
2012-01-27 12:16:36 -05:00
Mark Otto
9d0328ff00
adding outline callout as a fallback for IE--needs testing though, thought I already added this
2012-01-27 08:21:39 -08:00
Burak Tuyan
942d1b4595
Updating to latest version of Glyphicons Halflings set (v.1.5) along with some icon enhancements like:
...
- Updated the Gylphicons Halflings set to version 1.5 (30 new icons)
- Optimized the sprite PNG files for minimum filesize without any quality loss
- Made some fixes for horizontal alignment at the LESS/CSS level (tags, bold, arrow-up, minus, chevron-down)
- Made some fixes for vertical alignment at the LESS/CSS level (chevron-down, resize-vertical, resize-horizontal)
- Renamed the old "calendar" class as "list-alt" class (because now we've a real calendar icon)
- Changed the "background-position" of the icon class to "14px 14px", so that a wrong class name will not be showing the glass icon and instead will show a blank icon (which is useful for just positioning the text after the icons in some cases)
- Added new icons (classes) to the base-css Docs (to both HTML file and Mustache template)
- Changed one of the button examples to danger style and used a white icon
- Renamed the sprite image files to save a few bytes here and there (from glyphicons-halflings-sprite.png to lyphicons-halflings.png and from glyphicons-halflings-sprite-white.png to glyphicons-halflings-white.png)
2012-01-27 16:33:18 +02:00
Jacob Thornton
aa594501bd
change typeahead to data-source instead of data-data and add to docs
2012-01-26 23:16:02 -08:00
Jacob Thornton
815a2ae9f2
rebuild + copy images to docs when making
2012-01-26 22:39:17 -08:00
Jacob Thornton
ed64276e5b
move doc building into base make method + build bootstrap to doc assets
2012-01-26 22:05:45 -08:00
Mark Otto
c8d2c4e442
fix height of download button
2012-01-26 16:45:01 -08:00
Mark Otto
f398926e46
move down background iamge
2012-01-26 15:22:52 -08:00
Mark Otto
b7f22e27ec
more docs homepage adjustments
2012-01-26 11:47:40 -08:00
Mark Otto
9c1ec6fb98
updated homepage docs to distill strapline
2012-01-26 11:40:29 -08:00
Mark Otto
ef4d0dd7db
space out masthead a git more
2012-01-26 10:12:25 -08:00
Mark Otto
0ef4b6419f
overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable
2012-01-26 10:00:09 -08:00
Mark Otto
ce467f7091
consistency in download page heading
2012-01-25 20:11:13 -08:00
Mark Otto
e877d125d7
fix button group shadows, update js docs to fix alert js file link
2012-01-25 20:02:32 -08:00
Mark Otto
7ca3b98d88
docs fixes
2012-01-25 13:56:44 -08:00
Mark Otto
4ea63e5261
finish off the static stuff for build and download page
2012-01-25 13:33:55 -08:00
Mark Otto
a4b8cc2a9c
darken active state on subnav with scrollspy added
2012-01-25 11:30:30 -08:00
Mark Otto
b01de5fc56
updated icons to require a base class .icon
2012-01-25 09:51:03 -08:00
Mark Otto
b8fa6cfacf
move css builder and downloader to dedicated page, start to update remaining sections on LESS docs page
2012-01-25 01:22:29 -08:00
Mark Otto
ae70d2a8b6
refine spacing on fixed subnav
2012-01-24 23:44:59 -08:00
Mark Otto
6ab56051fd
fix up docs css for responsive and subnav, fix forms error states
2012-01-24 23:35:34 -08:00
Mark Otto
731821b78f
updated docs css to fix subnav on iOS
2012-01-24 20:26:54 -08:00
Mark Otto
bacb05608f
redo the form examples to enable better responsive layout
2012-01-24 19:43:52 -08:00
Mark Otto
4a6d9106b8
fix the thumbnails more examples section
2012-01-24 19:36:42 -08:00
Mark Otto
672ba4c2fd
update the subnav on all pages
2012-01-24 19:19:50 -08:00
Mark Otto
d362223535
refine fixed docs bar
2012-01-24 18:29:17 -08:00
Mark Otto
26ed8202ee
modify the scaffolding page to fix the language around preboot/grid variables
2012-01-24 18:24:38 -08:00
Mark Otto
4793a6f8fa
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2012-01-24 17:14:34 -08:00
Mark Otto
805a965f2e
finish updating form state and alert variables in less docs page
2012-01-24 17:14:19 -08:00
Jacob Thornton
a40d4993ed
make subnav fix
2012-01-24 17:13:02 -08:00
Mark Otto
8ff621aa26
fix broken index page heading, update variables and less pages
2012-01-24 16:07:30 -08:00
Mark Otto
fecd4ddd13
docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark
2012-01-24 14:25:30 -08:00
Mark Otto
1954cf0019
comment in forms'
2012-01-23 13:46:26 -08:00
Mark Otto
ea8f5883fd
clean up subnav aesthetics
2012-01-23 12:04:48 -08:00
Mark Otto
8ceea1f559
fix some ie7 bugs, improve dropdowns for ie due to lack of a shadow, fix pager example code
2012-01-15 11:26:06 -08:00
Mark Otto
dab6d2b17c
change up classes on tables and forms, fix nav list styles in example
2012-01-14 21:28:47 -08:00
Mark Otto
fc053ac8b2
update dropdowns spacing and docs section spacing
2012-01-13 10:07:56 -08:00
Jacob Thornton
6f2f947a43
add build tool for js + rename twipsy to tooltip + lots of little doc cleanup
2012-01-11 21:42:55 -08:00
Mark Otto
cb9be7bd0c
clean up dup css in responsive, fix navbar dropdown caret
2012-01-08 13:21:44 -08:00
Mark Otto
8ccc3bcf03
overhauled dropdowns now require use of .caret for dropdown arrow, redid the button group docs section, added the split button dropdown docs section
2012-01-07 03:45:24 -08:00
Mark Otto
bcf1136f2c
fix form field sizing for selects, document form field grid sizing
2012-01-07 00:47:53 -08:00
Mark Otto
cfc2353059
front page docs updated to include old getting started section, update code styles to look like github gists, and lots more docs updates
2012-01-06 23:59:22 -08:00
Mark Otto
5cb76037ae
fixing conflict in dividers in navbar, fix navbar docs, fix search form in navbar
2012-01-05 23:24:19 -08:00
Mark Otto
c56e9d2d35
massive docs update, mostly to all our new forms, and to the buttons
2012-01-05 21:43:28 -08:00
Mark Otto
621dd13d87
move mega link footer to scaffolding to try it out, fix broken button text shadow, change UL/OL margins back, make li color same as body
2012-01-05 15:43:07 -08:00
Mark Otto
23e5fc2133
Tweak the docs and address the new forms list of controls: radios and checkboxes are now hanging controls to wrap text properly
2012-01-05 14:11:41 -08:00
Mark Otto
20add59de3
breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs
2012-01-05 10:01:42 -08:00
Mark Otto
fb9401b355
tweaks abound, updated prettify styles, new sidenav component started, sprite icons started
2012-01-05 01:34:14 -08:00
Mark Otto
324246e4f9
remove negative margin from .brand in docs, update navbar to support buttons up thurr
2011-12-27 12:39:39 -06:00
Mark Otto
af5793e1cd
fix mobile example sites, remove unused JS from docs index
2011-12-21 16:41:46 -06:00
Mark Otto
c854ed167c
rename media grid to thumbnails, recompile bootstrap, fix examples for mobile phones
2011-12-21 16:26:21 -06:00
Mark Otto
20aecb9838
updated all docs to jQuery 1.7, move all docs JS to application.js, and move dropdowns css to dedicated file
2011-12-21 16:22:20 -06:00
Mark Otto
069ef6a020
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
2011-12-19 22:59:20 -08:00
Mark Otto
72a536393c
mostly docs updates, but also some bug fixes per github issues
2011-12-19 22:58:56 -08:00
Jacob Thornton
7df0d1c7d1
rename transitions to transition and fix scrollspy example
2011-12-14 18:45:33 -08:00
Mark Otto
d681ae9f51
updated docs to include other less apps
2011-12-12 09:51:41 -08:00
Mark Otto
4e8c26d409
updated buttons docs
2011-12-11 02:38:58 -08:00
Mark Otto
401f84a7ec
center example sites in docs on mobile
2011-12-11 01:58:06 -08:00
Mark Otto
5c8df1d285
updated index page to add featured sites, more docs tweaks
2011-12-09 14:34:38 -08:00
Mark Otto
b12b71bf7c
updated to include sub nav and pip nav, new docs updates, topbar nav refinements for media queried settings
2011-12-09 11:32:07 -08:00
Mark Otto
f2c40ee24d
adding step nav to components
2011-11-30 00:39:38 -08:00
Mark Otto
cbb291b8ab
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
...
Conflicts:
bootstrap.css
bootstrap.min.css
2011-11-29 22:35:58 -08:00
Mark Otto
b36df46310
misc docs updates, revamped tables CSS save for grid columns and tablesorter options
2011-11-29 22:35:03 -08:00
Jacob Thornton
98fddaa355
new plugin "collapse" for collapsible lists and "accordion" like support
2011-11-25 17:23:14 -08:00
Jacob Thornton
bc65b58551
merge in js from 1.4... start working through js docs
2011-11-20 20:58:04 -08:00
Mark Otto
1fb98bed91
updated docs pages (still wip), adding misc css classes, added form styles from 1.4, added github buttons to homepage
2011-11-12 00:46:02 -08:00
Mark Otto
2534fee753
adding unofficial github buttons
2011-11-01 13:56:00 -07:00
Mark Otto
3f512adf95
updated docs and type styles for blockquotes and a few fixes for type
2011-10-30 20:14:27 -07:00
Mark Otto
0218d079ad
fix some of the docs styles at 480 to 768
2011-10-29 18:11:17 -07:00
Mark Otto
9fd4e459fe
adding more icons for the homepage for open source, twitter, and html5/css3
2011-10-27 23:34:48 -07:00
Mark Otto
f3128d0fa1
overhauled the front page to feel a bit more marketing-like, added the awesome glyphicons to bring some life to the docs
2011-10-27 23:00:09 -07:00
Mark Otto
20b9390a9e
update docs for responsive
2011-10-27 09:35:58 -07:00
Mark Otto
b4c894961c
address issue #414 and fix up a number of docs loose ends
2011-10-26 23:24:22 -07:00
Mark Otto
648c468927
breaking down the main page into subpages for easier, more comprehensive documentation
2011-10-26 23:11:56 -07:00
Mark Otto
e616026d67
update to docs to cleanup pagination for smartphones, fix some pagination inconsistencies
2011-10-26 21:04:14 -07:00
Mark Otto
b4c0d2a6b2
tweaks to the responsive layout to improve type
2011-10-22 22:49:37 -07:00
Mark Otto
d4675bf4ef
updating the docs to include more responsive fixes, adding rows to the responsive changes as well to undo negative margin
2011-10-22 15:49:42 -07:00
Mark Otto
a5d2450e88
refinement to the responsive section
2011-10-18 08:11:18 -07:00
Mark Otto
369b9720c6
adding responsive stuff to docs to stub that out, updated type to make ul and ol margins match p tags
2011-10-17 23:45:35 -07:00
Mark Otto
27cbe7f63a
add abbr styles, overhaul type docs section to remove lots of verbose text and put emphasis on tables and more scannable content
2011-10-17 14:17:29 -07:00
Mark Otto
6d2e39950d
updated js docs page to new 12 column layout, fix subhead jumbotron styles to match new front page
2011-10-17 00:03:52 -07:00
Mark Otto
e7d2218b20
few tweaks to responsive stuff, updated docs for grid system (still needs copy editing)
2011-10-16 23:04:31 -07:00
Mark Otto
c62a0239bd
update to responsive to fix new masthead
2011-10-16 19:12:33 -07:00
Mark Otto
1888511d67
updated docs to include quick links and twitter buttons, added updated blueprint pattern to background
2011-10-16 18:45:11 -07:00
Mark Otto
2a82b38cff
tweak the h2s again for better spacing, adjust docs, remove white bg if possible on file input, few other tweaks
2011-10-16 18:01:05 -07:00
Mark Otto
6f44a90edb
tweak line-height of h2 and h3 to not be gihugeous, updated responsive to improve tablet grid and phone styles
2011-10-16 11:35:24 -07:00
Mark Otto
9e9109469e
biiiiiig update coming for responsiveness
2011-10-16 03:00:58 -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
e8d9eb264c
update alert message for ie7 to adjust dismiss icon, update example pages to clean up a few things from testing
2011-09-16 10:51:44 -07:00
Mark Otto
8ff18a9ffc
fixing conflict and recompiling
2011-09-16 09:47:36 -07:00
Mark Otto
b188c0da8b
updated table styles a bit and floated the fluid columns to clear the row dropping problem we were having
2011-09-16 09:41:58 -07:00
Jacob Thornton
68f89d109f
little fixes for ie 7
2011-09-15 22:27:41 -07:00
Mark Otto
121b62d54e
updates to docs to include more example html, include links to javascript docs where necessary
2011-09-13 10:08:24 -07:00
Mark Otto
1d50fa77e4
adding quick and dirty favicons and touch icons for iOS
2011-09-13 09:35:43 -07:00
Mark Otto
bc2ae90e3a
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
2011-09-12 22:19:44 -07:00
Mark Otto
5249483850
comment out box-shadow on masthead and footer in docs.css because Opera sucks at inset box-shadow :"
2011-09-12 22:19:28 -07:00
Jacob Thornton
5ee11ec8bd
fix docs for opera
2011-09-12 21:06:29 -07:00
Mark Otto
6bc867ed5c
change template diagrams to be .media-grid
2011-09-11 19:53:48 -07:00
Jacob Thornton
d9cbcfc20d
wait for window load event before positioning images, doi
2011-09-10 22:54:47 -07:00
Jacob Thornton
a5964b07b1
add static sizes for images so tooltips get right size on load
2011-09-10 22:48:39 -07:00
Mark Otto
6a74a313a8
tweak css for topbar to bring back z-index fix; update javascript markup and some heading text
2011-09-10 21:10:18 -07:00
Mark Otto
00b7dff359
overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out
2011-09-10 21:05:23 -07:00
Jacob Thornton
a8d4475827
adds twipsy js to regular index for positioning
2011-09-10 14:52:45 -07:00
Mark Otto
dad058326e
add version # to docs
2011-09-09 16:00:59 -07:00
Mark Otto
53135839f5
adding nested columns to the grid section
2011-09-09 10:04:07 -07:00
Jacob Thornton
5960711d0f
some more js love - update the docs with tabs/pills plugin
2011-09-08 20:21:03 -07:00
Mark Otto
1c03a07591
bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere
2011-09-08 10:36:56 -07:00
Jacob Thornton
fb8987148a
move javascript from examples into docs
2011-09-06 23:20:56 -07:00
Mark Otto
d0882c580d
first pass at enabling active states in dropdowns in topbar and fixing the bug of having an active class on parent dropdown
2011-09-06 21:54:00 -07:00
Mark Otto
dfbb591953
addng docs for the themes stuff and examples
2011-09-04 14:02:56 -07:00
Jacob Thornton
0e13f8dca1
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
...
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
2011-09-02 21:04:25 -07:00
Mark Otto
cb244d5d51
fix docs.css spacing, add gradient support for ie9 back
2011-09-02 12:31:14 -07:00
Mark Otto
e0722fcb1b
cleanup docs and fix gradient in masthead
2011-09-02 12:24:28 -07:00
Jacob Thornton
2a5d829c4a
add doc styles back to topbar-inner
2011-09-02 00:47:06 -07:00
Jacob Thornton
ed96f181c8
add topbar dropdown js
2011-08-27 21:46:50 -07:00
Mark Otto
ce615d016a
merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts
2011-08-25 22:41:45 -07:00
Mark Otto
50f484eed6
big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme
2011-08-25 02:00:07 -07:00
Jacob Thornton
e11c49cc48
Merge branch 'master' of github.com:twitter/bootstrap
...
Conflicts:
bootstrap-1.0.0.css
bootstrap-1.0.0.min.css
docs/index.html
2011-08-21 21:42:56 -07:00
Jacob Thornton
dd92f4e6e2
hide overflow for ie 7
2011-08-21 21:26:15 -07:00
Mark Otto
a98d2cccb8
merge in master, resolve conflicts
2011-08-21 20:47:24 -07:00
Jacob Thornton
48c3c6f1b6
make topbar .fill wrap
2011-08-21 18:14:53 -07:00
Mark Otto
254e70550e
remove 60px top margin on body and tweak a few other things
2011-08-21 17:06:37 -07:00
Jacob Thornton
b18e76f990
introduce .fill class to top-nav for overflow bug
2011-08-21 12:19:01 -07:00
Mark Otto
aaf9f752c4
docs spacing, spare divs in a few places, updating css spacing
2011-08-20 23:25:22 -07:00
Mark Otto
72899a4ee8
updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values
2011-08-20 18:58:12 -07:00
Mark Otto
4a567fcb10
updated docs and docs css to not use rgba colors on the layout modules so IE can see that shiz
2011-08-20 01:11:48 -07:00
Jacob Thornton
7f99892b86
change popover stufff
2011-07-28 17:50:38 -07:00
Mark Otto
3117fc979d
getting popovers in
2011-07-01 23:10:39 -07:00
Mark Otto
460a84a926
Updated offset columns, fix app.js bug, misc tweaks to copy
2011-06-30 15:56:25 -07:00
Mark Otto
cde63b98bc
remove unnecessary js lang files from prettify, update styles for prettify
2011-06-30 13:36:47 -07:00
Mark Otto
588b2da937
updated docs, fixed language, added copy-code js for selecting text on focus
2011-06-30 10:40:28 -07:00
Mark Otto
6aae3930c9
updated docs styles, notes in header of master file, etc
2011-06-30 10:21:27 -07:00
Mark Otto
ced32d5ceb
adding note in the masthead about less.js and browser support
2011-06-30 00:31:56 -07:00
Mark Otto
9e33ab20ab
clean up commented out css, slightly updated docs again
2011-06-30 00:15:37 -07:00
Mark Otto
1905a992d9
updated docs call to actions for using bootstrap, tweaks to aesthetic
2011-06-29 23:47:54 -07:00
Mark Otto
f47b576574
yo dawg i heard you liked mastheads
2011-06-29 17:10:53 -07:00
Mark Otto
936d7acb31
trying out new doc style stuff
2011-06-29 15:51:27 -07:00
Mark Otto
25d9a2f2b8
update grid bg to 18px baseline, updated docs for disabled buttons
2011-06-28 15:54:25 -07:00
Mark Otto
b11784fec0
adding attribution in footer, link up names, clean up button styles
2011-06-28 15:31:05 -07:00
Mark Otto
4e95e558db
reseting baseline to 18px, fixing wells, moving pre styles for chili to docs
2011-06-28 15:11:41 -07:00
Mark Otto
9660f6f18d
new buttons, new modal updates around spacing and placeholder content
2011-06-28 11:56:49 -07:00
Mark Otto
243fc873d9
mucho updato around buttons to fix some stuff that was introduced with the bootstrap update
2011-06-27 17:15:26 -07:00
Mark Otto
dd769f9a6e
update to use latest version of bootstrap, docs cleanup, etc
2011-06-27 16:47:12 -07:00
Jacob Thornton
037bf9fec5
clean up org more
2011-05-04 23:49:31 -07:00