aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-12-09 12:51:54 -0800
committerMark Otto <[email protected]>2011-12-09 12:51:54 -0800
commit97b285896f50bed4a66b00a70ed67eb3224bc7f3 (patch)
treec59087818ec8373cefe6f3b1022c8e53bed3179a
parent7b810bf9a617e1f02e073aafcc70857dc915ee59 (diff)
downloadbootstrap-97b285896f50bed4a66b00a70ed67eb3224bc7f3.tar.xz
bootstrap-97b285896f50bed4a66b00a70ed67eb3224bc7f3.zip
help tables not look like shit on mobile maybe? also fix bordered table example
-rw-r--r--bootstrap.css3
-rw-r--r--bootstrap.min.css2
-rw-r--r--docs/base-css.html1
-rw-r--r--lib/reset.less6
4 files changed, 9 insertions, 3 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 2180ae446..d52b96fa6 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Dec 9 12:09:50 PST 2011
+ * Date: Fri Dec 9 12:51:39 PST 2011
*/
html, body {
margin: 0;
@@ -70,6 +70,7 @@ td {
font-family: inherit;
}
table {
+ max-width: 100%;
border-collapse: collapse;
border-spacing: 0;
}
diff --git a/bootstrap.min.css b/bootstrap.min.css
index cc4363fe3..6a728864f 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -1,6 +1,6 @@
html,body{margin:0;padding:0;}
h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
-table{border-collapse:collapse;border-spacing:0;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;}
ol,ul{list-style:none;}
q:before,q:after,blockquote:before,blockquote:after{content:"";}
html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
diff --git a/docs/base-css.html b/docs/base-css.html
index efdc1e271..cb6c699f9 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -655,6 +655,7 @@
<td>English</td>
</tr>
</tr>
+ <td>3</td>
<td>Joe</td>
<td>Sixpack</td>
<td>English</td>
diff --git a/lib/reset.less b/lib/reset.less
index 200215456..28638b6b3 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -10,7 +10,11 @@
html, body { margin: 0; padding: 0; }
h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
-table { border-collapse: collapse; border-spacing: 0; }
+table {
+ max-width: 100%;
+ border-collapse: collapse;
+ border-spacing: 0;
+}
ol, ul { list-style: none; }
q:before, q:after, blockquote:before, blockquote:after { content: ""; }