Mark Otto
|
bc0b94a3fd
|
Merge branch 'master' into 3.0.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
|
2012-12-08 17:40:42 -08:00 |
|
Mark Otto
|
cacc213762
|
Nesting tables
* Add simple test to css-tests.html
* Scope .table-bordered to immediate children th/td elements only
|
2012-12-08 12:52:19 -08:00 |
|
Mark Otto
|
33e14fe5bf
|
Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
README.md
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/examples/fluid.html
docs/scaffolding.html
less/breadcrumbs.less
less/popovers.less
less/responsive.less
|
2012-12-05 11:05:10 -08:00 |
|
Mark Otto
|
0f2a423b8d
|
Once more, update all the favicons to retina
|
2012-12-03 13:25:56 -08:00 |
|
Mark Otto
|
0fabca01db
|
Remove more fluid grid stuff
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
|
2012-11-30 16:18:40 -08:00 |
|
Mark Otto
|
fe8061b84e
|
more tests for form styles; includes lightening help text
|
2012-11-30 13:35:20 -08:00 |
|
Mark Otto
|
f9a47e3a5f
|
Refine containers and navbars
* Don't reset width on .container, .navbar-* .container, etc
* Instead, use max-width to ensure proper styling for all navbars
|
2012-11-30 12:42:37 -08:00 |
|
Mark Otto
|
030a058174
|
Remove .navbar-inner from navbar tests
|
2012-11-30 12:36:55 -08:00 |
|
Mark Otto
|
fca35c0dba
|
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
|
2012-11-30 00:13:30 -08:00 |
|
Mark Otto
|
acc037de15
|
add holder and replace placehold.it
|
2012-11-29 20:59:14 -08:00 |
|
Mark Otto
|
a56de2b84f
|
Merge branch 'glyphicons_font' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
less/sprites.less
|
2012-11-03 16:15:54 -07:00 |
|
Mark Otto
|
72198a59c0
|
removing glyphicons images, swapping in new icon font with new classes
|
2012-11-02 01:20:06 -07:00 |
|
Mark Otto
|
08eea302ef
|
remove remaining fluid grid css
|
2012-09-25 22:20:24 -07:00 |
|
Mark Otto
|
ce19e63d5b
|
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
|
2012-09-25 22:00:41 -07:00 |
|
Mark Otto
|
527d01ce99
|
headway, cleanup, and tests
|
2012-09-25 15:01:03 -07:00 |
|
Mark Otto
|
f4d3d7da2e
|
ensure 100% width for .uneditable-inputs in <767px viewports
|
2012-09-23 16:06:28 -07:00 |
|
Mark Otto
|
443c43f6c4
|
fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8
|
2012-09-20 10:28:27 -07:00 |
|
Mark Otto
|
cc3de8bd6e
|
fixes #5177: remove color on .btn-large .caret, but keep sizing change; also start to add CSS tests for buttons
|
2012-09-18 12:00:57 -07:00 |
|
Mark Otto
|
03a406d920
|
fixes #5041: add new navbar css tests for each variation, remove width: 100%; from .navbar-static-top
|
2012-09-17 15:49:22 -07:00 |
|
Mark Otto
|
7110b243f5
|
more tests and experiments
|
2012-09-10 10:11:02 -07:00 |
|
Mark Otto
|
dd1bce2611
|
latest tweaks to grid classes for forms
|
2012-09-08 12:50:37 -07:00 |
|
Mark Otto
|
b53da4b6e7
|
commenting out stuff and adding grid test page
|
2012-09-07 22:46:35 -07:00 |
|
Mark Otto
|
acf2a64016
|
fixes #4935: properly comment responsive image techniques and add CSS tests to support
|
2012-09-03 17:35:35 -07:00 |
|
Mark Otto
|
7d412b1e14
|
fixes #4741: undo previous version's attempt at firefox gradient changes and add gradient tests
|
2012-08-27 21:18:55 -07:00 |
|
Mark Otto
|
22c4f3d058
|
fixes #4718: add vertical-align: middle; to .btn-group to ensure proper alignment next to standard .btn
|
2012-08-27 12:05:15 -07:00 |
|
Mark Otto
|
190d3c9c3e
|
fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state
|
2012-08-21 14:22:26 -07:00 |
|
Mark Otto
|
6dc13573bf
|
add css tests and stuff for #4528
|
2012-08-21 13:42:00 -07:00 |
|
Mark Otto
|
1e2edaef48
|
add test for #4236: button group, one button with text and one with icon, now line up properly
|
2012-08-01 22:52:53 -07:00 |
|
Mark Otto
|
fc7ecd78c8
|
add select element responsive CSS test
|
2012-08-01 20:58:33 -07:00 |
|
Mark Otto
|
225d0e0af3
|
label new css test
|
2012-08-01 19:36:28 -07:00 |
|
Mark Otto
|
3c742fc08b
|
add test for textarea at .span12, really fix docs footer
|
2012-08-01 19:25:50 -07:00 |
|
Mark Otto
|
364dbb7931
|
fixes #3665: ensure inputs in a fluid row maintain grid sizing
|
2012-07-30 15:38:36 -07:00 |
|
Mark Otto
|
a9bf1e6e35
|
fixes #3900: nudge badges in buttons up 1px
|
2012-07-30 13:25:27 -07:00 |
|
Mark Otto
|
7fa99fb1fe
|
fix navbar form alignment, and update examples to show these cases
|
2012-07-30 12:15:08 -07:00 |
|
Mark Otto
|
3c1a0fbda4
|
fixes #4103: simpler fix for tfoot in .table-border
|
2012-07-19 21:25:24 -07:00 |
|
Mark Otto
|
89d7ec5290
|
fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer
|
2012-07-19 21:06:42 -07:00 |
|
Mark Otto
|
e20d2dfe9d
|
docs cleanup and blockquote cleanup for .pull-right option
|
2012-07-15 16:13:25 -07:00 |
|
Mark Otto
|
549d61fc28
|
updated footer
|
2012-07-12 17:02:55 -07:00 |
|
Roberto - phproberto
|
83846ba0d6
|
Fixes #4002 responsive utilities classes
|
2012-07-10 08:12:16 +02:00 |
|
Mark Otto
|
cd6915cdb4
|
tests cleanup on type, homepage content tweaks
|
2012-07-05 19:45:32 -07:00 |
|
Mark Otto
|
3c07eaa251
|
updates to type scale
|
2012-07-05 15:11:54 -07:00 |
|
Mark Otto
|
8c2db7d7d6
|
prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack
|
2012-06-25 15:47:07 -07:00 |
|
Mark Otto
|
cd466f1d0b
|
add tests for table grid sizing, solve bugs in fluid table grid sizing
|
2012-06-25 14:37:35 -07:00 |
|
Mark Otto
|
9aa5a6db12
|
updated tests and homepage marketing copy
|
2012-06-19 13:21:35 -07:00 |
|
Mark Otto
|
7875e4833c
|
fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing
|
2012-05-28 17:32:24 -07:00 |
|
Mark Otto
|
e009ed23fc
|
move navbar and update paths so it sits in tests
|
2012-05-15 09:45:53 -07:00 |
|
Mark Otto
|
87f6e426b3
|
three columns
|
2012-05-14 23:50:34 -07:00 |
|
Mark Otto
|
c8cafa5d5a
|
move forms test to less/tests
|
2012-05-14 23:45:25 -07:00 |
|
Mark Otto
|
ad46b0980c
|
expand input css tests to fixed width grid
|
2012-04-30 15:06:26 -07:00 |
|
Mark Otto
|
66ac6e14db
|
heading
|
2012-04-24 06:53:48 -07:00 |
|