From 67594cb544e5b4b206558802318af4dbe77de1e0 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sat, 18 Jan 2014 22:58:05 +0100 Subject: Fix holder.js links in examples Replaces links to holder.js with links to the new docs.min.js. The uncompressed holder.js file is now in docs/assets/js/vendor, which is excluded from Jekyll builds. In turn, Holder is now included in docs.min.js, which is smaller than holder.js, so this should make everybody happy. :) --- docs/examples/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index d06644878..83c6eb97d 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -238,6 +238,6 @@ - + -- cgit v1.2.3 From cf8f1ec0cdfa8f8fb07ed0aa85030584dcadc8cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 19 Jan 2014 13:27:17 +0100 Subject: Improve tags --- docs/examples/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index 83c6eb97d..a04b3a1ce 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -3,7 +3,7 @@ - + -- cgit v1.2.3 From 8939268a33957c3a8599881f6312ccbe00b5c5dd Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 30 Jan 2014 19:55:11 +0200 Subject: Update jQuery to v1.11.0. Also, use Google's CDN per #11369. --- docs/examples/dashboard/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index a04b3a1ce..1d5508878 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -236,7 +236,7 @@ - + -- cgit v1.2.3 From 2c6b099f91e8b325ff49e690b0718de726ac410b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 30 Jan 2014 20:39:12 -0800 Subject: fix "pading-right" [sic] typo in dashboard.css; fixes #12455 --- 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 750124bf8..bf242a257 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -66,7 +66,7 @@ body { @media (min-width: 768px) { .main { padding-left: 40px; - pading-right: 40px; + padding-right: 40px; } } .main .page-header { -- cgit v1.2.3 From 09f62f6a7a0ee4208bcc04d58f619e000a916ef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sat, 1 Feb 2014 22:46:55 +0100 Subject: Improve alignment of the dashboard placeholder images Fixes #12435 --- docs/examples/dashboard/dashboard.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index bf242a257..6ec25f655 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -89,5 +89,6 @@ body { margin-bottom: 20px; } .placeholder img { + display: inline-block; border-radius: 50%; } -- cgit v1.2.3 From 9f668a557336f271f3c1bf701cc6a472e59aeedf Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 31 Jan 2014 14:20:33 +0200 Subject: Add examples/**/*.css in csscomb task. --- docs/examples/dashboard/dashboard.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/examples/dashboard') diff --git a/docs/examples/dashboard/dashboard.css b/docs/examples/dashboard/dashboard.css index bf242a257..a92f0f6b1 100644 --- a/docs/examples/dashboard/dashboard.css +++ b/docs/examples/dashboard/dashboard.css @@ -30,8 +30,8 @@ body { .sidebar { position: fixed; top: 0; - left: 0; bottom: 0; + left: 0; z-index: 1000; display: block; padding: 70px 20px 20px; @@ -42,13 +42,13 @@ body { /* Sidebar navigation */ .nav-sidebar { - margin-left: -20px; margin-right: -21px; /* 20px padding + 1px border */ margin-bottom: 20px; + margin-left: -20px; } .nav-sidebar > li > a { - padding-left: 20px; padding-right: 20px; + padding-left: 20px; } .nav-sidebar > .active > a { color: #fff; @@ -65,8 +65,8 @@ body { } @media (min-width: 768px) { .main { - padding-left: 40px; padding-right: 40px; + padding-left: 40px; } } .main .page-header { -- cgit v1.2.3 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