From 32181816f714b1e9ed83a925b6334efca3cbd5ff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 10:27:42 -0700 Subject: run make on previous merge --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0160bf1f6..cf42c13e5 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3867,7 +3867,8 @@ input[type="submit"].btn.btn-mini { background-color: #0088cc; } -.nav-list [class^="icon-"] { +.nav-list [class^="icon-"], +.nav-list [class*=" icon-"] { margin-right: 2px; } -- cgit v1.2.3 From 239ce24f92688f0dca44a4f74f9f5f70f04af1e5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 10:48:57 -0700 Subject: fixes #5188: add .google-maps class to reset responsive images on case-by-case basis --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cf42c13e5..eb810c209 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -75,7 +75,8 @@ img { -ms-interpolation-mode: bicubic; } -#map_canvas img { +#map_canvas img, +.google-maps img { max-width: none; } -- cgit v1.2.3 From a90334eebb0199c15f32059d9d3a285498dec188 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 11:11:33 -0700 Subject: fix docs sidenav width for ie8-9 --- docs/assets/css/docs.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'docs/assets/css') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index fd021cf82..3484f300c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -754,7 +754,7 @@ form.bs-docs-example { } .bs-docs-sidenav > li > a { display: block; - *width: 190px; + width: 190px \9; margin: 0 0 -1px; padding: 8px 14px; border: 1px solid #e5e5e5; @@ -821,6 +821,9 @@ form.bs-docs-example { .bs-docs-sidenav { width: 258px; } + .bs-docs-sidenav > li > a { + width: 230px \9; /* Override the previous IE8-9 hack */ + } } /* Desktop -- cgit v1.2.3