From f83b20100728ee7fa6c661ccee289dd003822cdc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 01:27:07 -0800 Subject: Fixes #12526: Add scrollbars when necessary to the Dashboard example's sidebar --- docs/examples/dashboard/dashboard.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 565aff50e..d6bbc30eb 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -34,6 +34,8 @@ body { left: 0; z-index: 1000; display: block; + overflow-x: hidden; + overflow-y: auto; /* Scrollable contents if page is short */ padding: 70px 20px 20px; background-color: #f5f5f5; border-right: 1px solid #eee; -- cgit v1.2.3 From 16bbcd7affb98d18bdbbaf7dbf9529dd511d5027 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 01:33:27 -0800 Subject: clarify comment --- docs/examples/dashboard/dashboard.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index d6bbc30eb..8f51cfb84 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -35,7 +35,7 @@ body { z-index: 1000; display: block; overflow-x: hidden; - overflow-y: auto; /* Scrollable contents if page is short */ + overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ padding: 70px 20px 20px; background-color: #f5f5f5; border-right: 1px solid #eee; -- cgit v1.2.3 From 3ccc16cad078cfcc76f3b9362f0039b0566d8914 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:24:37 -0800 Subject: grunt for days --- docs/examples/dashboard/dashboard.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 8f51cfb84..9cd455dfd 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -34,9 +34,9 @@ body { left: 0; z-index: 1000; display: block; + padding: 70px 20px 20px; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ - padding: 70px 20px 20px; background-color: #f5f5f5; border-right: 1px solid #eee; } -- cgit v1.2.3 From cae76171d0bb6f461829b063735ffd84d6b2a07f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 7 Feb 2014 02:44:04 -0800 Subject: Follow up to 1bdd59b18c2d1b2409d0422a60e8c007053202df, to better position the sidebar so the potential scrollbar doesn't get hidden by the navbar --- docs/examples/dashboard/dashboard.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 9cd455dfd..70c7029cc 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -29,12 +29,12 @@ body { @media (min-width: 768px) { .sidebar { position: fixed; - top: 0; + top: 51px; bottom: 0; left: 0; z-index: 1000; display: block; - padding: 70px 20px 20px; + padding: 20px; overflow-x: hidden; overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ background-color: #f5f5f5; -- cgit v1.2.3 From 449dd83ec32ab0cda37614006573be1e099f6133 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Feb 2014 15:06:21 -0800 Subject: Fixes #12735: Fix sidebar hover state in Dashboard example --- docs/examples/dashboard/dashboard.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 70c7029cc..ef6c0cfdb 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -52,7 +52,9 @@ body { padding-right: 20px; padding-left: 20px; } -.nav-sidebar > .active > a { +.nav-sidebar > .active > a, +.nav-sidebar > .active > a:hover, +.nav-sidebar > .active > a:focus { color: #fff; background-color: #428bca; } -- cgit v1.2.3 From 80ce694b2499f45142b9746aa862cf288ce38e5e Mon Sep 17 00:00:00 2001 From: avindra Date: Sun, 2 Mar 2014 16:19:44 -0500 Subject: Fix for stray 1px line under top navigation If you add an "active" class to one of the
  • elements in the top navigation, and style it so that active tabs have a different color, it becomes clear that there is a 1 pixel stray line under the navigation. This style fixes that. --- docs/examples/dashboard/dashboard.css | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index ef6c0cfdb..22e3fdef6 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -17,6 +17,13 @@ body { border-bottom: 1px solid #eee; } +/* + * Top navigation + * Hide default border to remove 1px line. + */ +.navbar-fixed-top { + border:0; +} /* * Sidebar -- cgit v1.2.3 From a4df36317407fdbef1458a1c5e59b088b85d72c4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 4 Mar 2014 14:35:23 -0800 Subject: grunt after merging #12917 --- docs/examples/dashboard/dashboard.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index 22e3fdef6..e0e3632b8 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -22,7 +22,7 @@ body { * Hide default border to remove 1px line. */ .navbar-fixed-top { - border:0; + border: 0; } /* -- cgit v1.2.3