Mark Otto
7cceaa6956
Merge branch 'bs3_cdn_docs_mention' into 3.0.0-wip
...
Conflicts:
docs/docs.html
2013-05-03 14:13:06 -07:00
Mark Otto
14861e9cc3
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-05-03 14:11:23 -07:00
Mark Otto
b5d68f59c2
Add cursor: pointer; to .checkbox and .radio and their inline counterparts
2013-05-03 11:56:00 -07:00
Mark Otto
1587b8948f
run make on previous commits
2013-05-03 10:53:26 -07:00
Kevin Ingersoll
08fea3304a
Fix input border flicker in Chrome from @garoevans, closes #7689
2013-05-03 15:33:12 +12:00
DarDar
9cd3a92713
Use @font-size-... variables instead of hardcoded font-size in px
2013-05-02 08:05:00 +02:00
Mark Otto
47155e8aa3
outdent the rows for tablets and above
2013-04-30 19:35:52 -07:00
Mark Otto
0780faad45
make that left/right padding, not top/bottom on navbar
2013-04-30 19:20:41 -07:00
Mark Otto
69f5447afa
add back bottom margin to navbars
2013-04-30 19:12:48 -07:00
Mark Otto
e8b7318646
no need for zero padding on navbar top/bottom; better comment
2013-04-30 19:07:28 -07:00
Mark Otto
26bc36107e
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 22:46:10 -07:00
Mark Otto
e13d05317e
single colon pseudo element for ie8
2013-04-28 22:45:56 -07:00
Robert Burns
447be1b326
Cleanup breadcrumb divider last item
...
Modify to hide both padding and leading/trailing whitespace
Thanks to https://github.com/holic for suggestion
2013-04-28 21:51:02 -04:00
Mark Otto
cd06c5baac
Merge pull request #7704 from twitter/bs3_moar_grid_changes
...
BS3: Overhaul grid system once more
2013-04-28 18:44:54 -07:00
Mark Otto
5edfdc02f2
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-04-28 14:27:58 -07:00
Mark Otto
bbee78b30b
derp on navbar toggle and docs positions
2013-04-28 14:27:48 -07:00
Robert Burns
3326e1b21e
Fix navbar on phone/tablet devices after navbar overhaul
2013-04-28 10:09:57 -04:00
Mark Otto
8b3a1702d4
Overhaul navbar navs
...
* Switch from to to eliminate an element in selectors
* Drop .navbar-divider entirely
2013-04-27 18:28:39 -07:00
Mark Otto
2ffa0e4409
Add maximum bounds variables for so our responsive utilities don't overlap
2013-04-27 11:55:45 -07:00
Kevin
9ce7f22e99
Adding media queries breakpoints variables
2013-04-27 18:47:47 +02:00
Mark Otto
efd3b0c171
Back to two grid classes, .col and .col-lg-*
2013-04-26 23:59:51 -07:00
Mark Otto
8ae9c6ab34
Fixes #7688 : move font-weight for glyphicons to before pseudo element
2013-04-26 23:14:06 -07:00
Mark Otto
aa146582d6
Redo the getting started section to mention BootstrapCDN
2013-04-26 20:51:48 -07:00
Mark Otto
57ba494409
running make
2013-04-26 10:44:44 -07:00
Artur Kwiatkowski
55bbb9ffd7
Nuked local .a() mixins and simplified the nesting
2013-04-22 15:34:23 +02:00
Artur Kwiatkowski
b7dcefea83
Merge branch '3.0.0-wip' of https://github.com/twitter/bootstrap into 3.0.0-wip
2013-04-22 15:21:55 +02:00
Mark Otto
e0d60b1325
Fixes #7617 : lowercase and dash gray color vars
2013-04-21 19:35:36 -07:00
Mark Otto
364f8330a1
Fixes #7648 : Thumbnail caption should use @text-color variable. Also adds other thumbnail vars
2013-04-21 18:29:06 -07:00
Mark Otto
30d6e0530e
Fixes #7577 : Attempt to fix, at least, issues with Windows Phone 8 and responsive not kicking in correctly
2013-04-21 14:50:44 -07:00
Mark Otto
dc4436dbc9
Only use .danger for alerts, no more .error
2013-04-20 15:36:11 -07:00
Mark Otto
510c9a6ad8
First pass at updated responsive utilities to be mobile-first. Pulled from #7490 by @apotropaic
2013-04-20 12:33:09 -07:00
Mark Otto
afdab35aca
Fixes #7640 : only reset margin on last-child p within blockquotes
2013-04-20 12:09:08 -07:00
Artur Kwiatkowski
39bb8146f8
more nested labels component
2013-04-19 21:31:55 +02:00
Mark Otto
5c9bd1a221
Merge pull request #7608 from Fowowski/3.0.0-wip
...
more nested less rules - pager component
2013-04-18 19:47:26 -07:00
Fabien
7b5fcc2c9a
Remove dupe css rule of table element
...
This are already declare in normalize
2013-04-19 02:48:08 +02:00
Jeremy Denoun
d3e0d4a7ba
update docs
2013-04-18 17:05:50 +02:00
Artur Kwiatkowski
4bd6abaff2
applied @pagination-bg for .disabled state instead of hardcoded color in hex
2013-04-17 19:47:23 +02:00
Artur Kwiatkowski
dc97a1967b
more nested navs
2013-04-16 16:45:51 +02:00
Mark Otto
5b38a1a357
Merge branch 'bs3_homepage' into 3.0.0-wip
2013-04-15 00:16:40 -07:00
Mark Otto
5471ce8ea3
Fixes #5256 : Use > selector for better nesting of tables
2013-04-14 20:33:54 -07:00
Mark Otto
02eba5e5fc
center
2013-04-14 16:31:52 -07:00
Mark Otto
8d9106f2c5
nuke hidden homepage content
2013-04-14 15:32:52 -07:00
Mark Otto
0b3e9ced54
Merge branch '3.0.0-wip' into bs3_homepage
2013-04-14 13:45:10 -07:00
Mark Otto
ccb6ac570f
lighter .highlight in sidenotes as well
2013-04-14 13:00:53 -07:00
Mark Otto
f78945ccc9
More contrast with code snippets in sidenotes
2013-04-14 12:54:02 -07:00
Mark Otto
5f88887c7e
redo all the things
2013-04-14 12:49:35 -07:00
Mark Otto
f226463b05
Restore on links in dropdowns as they are randomly breaking onto new lines
2013-04-13 23:54:51 -07:00
Mark Otto
86bb3b8126
IE8 doesn't need help with responsive images, they work just dandy apparently (see http://jsbin.com/idesit/1 )
2013-04-13 23:17:39 -07:00
Mark Otto
fc8b9fb07d
swap all bold p tags in sidenotes for h4s
2013-04-13 22:10:34 -07:00
Paul Tyng
bec5679264
update docs bootstrap.css
2013-04-13 17:13:14 -03:00
Mark Otto
ae98f1803f
add modal variables and tweak padding for min-height on modal title
2013-04-12 20:56:19 -07:00
Mark Otto
a96dd1bd28
Merge branch '3.0.0-wip' of https://github.com/garvincasimir/bootstrap into garvincasimir-3.0.0-wip
2013-04-12 20:45:10 -07:00
Mark Otto
24f8d9e137
don't use table for label variatons
2013-04-09 10:43:37 -07:00
Mark Otto
1a546278b9
make back to top and big headings only for tablets and up
2013-04-09 10:20:50 -07:00
Mark Otto
dd533aaaf0
better buttons on mobile
2013-04-09 10:16:37 -07:00
Garvin
05710e10f7
Added min-height to modal-header for modals with no header text
2013-04-06 21:48:53 -04:00
Mark Otto
eadfa59d92
Add small grid for phones and tablets
2013-04-02 19:40:43 -07:00
Mark Otto
c570ae49ef
fix that sidenav
2013-04-02 16:22:42 -07:00
Mark Otto
0ac711059b
refactor some of the carousel caption stuff to center it and tighten styles up; update carousel template to start to redo mobile first
2013-04-02 16:17:04 -07:00
Mark Otto
7e31bea114
run make
2013-04-01 13:25:51 -07:00
Mark Otto
292734d7f3
Docs examples update
...
* Remove unused fluid image
* Add image, link, and description for new grid example
* Update sign in example image
2013-04-01 13:14:39 -07:00
Mark Otto
eac987c0d2
only negative indent nested grid rows; add new grid example
2013-04-01 12:55:48 -07:00
Mark Otto
19d5e61668
clearer separation with section headers; simpler customizing copy
2013-04-01 00:34:58 -07:00
Mark Otto
2f8deea95a
add .panel-primary
2013-03-31 22:22:52 -07:00
Mark Otto
c69310153e
Fixes #7438 : remove max-height from justified nav tabs with some CSS wankery
2013-03-31 19:26:40 -07:00
Mark Otto
4c49458336
remove text-rendering optimizeLegibility from headings
2013-03-31 18:40:07 -07:00
Mark Otto
db284a97d6
more consistent navbar vars
2013-03-31 17:56:31 -07:00
Mark Otto
d6f37f3c56
@link-color-hover to @link-hover-color
2013-03-31 17:27:22 -07:00
Mark Otto
d5fa1d80bb
use @pagination- vars on pager component; change @pagination-bg-active to @pagination-active-bg
2013-03-31 17:22:12 -07:00
Mark Otto
6b23a66c29
-background to -bg on tooltip and popover vars
2013-03-31 17:19:12 -07:00
Mark Otto
c5042e050e
fix nav divider
2013-03-31 17:17:10 -07:00
Mark Otto
388a4c878d
remove lingering rem
2013-03-31 13:20:54 -07:00
Mark Otto
674768b177
restore px unit on @font-size-base
2013-03-31 12:00:04 -07:00
Mark Otto
a2145df7c4
run make after that breadcrumbs tweak
2013-03-31 11:58:25 -07:00
Mark Otto
e62f2901d0
Merge pull request #7431 from burnsra/3.0.0-wip-fixes
...
Cleanup items for 3.0.0
2013-03-31 11:55:48 -07:00
Mark Otto
fc16e37aaa
Remove the handful of rem font-sizes
2013-03-31 11:26:13 -07:00
Robert Burns
74e06cb279
Add styles for tooltip and popover examples
2013-03-31 09:59:02 -04:00
Mark Otto
40f671a531
add basic back to top link via affix
2013-03-30 18:41:26 -07:00
Mark Otto
6edd5f291a
not quite #fff on .list-group-item-text
2013-03-30 17:00:11 -07:00
Mark Otto
1683669eaa
Remove .nav-list given new .list-group
2013-03-30 16:56:49 -07:00
Mark Otto
2a9604fdd2
add list group component
2013-03-30 16:07:50 -07:00
Mark Otto
9fff2d3fb6
Change error to danger for all classes; add panels component
2013-03-30 14:15:18 -07:00
Mark Otto
aee25786a7
fuck everything about .clear_float() -- restore .clearfix() as mixin
2013-03-30 13:23:18 -07:00
Mark Otto
9336a827c6
fix submenu docs height given border-box
2013-03-30 13:11:15 -07:00
Mark Otto
601013ca04
drop .muted for .text-muted
2013-03-30 00:11:38 -07:00
Mark Otto
8814125259
Add subnav support to CSS section
2013-03-29 23:33:08 -07:00
Mark Otto
4ce9203f2c
Merge branch '3.0.0-wip' into bs3_new_nav
2013-03-29 14:21:03 -07:00
Mark Otto
2ebc060795
mo padding on side nav links
2013-03-29 13:43:37 -07:00
Mark Otto
3055f09a90
dat red
2013-03-29 10:45:00 -07:00
Andreas Cederström
090545ffdf
Make sure form actions are properly aligned with form-horizontal
2013-03-28 11:33:18 +01:00
Mark Otto
3278c40631
move nav into partial; rejigger content some more
2013-03-28 03:06:00 -07:00
Mark Otto
df35e26142
rejigger some content and start exploring section headings
2013-03-28 01:34:42 -07:00
Mark Otto
4b8b8d2e46
holy crap new docs layout separate from home, no more top navbar
2013-03-28 01:08:14 -07:00
Mark Otto
081c061281
new subnav on all pages
2013-03-28 00:21:21 -07:00
Mark Otto
fe414d8566
turn docs navbar into left navbar
2013-03-27 23:33:45 -07:00
Mark Otto
f0f33eb9a3
Refactor .list-inline and .list-unstyled
...
* Instead of shared and separate CSS, isolate by class for easier mixin-ability
* .list-unstyled is now used as a mixin in .list-inline
2013-03-27 15:42:11 -07:00
Mark Otto
5b298a2aaf
docs fixes with new .bs-docs-container; fixing some lingering grid classes
2013-03-26 23:54:17 -07:00
Mark Otto
ca31f060a8
New grid classes
2013-03-26 17:12:17 -07:00
Mark Otto
3c82ccaa2b
color border in table contextual classes
2013-03-17 17:26:02 -07:00
Mark Otto
3aee2adb4b
Fixes #7297 : add support for .success, .error, and .warning on td and th elements in tables
2013-03-17 12:10:58 -07:00
Mark Otto
6012d8221b
Exploring rems as font-size unit
...
* Added a new mixin to calculate rems and pixels for IE fallback
* Updated the body, p, and .lead elements to use the new .font-size() mixin
* New mixin has default value of 14px or 1.4rem
* Still needs exploration, and change this means lots of work rejiggering margins and line-heights
* Related, started to reorganize the mixins a bit to call out mixins that are used by the framework and not utilities or snippets
2013-03-17 11:33:07 -07:00
Mark Otto
68dfd322f4
fixes #7140 : hide navbar toggle in print
2013-03-16 16:17:32 -07:00
Mark Otto
fe2658ed61
Fixes #7150 : colorize links in alerts
2013-03-16 15:31:03 -07:00
Mark Otto
8c9e9e28cf
Fix vertical button groups
2013-03-16 13:03:31 -07:00
Mark Otto
efbf8373a5
Use form elements in checkbox and radio button groups
...
* Uses .btn on label elements with nested checkbox and radio controls within
* Updated examples to reflect change in HTML and CSS
* Had to add .active all buttons for proper state highlighting (mimicing the :active pseudo state)
* Still needs JavaScript plugin updated by @fat
2013-03-16 12:34:07 -07:00
Mark Otto
be8f992c94
remove inner shadow from .highlight
2013-03-16 12:09:26 -07:00
Mark Otto
f77dc548a1
update pygments highlighting with customizations from preboot
2013-03-16 12:07:00 -07:00
Mark Otto
bb38fa5286
Overhaul the grid system and its docs
...
* Add new grid mixins adapted from Preboot (http://github.com/mdo/preboot )
* Drop the @grid-row-width and @grid-column-width variables
* Add the @grid-float-breakpoint variable, as used in Preboot
* Add support for .push* and .pull* classes for column ordering manipulation
* Document all the things
2013-03-15 23:21:10 -07:00
Mark Otto
ecfdecea00
Use translucent box shadow on hr elements; colorize hr elements within alert components
2013-03-14 23:01:23 -07:00
Mark Otto
4c0719ea5f
fix derpy linenos in pygments for thumbnails component
2013-03-14 22:34:20 -07:00
Mark Otto
ed7fe0e5ba
unfuck misaligned main container
2013-03-14 21:45:31 -07:00
Mark Otto
224296f695
Fixes #7281 : make tables super specific for hovers and striping to avoid nesting issues
2013-03-14 13:29:43 -07:00
Mark Otto
d219b8b964
Set border-box globally instead
2013-03-10 13:24:07 -05:00
Mark Otto
6e8ee02421
tweak icons alignment
2013-03-03 23:41:16 -08:00
Mark Otto
bfdc6f8607
Remove support for .uneditable-input
2013-03-03 23:31:09 -08:00
Mark Otto
b83fc82aed
fix row change at breakpoint
2013-03-03 18:19:31 -08:00
Mark Otto
e0647e8273
nuke commented out unused var
2013-03-01 12:37:36 -08:00
Mark Otto
77e8e2aee9
Fix alignment of .navbar-brand
2013-03-01 00:50:08 -08:00
Mark Otto
492c249537
improve navbar toggle and hide code snippets on mobile devices for now
2013-03-01 00:18:10 -08:00
Mark Otto
ba633949dc
customize navbar in docs
2013-02-28 23:36:54 -08:00
Mark Otto
38ba057dee
Fixes #6998 : disabled background color properly on pagination
2013-02-28 23:23:05 -08:00
Mark Otto
5a30e52aac
Fixes #6995 : Add disabled navbar nav link support
2013-02-28 23:20:58 -08:00
Mark Otto
4418c82888
Fixes #6954 : properly reset grid classes within tables
2013-02-28 22:47:32 -08:00
Mark Otto
bfc4aaf6e8
Holy fucking shit fix that input group with buttons rounded corner noise
2013-02-28 21:19:02 -08:00
fat
3469339068
2.3.1
2013-02-28 20:55:14 -08:00
Mark Otto
b19eb88b5a
Fixes #6935 : Use standard decimal points for .opacity() mixin
2013-02-28 19:46:49 -08:00
Mark Otto
0dea8b0c74
Fixes #6897 : Print styles get own .less file
2013-02-28 19:42:51 -08:00
Mark Otto
9d763e805b
Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting
2013-02-28 19:34:02 -08:00
Mark Otto
e2e5580c0e
nuke glyphicons changes in buttons for now because it's whack
2013-02-26 00:44:15 -08:00
Mark Otto
e1bb94c383
try out new table-based type example
2013-02-24 01:29:19 -08:00
Mark Otto
023568fe3d
Navbar realignment:
...
* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering
2013-02-18 01:28:35 -08:00
Mark Otto
acdffe696c
Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems
2013-02-17 22:20:49 -08:00
Mark Otto
f6ec2c5dac
Drop the recently added .counter class for .badge
2013-02-17 21:06:20 -08:00
Mark Otto
53091be6d2
remove unnecessary select border reset
2013-02-17 20:26:21 -08:00
Mark Otto
82d059de87
fix broken marketing section with updated class
2013-02-17 20:18:29 -08:00
Mark Otto
c6f341bd17
Refactor some common classes from docs css and examples, then prevent examples from using docs.css
2013-02-17 18:58:40 -08:00
Mark Otto
36aec5e484
decrease top/bottom padding a bit in mobile fixed navbars
2013-02-17 18:47:44 -08:00
Mark Otto
ee9a0f4b94
css to go with it
2013-02-17 18:46:49 -08:00
Mark Otto
c0ea077fb4
Revert the statis navbar in mobile views--they're back to being fixed all the time
2013-02-17 18:33:55 -08:00
Mark Otto
6ccf588a8e
Restore submenu support
2013-02-17 13:35:14 -08:00
Mark Otto
6dce3f63d8
Scrach that: carousel caption is always left aligned, but still hidden for mobile views
2013-02-16 02:47:48 -08:00
Mark Otto
6d048471c4
Re-add carousel captions as optional
...
* They're hidden by default in the mobile-first views because otherwise they just cover up the slides
* In mobile they're centered, and then are shown left aligned at larger viewports
2013-02-16 02:47:15 -08:00
Mark Otto
401d4fabd1
Nuke the old_docs.css file
2013-02-16 01:39:09 -08:00
Mark Otto
ce21926704
All Glyphicons now require a base class, e.g. .glyphicon.glyphicon-star
2013-02-16 01:26:43 -08:00
Mark Otto
d8e2668c1d
Overhaul carousel a bit more:
...
* Drop custom type arrow controls for glyphicons icons instead for more consistent rendering
* Remove the captions and instead let folks implement what they want in the carousel
* Move the indicators to the bottom middle instead of top right
* Lighten up gradients on the edges for less harsh lighting
2013-02-16 01:22:15 -08:00
Mark Otto
b688d8dcd4
More accurate padding for fixed navbars at >768px
2013-02-16 00:20:20 -08:00
Mark Otto
f38e50cdf1
Don't affix the fixed navbars in mobile views
2013-02-16 00:19:17 -08:00
Mark Otto
d1aae5f82b
twerk gallery examples to stay at 400px or less for proper retinafying
2013-02-15 17:27:05 -08:00
Mark Otto
979ca4ea7a
Convert JS page to pygments; nuke prettify assets
2013-02-14 22:33:26 -08:00
Mark Otto
37becbab8c
convert components code examples to pygments
2013-02-14 21:42:33 -08:00
Mark Otto
6b14de292a
pygmentize grid section; update bs-docs-example corners
2013-02-14 00:43:43 -08:00
Mark Otto
7e6211e244
twerk dat manni pygment style
2013-02-14 00:39:32 -08:00
Mark Otto
5f0ecb740a
Start pygmentizing css.html; add new theme for pygments
2013-02-14 00:23:23 -08:00
Mark Otto
d709dba284
Start using some includes; test out some pygments highlighting
2013-02-13 23:37:08 -08:00
Mark Otto
96953c2072
update makefile to work again; gitignore the compiled docs _gh_pages folder; test makefile with darkened navbar active bg
2013-02-13 12:30:56 -08:00
Mark Otto
e45f12ad42
rearrange jekyll and docs
2013-02-12 12:44:41 -08:00
Mark Otto
8b9733b288
nuke what we don't need for jekyll
2013-02-12 12:25:05 -08:00
Mark Otto
63c1377ee7
Fixes #6852 : add cursor pointer to carousel indicators
2013-02-08 09:56:04 -08:00
Mark Otto
1b2b049ef8
Fixes #6841 : Add new Firefox placeholder, comments
2013-02-08 08:32:29 -08:00
Mark Otto
3eed90c187
Fixes #6837 : Enable text alignment utility classes on tables
...
* Removes text-align from td elements (no need to set that one)
* Specifically sets th to text-align: left; at a global level (no longer within .table) to override browser defaults
* Removes font-weight: bold; from th while we're at it since that's browser default already
2013-02-08 08:24:10 -08:00
Mark Otto
b04acb37e8
finish modal tweaks
2013-02-07 19:31:12 -08:00
Mark Otto
a623b8c10f
update docs modals
2013-02-07 19:21:56 -08:00
Mark Otto
cdb2147b13
add new modal to docs example
2013-02-07 19:00:48 -08:00
Mark Otto
8ca70bd83a
Overhaul modal to make it responsive and not super lame
2013-02-06 02:07:40 -08:00
Mark Otto
421f9f67c4
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
2013-02-05 22:42:54 -08:00
fat
3b56227553
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540
clean up styles
2013-02-05 22:29:59 -08:00
Mark Otto
0fe9148b91
Fixes #6190 : Add print utility classes
2013-02-05 22:17:28 -08:00
Mark Otto
fb1db88256
Update homepage examples, add hella new sites to gallery
2013-02-05 21:04:46 -08:00
Mark Otto
37a6879ca5
White navbar brand text for inverted navbar
2013-02-05 20:39:09 -08:00
Mark Otto
28e1702052
nuke rogue conflict comment and remake
2013-02-05 19:59:02 -08:00
Mark Otto
43da258bd9
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/examples/hero.html
less/buttons.less
less/carousel.less
less/close.less
less/dropdowns.less
less/labels-badges.less
less/mixins.less
less/navbar.less
less/navs.less
less/pagination.less
less/responsive-navbar.less
less/scaffolding.less
less/sprites.less
less/thumbnails.less
less/type.less
2013-02-05 19:53:44 -08:00
Mark Otto
c97d304c0c
derp, fix broke css and recompile
2013-02-05 19:43:49 -08:00
Mark Otto
15c7e73abd
Merge branch '2.3.0-wip' of https://github.com/patrickhlauke/bootstrap into patrickhlauke-2.3.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/navbar.less
2013-02-05 19:39:49 -08:00
Mark Otto
74c8a5611d
Increase margins and line-height on h3; overhaul button dropdown docs
2013-02-05 00:49:54 -08:00
Mark Otto
c09b994eea
Add justified button groups for link buttons; reorganize dropdowns and button groups docs sections
2013-02-05 00:30:03 -08:00
Mark Otto
0a3e3a50fe
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/type.less
2013-02-04 11:12:09 -08:00
Mark Otto
2f7087eae9
Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip
2013-02-02 19:08:59 -08:00
Mark Otto
6993fadf7e
Simplify input and input group sizing
...
* Remove .input-mini because who really needs inputs that small
* Remove unnecessary border-radius resets from large and small input groups
2013-02-02 17:31:26 -08:00
Mark Otto
04aae2f56c
Merge branch '3.0.0-wip' of https://github.com/gilbarbara/bootstrap into gilbarbara-3.0.0-wip
2013-02-02 17:01:29 -08:00
Mark Otto
c64aa26d06
Add @btn-color variable and use in buttons and carets; fixes dropup caret as well
2013-02-02 13:03:18 -08:00
Mark Otto
dbe8aed76e
Merge pull request #6763 from rjregenold/2.3.0-wip
...
fixes jankiness with anchor tags in carousel.
2013-02-02 12:35:39 -08:00
Mark Otto
94e256c016
Refactor navbar dividers
...
* Instead of .divider-vertical, use .divider
* Makes use of .nav-divider mixin
* Dividers are horizontal to start, matching the default state of navbar nav links
* Dividers become vertical above 768px via media queries
2013-02-01 22:56:09 -08:00
Mark Otto
dad9889aeb
Fixes #6657 : Upgrade Normalize to 2.1.0
2013-02-01 21:49:54 -08:00
Mark Otto
d53af49afe
Refactor colors and progress bars
...
* Buttons and progress bars now make use of more semantic global @brand- colors
* Progress bars have been rewritten to reduce the number of possible selectors
* Instead of .progress .bar, it's .progress-bar for individual bars of color, ultimately making for less CSS
2013-02-01 16:21:38 -08:00
Nikhil Dabas
b7b2e4f8a1
Fixing inline lists for IE7
2013-02-02 02:04:30 +05:30
Gil Barbara
24f0505bde
Update input-group-addon for input sizes
2013-02-01 01:39:26 -02:00
Mark Otto
52aa67fa1c
only round jumbotron corners at 768px+
2013-01-31 18:11:45 -08:00
Mark Otto
b02a0fe768
Button up navbar form which was adding 2px padding to .navbar
2013-01-31 18:09:49 -08:00
Mark Otto
83e5c01856
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/assets/css/docs.css
docs/assets/js/application.js
docs/components.html
docs/templates/pages/components.mustache
less/sprites.less
2013-01-31 17:57:31 -08:00
RJ Regenold
2f44d8d2da
removes anchor tag definition.
2013-01-31 12:49:53 -06:00
RJ Regenold
6014e63054
lets see how much i can mess this pull request up. :|
2013-01-31 11:10:41 -06:00
RJ Regenold
e38d08d4c0
fixes jankiness with anchor tags in carousel.
2013-01-31 10:03:53 -06:00
Mark Otto
baadc33c88
make on prev commit
2013-01-30 18:22:20 -08:00
Mark Otto
3cc65cb86c
clear up show-grid stuff
2013-01-30 18:16:14 -08:00
Mark Otto
d30f47efb2
Tighten up badges docs; less bottom margin on h3
2013-01-19 18:53:41 -08:00
Mark Otto
c21c3f101b
Merge branch '3.0.0-wip-badges-to-counters' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip-badges-to-counters
2013-01-19 17:06:40 -08:00
Vickash Mahabir
c77a459b35
IE8 compatible fix for disabled button hover
2013-01-19 19:32:55 -04:00
Mark Otto
d7d5069be1
Add sticky footer navbar example to list; fix docs padding
2013-01-19 09:38:49 -08:00
Vickash Mahabir
665de0455c
Change .badge to .counter, make appearance more OSX-ish, and remove colors
2013-01-18 17:35:23 -04:00
Vickash Mahabir
b741c731a2
Fix logic error where a disabled button would change color in an enabled fieldset
2013-01-18 12:12:30 -04:00
Vickash Mahabir
6e96cd1a7c
Forgot to add built docs css file
2013-01-18 11:58:12 -04:00
Mark Otto
caed3a9dbb
fix up jumbotron example
2013-01-17 20:35:59 -08:00
Mark Otto
5075f4973b
Semibold dat .navbar .brand
2013-01-17 20:30:40 -08:00
Mark Otto
d9b35c2602
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/css.html
docs/customize.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/javascript.html
docs/scaffolding.html
docs/templates/layout.mustache
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
f068cdeb63
Combine .thumbnail and .img-thumbnail into simpler selectors
2013-01-17 20:18:03 -08:00
Mark Otto
ca74b9882b
Change .img-polaroid to .img-thumbnail
...
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
2013-01-17 20:16:04 -08:00
Mark Otto
89b6477bdc
Remove .info from table rows
2013-01-17 20:13:11 -08:00
Mark Otto
5663833bfc
Restore .btn-info
2013-01-17 19:51:22 -08:00
Mark Otto
b30b8c2c12
Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though.
2013-01-17 17:02:35 -08:00
Mark Otto
8765df47cd
remove global text-shadow from alerts components because it was fucking up buttons in a real way
2013-01-17 15:43:23 -08:00
Mark Otto
e304798194
scrollspy example twerks
2013-01-17 15:42:52 -08:00
Mark Otto
3a1e1167d6
restore scrollspy example
2013-01-17 15:40:43 -08:00
Mark Otto
97975c5fcf
Readd focused example of inputs to docs; clean up alerts section
2013-01-17 15:36:36 -08:00
Mark Otto
32bcbe5671
cleanup example templates
2013-01-17 15:00:49 -08:00
Mark Otto
237f5e15d3
Nuke shadows around thumbnails
2013-01-17 14:25:40 -08:00
Mark Otto
bb94de7873
Larger homepage headings
2013-01-17 14:22:41 -08:00
Mark Otto
26f9f4e3a5
Remove navbar search
2013-01-17 12:02:17 -08:00
Mark Otto
32ebe2efd1
mo betta navbar dropdowns
2013-01-17 11:55:37 -08:00
Mark Otto
597a248d4a
Rearrange navbar.less and improve vertical divider support
2013-01-17 11:34:46 -08:00
Mark Otto
360f0c5359
Fix floats in navbar
2013-01-17 11:20:19 -08:00
Mark Otto
01b32f472d
Simplify and bring back the grid mixin for generating spans and offsets
2013-01-17 10:49:10 -08:00
Mark Otto
7e46b6f636
Update nav and add bounds for tablet container
2013-01-17 00:58:34 -08:00
Mark Otto
267d3e7ed7
streamline css docs
2013-01-17 00:50:19 -08:00
Mark Otto
2398245e17
Remove all old responsive styles since we're motherfucking mobile first son
2013-01-17 00:43:58 -08:00
Mark Otto
687d4a3eeb
Move grid/container styles to grid.less; update docs; add offsetting back
2013-01-17 00:42:31 -08:00
Mark Otto
a8a60e94e3
padding twerk
2013-01-17 00:24:18 -08:00
Mark Otto
33864b4a3d
dat docs messaging (on the homepage)
2013-01-17 00:23:25 -08:00
Mark Otto
9374965b83
docs css cleanup
2013-01-17 00:20:00 -08:00
Mark Otto
630005687d
Remove ported navbar css that was already commented out
2013-01-17 00:13:12 -08:00
Mark Otto
4129be6ebd
Update sidenav and responsive css
2013-01-17 00:13:04 -08:00
Mark Otto
f535201781
improve navbar vars and fix side nav alignment
2013-01-16 23:33:26 -08:00
Mark Otto
6b193dc22d
More navbar tweaks, including making fixed navbars work in the docs by adding padding to body
2013-01-16 16:20:29 -08:00
Mark Otto
9ba14cfb7c
More navbar derping
2013-01-16 16:14:41 -08:00
Mark Otto
960804cea3
mo betta new navbar styles; hook up some changed vars
2013-01-16 15:35:41 -08:00
Mark Otto
ee9403e2d2
flatten the progress bars
2013-01-16 15:19:55 -08:00
Mark Otto
baa8c3ec9e
restore alerts, and make them suck much less
2013-01-16 15:16:04 -08:00
Mark Otto
0b81dd217f
tuck some margins
2013-01-16 15:11:17 -08:00
Mark Otto
1288304e91
Make jumbotron mo responsive
2013-01-16 15:07:57 -08:00
Mark Otto
cf693b5632
Add in responsive for 1200px+ layout; increase padding for that viewport size
2013-01-16 14:48:25 -08:00
Mark Otto
13a80f33c8
fix up sidenav and components page
2013-01-16 14:10:33 -08:00
Mark Otto
3e40e7dfbf
mo betta sidenav for responsive hotness
2013-01-16 13:20:32 -08:00
Mark Otto
beb2c13f4d
Prevent grids from collapsing, fix affixed side nav for docs
2013-01-16 13:11:45 -08:00
Mark Otto
a7a06a05a4
Remove commented out files; leave responsive stuff commented out for now
2013-01-16 13:08:27 -08:00
Mark Otto
910ca85a70
restore remaining components
2013-01-16 13:07:41 -08:00
Mark Otto
bc7fd582ed
restore pagination and pager
2013-01-16 13:07:08 -08:00
Mark Otto
2127690e73
restore breadcrumbs
2013-01-16 13:06:15 -08:00
Mark Otto
2407217686
restore wells and close
2013-01-16 13:05:20 -08:00
Mark Otto
ab38493e91
Restore button groups
2013-01-16 13:04:29 -08:00
Mark Otto
c18b5b9735
restore glyphicons docs styles and then overhaul the shit out of them
2013-01-16 13:02:15 -08:00
Mark Otto
a4cc704220
Restore dropdowns.less
2013-01-16 12:44:31 -08:00
Mark Otto
eb3cd5d7d2
Restore responsive docs
2013-01-16 12:44:25 -08:00
Mark Otto
c76f1cd97e
restore glyphicons
2013-01-16 12:30:44 -08:00
Mark Otto
992e0d922a
Re-add and update form styles:
...
* Restore forms.less file
* Overhaul .radio.inline .checkbox.inline to be .radio-inline or .checkbox-inline
* Update docs to reflect changes
2013-01-16 12:23:05 -08:00
Mark Otto
b6b8633542
twerk docs code examples
2013-01-16 12:02:45 -08:00
Mark Otto
cb99c4b63a
restore table styles
2013-01-16 11:48:20 -08:00
Mark Otto
6ac6be2a5e
more subhead/jumbotron tweaks for docs
2013-01-16 11:45:16 -08:00
Mark Otto
0df7411362
Derp on type styles a bit more; bring back and fix up more more docs styles
2013-01-16 11:38:34 -08:00
Mark Otto
81a22e189a
add back docs footer
2013-01-16 11:03:54 -08:00
Mark Otto
cb0691d92f
mo betta type margins for headings
2013-01-16 10:57:00 -08:00
Mark Otto
8fd26040d8
Port over temp responsive styles to bootstrap.less; readd buttons
2013-01-16 10:52:33 -08:00
Mark Otto
5a3cb0d778
remove extra border-radius props
2013-01-16 10:49:19 -08:00
Mark Otto
85db846b65
mobile-first navs, navbar, grids, and type
2013-01-15 17:55:14 -08:00
Mark Otto
094767fbfe
code changes
2013-01-15 14:34:04 -08:00
Mark Otto
267690eb1b
docs changes, more type improvements, add grid system basics back
2013-01-15 14:30:00 -08:00
Mark Otto
a67c86e40f
Fixes #6586 : remove top 5px margin from navbar input group button groups
2013-01-15 10:27:30 -08:00
Mark Otto
09696143e0
type and stuff
2013-01-15 10:14:12 -08:00
Mark Otto
25c9b6b59a
nuke and flatten and stuff
2013-01-14 22:05:55 -08:00
Mark Otto
d247f71217
Reset docs jumbotron button to blue defaults
2013-01-13 04:27:51 -08:00
Mark Otto
7d8d5c7838
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/components.html
docs/css.html
docs/examples/fluid.html
docs/extend.html
docs/getting-started.html
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/extend.mustache
docs/templates/pages/getting-started.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/buttons.less
less/forms.less
less/navbar.less
less/popovers.less
less/responsive-767px-max.less
less/responsive.less
less/tables.less
less/tooltip.less
less/type.less
less/variables.less
package.json
2013-01-13 04:26:52 -08:00
Mark Otto
76ed6b0b2c
Remove comment out code and simplify what's left for button group toggles
2013-01-13 04:05:34 -08:00
Mark Otto
1916eb7c7f
Fix btn link hover and tweak dropdown border/shadows
2013-01-13 04:04:16 -08:00
Mark Otto
0b31cfc90e
Fix up .brand in navbar of docs
2013-01-12 20:10:42 -08:00
Mark Otto
01db5db2f6
white text on buttons on hover for links
2013-01-12 20:08:13 -08:00
Mark Otto
ea1a12593d
Nuke shadow on pagination
2013-01-12 19:46:47 -08:00
Mark Otto
8670021935
fixed navbars fixings
2013-01-12 19:44:51 -08:00
Mark Otto
1ea647ce98
Remove shadows from active links in navbar
2013-01-12 19:02:58 -08:00
Mark Otto
7bcd02c167
Tweak button
2013-01-12 19:02:48 -08:00
Mark Otto
583fc4b962
buttons and button group flattening improvements
2013-01-12 18:52:06 -08:00
Mark Otto
a9a66e9c34
finetune buttons flattened colors
2013-01-12 17:51:57 -08:00
Mark Otto
ff02043bbc
Flatten navbar
2013-01-12 14:31:18 -08:00
Mark Otto
a33d45f308
Merge branch '3.0.0-wip' into bs3-flatten
2013-01-12 14:16:49 -08:00
Mark Otto
7a3f078fb4
Remove parent div from pagination component
...
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Patrick H. Lauke
77c68e4bc2
Cleaned up dirty CSS
...
Used recess rather than less
2013-01-12 11:02:13 +00:00
Mark Otto
19e2ad0eb6
Fixes #6538 : Add th support to all the .table-rounded selectors
2013-01-11 23:38:53 -08:00
Mark Otto
6f894c62a5
Fixes #6528 : Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active
2013-01-11 23:35:22 -08:00
Mark Otto
4de3a77a64
Fixes #6547 : Make blockquotes use multiple of @baseFontSize
2013-01-11 20:55:09 -08:00
Mark Otto
767a293b4d
Increase input group margin on bottom and vertically center to match inputs
2013-01-11 20:46:21 -08:00
Mark Otto
56a24027c3
Fixes #6473 : Make .input-prepend and .input-append inline-block to match other form states
2013-01-11 20:42:44 -08:00
Mark Otto
d3b3b4c48f
Fixes #6474 : remove duplicate .btn border colors to make @btn-border work
2013-01-11 20:40:17 -08:00
Mark Otto
d7c93fc647
Fixes #6478 : scope table backgrounds to immediate td/th elements
2013-01-11 20:38:14 -08:00
Mark Otto
7626cc629f
Remove overflow: auto; from .tab-content
2013-01-11 20:26:48 -08:00
Mark Otto
b9b5cd786d
Fixes #6555 : remove .controls-row from responsive
2013-01-11 20:23:37 -08:00
Mark Otto
91dd77939b
Add text alignment utility classes
2013-01-09 18:56:08 -08:00
Patrick H. Lauke
848ca6e315
Basic keyboard accessibility CSS tweaks
...
Mostly doubling-up :hover styles to also cover :focus, as a first step
to making the framework more keyboard-friendly.
Additionally, fixed two small markup issues in the docs/examples to
make the "Learn more" large primary button-styled links
keyboard-focusable (as without href they're treated as non-tabable
anchors).
2013-01-02 22:39:21 +00:00
Mark Otto
1c0e4fc7bb
Popovers are now flexible width:
...
* Instead of a fixed width, we use max-width
* Width has been increased from 240px to 280px
* Added ability to hide the title via CSS :empty selector if no title is provided
2012-12-28 14:18:59 -06:00
Mark Otto
dc5c6d6be8
Simplify form validation states while enabling them to be applied to one field at a time.
2012-12-26 15:57:52 -06:00
Mark Otto
d0baa99aed
Remove .text-info and .info form validation states
2012-12-26 14:59:58 -06:00
Mark Otto
2ef4fde09f
Drop .input-block-level modifier as inputs are already width: 100%;
2012-12-26 14:19:48 -06:00
Mark Otto
070109abc1
Remove .controls-row; instead, folks should use .row and .span* for all their grid input sizing needs when multiple inputs per line are required
2012-12-26 14:09:36 -06:00
Mark Otto
c17673dc61
Restore .form-horizontal
2012-12-26 13:59:09 -06:00
Mark Otto
330b143b40
Add longer tooltip example to docs, tighten up line-height on tooltip; run make
2012-12-26 09:36:07 -06:00
Mark Otto
d206ec1659
Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger
2012-12-24 02:06:28 -08:00
Mark Otto
f74990d898
Version bump
2012-12-22 16:10:06 -08:00
Mark Otto
c11f41ba04
flatten buttons and forms
2012-12-21 00:50:28 -08:00
Mark Otto
7b7581d44a
Finish migrating to Normalize 2:
...
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
2012-12-20 20:52:20 -08:00
Mark Otto
a24e47b5b8
Update the examples index:
...
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto
1c33b857a6
Convert normalize comments to // style
2012-12-20 14:08:09 -08:00
Mark Otto
be74ad7e0d
Merge branch '3.0.0-wip' into bs3-normalize
...
Conflicts:
less/bootstrap.less
2012-12-20 14:02:54 -08:00
Mark Otto
8eb1549842
remove .hide specificity override from grid classes
2012-12-20 13:57:14 -08:00
Mark Otto
6bd5dc7d9f
Add important flag to .show/.hide utility classes; remove .hide requirement from modals
2012-12-20 13:53:38 -08:00
Mark Otto
a5e04c0799
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
docs/templates/pages/base-css.mustache
less/dropdowns.less
less/forms.less
2012-12-20 13:47:36 -08:00
Mark Otto
5e4f663e69
Undo important on hide/show utilties; punt to 3.0
2012-12-20 13:46:07 -08:00
Mark Otto
30d8eb3ed5
Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip
2012-12-20 01:34:19 -08:00
Mark Otto
f706acb11c
Fixes #6339 : Use important flag on .hide and .show utility classes
2012-12-20 01:30:32 -08:00
Mark Otto
cdb25e11ef
lighter buttons closer to todays versions
2012-12-20 01:21:09 -08:00
Mark Otto
c00f29e4d4
Fixes #6236 : Fix popover font-size in input groups
2012-12-20 00:54:58 -08:00
Mark Otto
cc6974b74e
Remove dropdown submenu CSS
2012-12-20 00:27:05 -08:00
Mark Otto
72f13e2870
Merge branch '2.2.3' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json
2012-12-20 00:02:52 -08:00
Mark Otto
9726fded1c
Get on that carousel indicator lifestyle with some new hawtness
2012-12-19 23:52:38 -08:00
Mark Otto
14844db862
Holy shit, buttons, button states, and input states updated
2012-12-19 23:37:33 -08:00
Mark Otto
09dde5c84a
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
less/mixins.less
2012-12-19 23:18:02 -08:00
Mark Otto
a27952efd0
Unfuck the fucked gradient with it's fucked mix() of background colors; nuke commented out code
2012-12-19 23:12:38 -08:00
Mark Otto
9b4e5746a4
More button tweaks
2012-12-19 22:54:04 -08:00
Mark Otto
afef81c0d7
remove commented out buttons css, update docs
2012-12-19 22:30:08 -08:00
Mark Otto
c38b7206eb
overhaul buttons
2012-12-19 22:25:56 -08:00
Mark Otto
7449e2e5a1
Remove @black and just use #000
2012-12-19 22:02:57 -08:00
Mark Otto
65edc9cd6e
Change .jumbotron usage in docs layout to .bs-docs-jumbotron
2012-12-19 21:42:36 -08:00
Mark Otto
b6945a2168
Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones
2012-12-19 21:37:16 -08:00
Mark Otto
c6cc1b1a1d
Drop .label component. Instead, just use .badge because fuck dupe code and stuff.
2012-12-19 21:18:32 -08:00
Mark Otto
51b1a027da
Merge branch 'bs3-input-groups' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap.css
2012-12-19 21:02:54 -08:00
Mark Otto
26b999b76a
no need for margin-top on .typeahead, it's set on .dropdown-menu
2012-12-19 19:46:44 -08:00
Mark Otto
19a94d08d6
Remove support for multiple buttons in input groups because fuck that shit.
2012-12-19 19:33:14 -08:00
Mark Otto
dc6142751f
Fixes #6337 : scope '.media .pull-left' and '.media .pull-right' to immediate children only
2012-12-19 18:47:34 -08:00
Mark Otto
28c928f010
Use normalize as separate file instead of with other resets; still need to punt other styles
2012-12-19 18:43:55 -08:00
Mark Otto
840e47eabd
Update clearfix mixin and class per @necolas's feedback
2012-12-19 17:49:20 -08:00
Mark Otto
529ecc5a77
Version bump
2012-12-10 18:31:04 -08:00
Mark Otto
cddca18f12
Fixes #6174 : Caret alignment in small and mini buttons
2012-12-10 10:59:57 -08:00
Mark Otto
847b632577
IE10 fix in responsive utilities, not regular utilities
2012-12-10 10:29:16 -08:00
Mark Otto
83a6a55d2c
Move IE10 responsive fix to responsive utilities so Customizer gets it
2012-12-10 10:25:18 -08:00
Mark Otto
ab5d7f863c
move reset after vars and mixins
2012-12-10 09:57:23 -08:00
Chris Rebert
3b5d4f52a3
fixes #5605 : style as disabled all form controls & btns under a disabled fieldset
...
this is a resubmission of #5875 , but now against branch 3.0.0-wip
does not exclude elements under a fieldset's legend
issue #6058 is a duplicate of #5605
2012-12-09 23:42:05 -08:00
Blake Embrey
c105906780
Update .dropdown-menu selectors to avoid conflicts with other elements. Fixes #6197
2012-12-10 16:42:58 +10:00
Mark Otto
4245e8ebb5
Fix checkbox and radios example
2012-12-09 22:13:40 -08:00
Mark Otto
4c82dd3645
Refactor input groups
...
* Deprecate .input-append and .input-prepend
* Use new, single base class for component, .input-group
* Deprecate .addon for .input-group-addon
* For compatibility with all buttons, require .input-group-btn to wrap buttons and button dropdowns
* Still need to reimplement with segmented button dropdowns, but that's dependent on a refactor of those first
2012-12-09 21:46:14 -08:00
Mark Otto
070c125cec
Restore print styles
2012-12-08 21:05:05 -08:00
Mark Otto
68d1d7fc83
Test removal of print styles for customized builds
2012-12-08 21:02:37 -08:00
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
9376a7c221
Fixes #5729 : Nested striped tables
...
* Scopes striping to immediate children of the tbody and tr
* For nested tables, sets a background color of @bodyBackground, to override the default transparent bg
2012-12-08 12:57:21 -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