From 70aba79587ceb39d7650ee8d3ff6ed705737f4e2 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Fri, 6 Nov 2020 03:04:27 +0530 Subject: [PATCH] Fix what I've borked --- src/furo/assets/styles/base/_index.sass | 1 + .../styles/components/_table_of_contents.sass | 5 +- .../assets/styles/content/_admonitions.sass | 64 ++++++++++++++++ .../assets/styles/content/_admonitions.scss | 73 ------------------- src/furo/theme/base.html | 2 +- src/furo/theme/theme.conf | 2 +- 6 files changed, 70 insertions(+), 77 deletions(-) create mode 100644 src/furo/assets/styles/content/_admonitions.sass delete mode 100644 src/furo/assets/styles/content/_admonitions.scss diff --git a/src/furo/assets/styles/base/_index.sass b/src/furo/assets/styles/base/_index.sass index 8242475d7..b143754f9 100644 --- a/src/furo/assets/styles/base/_index.sass +++ b/src/furo/assets/styles/base/_index.sass @@ -1,2 +1,3 @@ @import "icons" +@import "theme" @import "typography" diff --git a/src/furo/assets/styles/components/_table_of_contents.sass b/src/furo/assets/styles/components/_table_of_contents.sass index 36653e59e..4f6691d95 100644 --- a/src/furo/assets/styles/components/_table_of_contents.sass +++ b/src/furo/assets/styles/components/_table_of_contents.sass @@ -1,9 +1,11 @@ // This file contains the styles for the contents of the right sidebar, which // contains the table of contents for the current page. +.toc-scroll + padding-top: var(--toc-spacing-vertical) + padding-bottom: var(--toc-spacing-vertical) .toc-title-container padding: var(--toc-title-padding) - padding-top: var(--toc-spacing-vertical) .toc-title font-size: var(--toc-title-font-size) @@ -19,7 +21,6 @@ line-height: 1.3 padding-left: calc(var(--toc-spacing-horizontal) - var(--toc-item-spacing-horizontal)) - padding-bottom: var(--toc-spacing-vertical) // Hide the "top level" bullet. > ul > li diff --git a/src/furo/assets/styles/content/_admonitions.sass b/src/furo/assets/styles/content/_admonitions.sass new file mode 100644 index 000000000..c8134dba9 --- /dev/null +++ b/src/furo/assets/styles/content/_admonitions.sass @@ -0,0 +1,64 @@ +// Definitely inspired by mkdocs-material. +.admonition + margin: 1rem auto + padding: 0 0.5rem 0.5rem 0.5rem + + background: var(--color-admonition-background) + + border-radius: 0.2rem + border-left: 0.2rem solid var(--color-admonition-title) + box-shadow: 0 0.2rem 0.5rem rgba(0, 0, 0, 0.05), 0 0 0.0625rem rgba(0, 0, 0, 0.1) + + font-size: var(--admonition-font-size) + + overflow: hidden + page-break-inside: avoid + + // First element should have no margin, since the title has it. + > :nth-child(2) + margin-top: 0 + + // Last item should have no margin, since we'll control that w/ padding + > :last-child + margin-bottom: 0 + + + // Defaults for all admonitions + p.admonition-title + position: relative + margin: 0 -0.5rem 0.5rem + padding: 0.5rem 0.5rem 0.5rem 2rem + + font-weight: 500 + font-size: var(--admonition-title-font-size) + background-color: var(--color-admonition-title-background) + + line-height: 1.3 + + // Our fancy icon + &::before + content: "" + position: absolute + left: 0.5rem + width: 1rem + height: 1rem + // color: var(--color-admonition-title) + background-color: var(--color-admonition-title) + + mask-image: var(--icon-admonition-default) + mask-repeat: no-repeat + + // + // Variants + // + @each $type, $value in $admonitions + &.#{$type} + border-left-color: var(--color-admonition-title--#{$type}) + .admonition-title + background-color: var(--color-admonition-title-background--#{$type}) + &::before + background-color: var(--color-admonition-title--#{$type}) + mask-image: var(--icon-#{nth($value, 2)}) + +.admonition-todo .admonition-title + text-transform: uppercase diff --git a/src/furo/assets/styles/content/_admonitions.scss b/src/furo/assets/styles/content/_admonitions.scss deleted file mode 100644 index 232623ced..000000000 --- a/src/furo/assets/styles/content/_admonitions.scss +++ /dev/null @@ -1,73 +0,0 @@ -// Definitely inspired by mkdocs-material. -.admonition { - margin: 1rem auto; - padding: 0 0.5rem 0.5rem 0.5rem; - - background: var(--color-admonition-background); - - border-radius: 0.2rem; - border-left: 0.2rem solid var(--color-admonition-title); - box-shadow: 0 0.2rem 0.5rem rgba(0, 0, 0, 0.05), - 0 0 0.0625rem rgba(0, 0, 0, 0.1); - - font-size: var(--admonition-font-size); - - overflow: hidden; - page-break-inside: avoid; - - // First element should have no margin, since the title has it. - > :nth-child(2) { - margin-top: 0; - } - // Last item should have no margin, since we'll control that w/ padding - > :last-child { - margin-bottom: 0; - } - - // Defaults for all admonitions - p.admonition-title { - position: relative; - margin: 0 -0.5rem 0.5rem; - padding: 0.5rem 0.5rem 0.5rem 2rem; - - font-weight: 500; - font-size: var(--admonition-title-font-size); - background-color: var(--color-admonition-title-background); - - line-height: 1.3; - - // Our fancy icon - &::before { - content: ""; - position: absolute; - left: 0.5rem; - width: 1rem; - height: 1rem; - // color: var(--color-admonition-title); - background-color: var(--color-admonition-title); - - mask-image: var(--icon-admonition-default); - mask-repeat: no-repeat; - } - } - - // - // Variants - // - @each $type, $value in $admonitions { - &.#{$type} { - border-left-color: var(--color-admonition-title--#{$type}); - .admonition-title { - background-color: var(--color-admonition-title-background--#{$type}); - &::before { - background-color: var(--color-admonition-title--#{$type}); - mask-image: var(--icon-#{nth($value, 2)}); - } - } - } - } -} - -.admonition-todo .admonition-title { - text-transform: uppercase; -} diff --git a/src/furo/theme/base.html b/src/furo/theme/base.html index e2bf28687..e085a8126 100644 --- a/src/furo/theme/base.html +++ b/src/furo/theme/base.html @@ -58,7 +58,7 @@ {#- Theme-related stylesheets -#} {%- block theme_styles -%} - + {% include "partials/_head_css_variables.html" with context %} diff --git a/src/furo/theme/theme.conf b/src/furo/theme/theme.conf index 5fecae369..70e730eb1 100644 --- a/src/furo/theme/theme.conf +++ b/src/furo/theme/theme.conf @@ -1,6 +1,6 @@ [theme] inherit = basic -stylesheet = furo.css +stylesheet = styles/furo.css pygments_style = default pygments_dark_style = native sidebars = sidebar/brand.html, sidebar/search.html, sidebar/navigation.html