From 64bec5380fe1c384cb0daeb87827eb0129c4d6e2 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 Aug 2021 11:29:38 +0200 Subject: [PATCH 1/2] Remove bottom padding on source file pages --- templates/crate/source.html | 2 +- templates/style/base.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/crate/source.html b/templates/crate/source.html index f9ae49760..c26aee9fa 100644 --- a/templates/crate/source.html +++ b/templates/crate/source.html @@ -22,7 +22,7 @@ {%- endblock header -%} {%- block body -%} -
+
diff --git a/templates/style/base.scss b/templates/style/base.scss index 988cc930f..dffd408bb 100644 --- a/templates/style/base.scss +++ b/templates/style/base.scss @@ -436,6 +436,10 @@ div.package-sheet-container { div.package-page-container { padding-bottom: 50px; + &.small-bottom-pad { + padding-bottom: 30px; + } + div.package-menu { padding: 0 10px; From 9d833dc083e0bff43afd6244bb74a83487102d3e Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Wed, 25 Aug 2021 11:21:02 +0200 Subject: [PATCH 2/2] Make source files sidebar scrolling independant --- templates/crate/source.html | 2 +- templates/style/base.scss | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/templates/crate/source.html b/templates/crate/source.html index c26aee9fa..421bb0b15 100644 --- a/templates/crate/source.html +++ b/templates/crate/source.html @@ -24,7 +24,7 @@ {%- block body -%}
-
+
    {# If we are displaying a file, we also add a button to hide the file sidebar #} diff --git a/templates/style/base.scss b/templates/style/base.scss index dffd408bb..141338773 100644 --- a/templates/style/base.scss +++ b/templates/style/base.scss @@ -433,6 +433,8 @@ div.package-sheet-container { } } +$sidebar-side-padding: 10px; + div.package-page-container { padding-bottom: 50px; @@ -441,7 +443,7 @@ div.package-page-container { } div.package-menu { - padding: 0 10px; + padding: 0 $sidebar-side-padding; li.pure-menu-heading { font-size: 1.3em; @@ -816,6 +818,32 @@ ul.pure-menu-list { } } + #side-menu.source-view { + position: relative; + + .package-menu { + position: -webkit-sticky; + position: sticky; + top: $top-navbar-height; + overflow: auto; + max-height: calc(100vh - #{$top-navbar-height}); + height: calc(100% - #{$top-navbar-height}); + + .pure-menu-list { + position: absolute; + top: 0; + max-height: 100vh; + height: 100%; + width: calc(100% - #{$sidebar-side-padding} * 2); + padding-top: 5px; + + .pure-menu-item { + height: initial; + } + } + } + } + #side-menu.collapsed { max-width: 46px; @@ -838,6 +866,12 @@ ul.pure-menu-list { #source-code { pre { margin-top: 0; + margin-bottom: 0; + height: 100%; + + code { + height: 100%; + } } &.expanded {