From 209d5f0689d4afdb96b0788e078ca7007b9c15dc Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Thu, 5 Jan 2017 11:37:20 -0800 Subject: [PATCH 1/4] Revert "Merge pull request #4358 from mitchellh/listfix" This reverts commit 7e2e3f4a36991a445787e67ca144cc4981b145db, reversing changes made to cb29e1e870f2d889820eeeeac79c1f08c4517e50. --- .../assets/stylesheets/_components.scss | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/website/source/assets/stylesheets/_components.scss b/website/source/assets/stylesheets/_components.scss index 043687cb2..8c7e18c86 100644 --- a/website/source/assets/stylesheets/_components.scss +++ b/website/source/assets/stylesheets/_components.scss @@ -197,22 +197,19 @@ header .header { } } - ul, ol { - list-style-position: inside; - margin-top: $baseline; - margin-left: 20px; - margin-right: 20px; + ul, ol { + list-style-position: inside; + margin-top: $baseline; + margin-left: 20px; + margin-right: 20px; - li { - font-family: $serif; - font-size: 17px; - line-height: (30/17) !important; - margin-bottom: $baseline; - p { - display: inline; + li { + font-family: $serif; + font-size: 17px; + line-height: (30/17) !important; + margin-bottom: $baseline; } } - } ul { list-style-type: circle; From 6dcfddd2ad9decbafa331e66edf10421dc3a1e01 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Thu, 5 Jan 2017 11:48:06 -0800 Subject: [PATCH 2/4] remove inside list-style position. fixes bullet styling issue. --- website/source/assets/stylesheets/_components.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/website/source/assets/stylesheets/_components.scss b/website/source/assets/stylesheets/_components.scss index 8c7e18c86..dd0a6f7b1 100644 --- a/website/source/assets/stylesheets/_components.scss +++ b/website/source/assets/stylesheets/_components.scss @@ -198,7 +198,6 @@ header .header { } ul, ol { - list-style-position: inside; margin-top: $baseline; margin-left: 20px; margin-right: 20px; From aeb2cd02fc2235b622ac3a283c209c1f4d0f10e8 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Thu, 5 Jan 2017 12:09:31 -0800 Subject: [PATCH 3/4] make the sidebar a bit smaller --- website/source/assets/stylesheets/_sidebar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/assets/stylesheets/_sidebar.scss b/website/source/assets/stylesheets/_sidebar.scss index 801786adb..b1450fbd3 100644 --- a/website/source/assets/stylesheets/_sidebar.scss +++ b/website/source/assets/stylesheets/_sidebar.scss @@ -1,6 +1,6 @@ #sidebar-docs { min-height: 100%; - max-width: 420px; + max-width: 320px; $border: 1px solid $gray-dark; font-size: 16px; font-family: $mono; From 72d2dc1878eecf1e07c196985b77edad8d6ee050 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Thu, 5 Jan 2017 12:19:26 -0800 Subject: [PATCH 4/4] pre width inside li --- website/source/assets/stylesheets/_components.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/website/source/assets/stylesheets/_components.scss b/website/source/assets/stylesheets/_components.scss index dd0a6f7b1..7e5d35917 100644 --- a/website/source/assets/stylesheets/_components.scss +++ b/website/source/assets/stylesheets/_components.scss @@ -207,6 +207,12 @@ header .header { font-size: 17px; line-height: (30/17) !important; margin-bottom: $baseline; + pre { + margin-left: -155px; + margin-right: -155px; + padding-left: 155px; + padding-right: 155px; + } } }