Mark Otto
06f1293acf
Merge branch 'master' into panels_and_tables
...
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
2014-02-07 18:36:27 -08:00
Mark Otto
a2f08158d0
Nuke shit I added in 4d7b2ddba9
that shouldn't come until v4
2014-02-07 15:44:50 -08:00
Mark Otto
4d7b2ddba9
Fixes #12486 : Restore full width inputs for input groups in inline forms and navbars
2014-02-07 02:58:10 -08:00
Mark Otto
d91d9b0ade
Fixes #12447 : Properly reset borders on table cells in panels
2014-02-07 02:38:01 -08:00
Mark Otto
3ccc16cad0
grunt for days
2014-02-07 02:24:37 -08:00
Mark Otto
228d4e59fc
Fixes #12555 : Rearrange variables to place grids and containers closer
2014-02-07 01:22:30 -08:00
Mark Otto
ace0abfdb6
Merge branch 'master' into thumbnail-extend
...
Conflicts:
dist/css/bootstrap.css
2014-02-06 18:52:03 -08:00
Chris Rebert
7c1511502e
use :extend(.img-responsive) in Carousel's Less
2014-02-06 15:52:26 -08:00
Chris Rebert
fda8d91c86
use :extend in thumbnail Less
2014-02-06 15:42:54 -08:00
Chris Rebert
37c21a3ac7
use Less' extend feature in btn-group-lg etc.
2014-02-06 10:59:04 -08:00
Mark Otto
00cb50a41a
grunt dist--includes changes from #12025 and decimal changes, likely from a change in dependencies
2014-02-04 19:27:25 -08:00
Mark Otto
07098d1bb7
Fixes #12470 : Scope large modal styles to minimum viewport width
2014-02-04 02:01:31 -08:00
Mark Otto
ec6c9d2824
Don't offset customizer alert, grunt dist
2014-02-04 00:18:34 -08:00
Mark Otto
58bf3f9432
grunt after last commits
2014-01-31 13:40:32 -08:00
Mark Otto
1409cde7e8
Bump versions, run grunt
2014-01-30 08:30:37 -08:00
Mark Otto
d2f1887bb5
Merge branch 'master' into pr/12388
...
Conflicts:
dist/css/bootstrap.min.css
2014-01-29 22:18:29 -08:00
Mark Otto
9195d8e8eb
Follow up to #11655 : don't reset opacity on disabled buttons
2014-01-29 21:57:44 -08:00
Mark Otto
d631e0b92d
Fix #12422 : Reset height on multiple select in input size mixin
2014-01-29 21:34:10 -08:00
Mark Otto
545c957f17
Fixes #12424 : Account for Normalize change on figure element so that we don't potentially screw folks over
2014-01-29 21:23:23 -08:00
Mark Otto
a9a4d81730
grunt
2014-01-28 10:08:40 -08:00
Mark Otto
b7ac009a52
Remove #8350 's reset for number inputs since Normalize fixes those upstream
2014-01-27 12:25:39 -08:00
Mark Otto
400720d00b
Remove optgroup resets from #7611 since Normalize fixes those upstream
2014-01-27 12:24:35 -08:00
Mark Otto
6a0a139cda
Upgrade to Normalize v3-rc1 in prep for v3 final
2014-01-27 12:08:55 -08:00
Alan Hamlett
e38fd138ce
fixes #10495 by forcing .navbar-brand height to prevent it's inner content from increasing navbar height
2014-01-25 21:40:56 -08:00
Mark Otto
64e8132426
Fix #12359 : Reset min-width on fieldsets so that they don't break responsive tables and behave more like standard block level elements
2014-01-24 11:55:59 -06:00
Mark Otto
44fc629d44
Fix #12353 : Scope table border reset in panels to first-child rows
2014-01-23 22:52:26 -06:00
Mark Otto
f748390cf5
Follow-up to #12250 : remove remaining page margins for print
2014-01-22 21:51:23 -06:00
Mark Otto
08e83a62b7
Fix #11655 : Fix broken disabled states for iOS form controls and buttons
2014-01-22 21:43:08 -06:00
Chris Rebert
1942f36455
remove default left-right print margins per upstream h5bp change
...
Refs:
57be193031
https://github.com/h5bp/html5-boilerplate/issues/1477
2014-01-21 16:29:49 -08:00
Mark Otto
2115ac525b
Run grunt dist after adding 'a' requirement to the text emphasis classes
2014-01-18 14:40:48 -08:00
Daijiro Wachi
6856c9f7f6
remove border radius when it's not both ends in panel
2014-01-19 06:43:57 +09:00
Mark Otto
380019ccb2
Split box-sizing reset for faster rendering
2014-01-16 20:00:28 -08:00
Mark Otto
d07e8fece4
grunt
2014-01-16 15:03:34 -08:00
Mark Otto
413c8a6da5
Fixes #12210 : badges in xs buttons
2014-01-14 21:44:38 -08:00
Mark Otto
3a8e99e91e
Fixes #12171 : Ensure panel groups have a bottom margin since we nuke it on child panels
2014-01-10 18:56:44 -08:00
Mark Otto
7f153974e1
Fixes #11990 and #12159 : Make range inputs block level and 100% wide by default
2014-01-09 18:07:14 -08:00
Chris Rebert
fc62379e61
grunt dist
2014-01-09 11:11:13 -08:00
Julian Thilo
8fd177bfa7
Fix #12073 : Consistent order of variations
...
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
2014-01-07 22:24:45 +01:00
Julian Thilo
7fcfe61f4d
Update copyright notices in all places
...
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
2014-01-07 01:05:24 +01:00
Zlatan Vasović
1c83d68ca4
New Year
2014-01-01 15:37:08 +01:00
Mark Otto
50cf0b1a9d
Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt dist' task; Fixes #12030 : navbar toggle focus state
2013-12-31 18:23:10 -08:00
Mark Otto
679c786237
roll back version numbers to avoid broken links in docs and readme ( fixes #12000 )
2013-12-24 12:16:17 -08:00
Supergibbs
f3ce6a9696
Fixes #10492 better:
...
- Made more generic. Applies to "> .table" and "> .table-responsive > .table" to support td/tr background colors too and not just .table-striped
- Supports tfoot
2013-12-23 16:07:55 -08:00
Mark Otto
37bc0c230d
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-23 13:26:01 -08:00
Mark Otto
4376ce8466
Upgrade to CSScomb 1.2.1 and reset some ordering to ensure no rogue spaces
2013-12-23 13:25:51 -08:00
Zlatan Vasović
608926e808
Improve banner
2013-12-23 18:02:42 +01:00
Mark Otto
9fc0e20381
Fixes #10492 and some of #11970 : round the proper corner on table cells in panels
2013-12-22 22:31:13 -08:00
Tobias Lindig
7f599cedf3
add new variables for "pagination" to improve support of customizing
2013-12-20 17:06:53 +01:00
Mark Otto
2854c5c3fb
Fixes #11952 : Refactor blockquote styles
...
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
2013-12-19 19:40:08 -08:00
Zlatan Vasović
1bf5abab31
No leading pluses
2013-12-19 15:32:37 +01:00