From b0c1832da66602cc06916aa0eabeb84e3d3b764c Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 20:43:58 -0500 Subject: [PATCH 01/89] Inital Move to bootstrap --- bin/preinstall.js | 17 ---- docs/contributing.rst | 1 - package-lock.json | 18 ++-- package.json | 5 +- src/sass/_theme_badge_fa.sass | 1 - src/sass/_theme_layout.sass | 3 - src/sass/_theme_rst.sass | 28 +++--- src/sass/_theme_variables.sass | 156 +++++++++++++++++++++++++++++++++ src/sass/badge_only.sass | 3 - src/sass/theme.sass | 22 +---- webpack.common.js | 4 +- 11 files changed, 189 insertions(+), 69 deletions(-) diff --git a/bin/preinstall.js b/bin/preinstall.js index 536fe5a3f..bcd5180bf 100755 --- a/bin/preinstall.js +++ b/bin/preinstall.js @@ -1,20 +1,3 @@ #!/usr/bin/env node const package = require('../package.json'); - -// Sorry everyone, this is the closest we can get to commenting on package.json -// dependencies :( -if (package.devDependencies['bourbon-neat'] !== '~1.9') { - // Wyrm is not compatible with Neat 2.0+, and Neat 1.9 at least pins a - // node-sass version that doesn't require Python 2. The changes to Wyrm to - // support Neat 2.0+ are all fairly minor changes, but it deeply affects the - // grid system and might be more of a liability than an old release of Neat. - // See: https://github.com/readthedocs/sphinx_rtd_theme/pull/771 - console.error( - 'bourbon-neat 1.9 is required, Wyrm is not compatible with Neat 2.0+.' - ); - console.error( - 'The expected selector for the bourbon-neat dependency in package.json is "~1.9".' - ); - process.exit(1); -} diff --git a/docs/contributing.rst b/docs/contributing.rst index 6f7d8a1d9..e00aec7a5 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -59,7 +59,6 @@ can be used to test built assets: .. _Webpack: https://webpack.js.org/ .. _node-sass: https://github.com/sass/node-sass .. _SASS: http://www.sass-lang.com -.. _Wyrm: http://www.github.com/snide/wyrm/ .. _Sphinx: http://www.sphinx-doc.org/en/stable/ Translations diff --git a/package-lock.json b/package-lock.json index be95f32cb..779fbd3f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -693,6 +693,12 @@ "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", "dev": true }, + "bootstrap": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.0.tgz", + "integrity": "sha512-Io55IuQY3kydzHtbGvQya3H+KorS/M9rSNyfCGCg9WZ4pyT/lCxIlpJgG1GXW/PswzC84Tr2fBYi+7+jFVQQBw==", + "dev": true + }, "bourbon": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/bourbon/-/bourbon-4.3.4.tgz", @@ -5371,6 +5377,12 @@ } } }, + "popper.js": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", + "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", + "dev": true + }, "portfinder": { "version": "1.0.25", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", @@ -8487,12 +8499,6 @@ "async-limiter": "~1.0.0" } }, - "wyrm": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/wyrm/-/wyrm-1.0.9.tgz", - "integrity": "sha1-tB2G8E0APS6IhbRUEUbzl2IhoGI=", - "dev": true - }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/package.json b/package.json index 9ea36e753..923e93262 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,8 @@ }, "dependencies": {}, "devDependencies": { + "bootstrap": "^4.6.0", + "popper.js": "^1.16.1", "bourbon": "~4.3", "bourbon-neat": "~1.9", "copy-webpack-plugin": "^5.1.1", @@ -30,7 +32,6 @@ "webpack-dev-server": "^3.3.1", "webpack-merge": "^4.2.1", "webpack-shell-plugin": "^0.5.0", - "webpack-watch-files-plugin": "^1.0.3", - "wyrm": "^1.0.9" + "webpack-watch-files-plugin": "^1.0.3" } } diff --git a/src/sass/_theme_badge_fa.sass b/src/sass/_theme_badge_fa.sass index aa9f66290..71e353535 100644 --- a/src/sass/_theme_badge_fa.sass +++ b/src/sass/_theme_badge_fa.sass @@ -9,7 +9,6 @@ font-weight: normal line-height: 1 text-decoration: inherit - +font-smooth a .fa display: inline-block diff --git a/src/sass/_theme_layout.sass b/src/sass/_theme_layout.sass index c48d4d809..9da8b43dc 100644 --- a/src/sass/_theme_layout.sass +++ b/src/sass/_theme_layout.sass @@ -83,7 +83,6 @@ html background: $menu-vertical-background-color border: none padding-left: $gutter -4px - +font-smooth &:hover background: $menu-vertical-background-color span.toctree-expand @@ -215,7 +214,6 @@ html display: inline-block padding: $base-line-height / 6 $base-line-height / 4 margin-bottom: $gutter / 2 - +font-smooth &:hover background: rgba(255,255,255,.1) img.logo @@ -305,7 +303,6 @@ html a color: $white font-weight: bold - +font-smooth img margin-right: $base-line-height / 2 height: 45px diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index 7120bbac9..c8a10dbc5 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -94,9 +94,9 @@ font-family: $code-font-family font-size: 12px line-height: 1.4 - + // Do not allow selection of code block prompts - div.highlight .gp + div.highlight .gp user-select: none pointer-events: none @@ -113,26 +113,26 @@ // These are the various note pullouts that sphinx applies .note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo, .admonition - @extend .wy-alert + // @extend .wy-alert // These block elements are unsuitable for having floating objects next // to them clear: both .last, > *:last-child margin-bottom: 0 .admonition-title - @extend .wy-alert-title + // @extend .wy-alert-title @extend .fa @extend .fa-exclamation-circle &:before margin-right: 4px .note, .seealso - @extend .wy-alert.wy-alert-info + // @extend .wy-alert.wy-alert-info .hint, .tip, .important - @extend .wy-alert.wy-alert-success + // @extend .wy-alert.wy-alert-success .error, .danger - @extend .wy-alert.wy-alert-danger + // @extend .wy-alert.wy-alert-danger .warning, .caution, .attention, .admonition-todo - @extend .wy-alert.wy-alert-warning + // @extend .wy-alert.wy-alert-warning // Some people put tables in notes. Let's give them very basic support. .admonition table border-color: rgba(0,0,0,.1) @@ -140,13 +140,13 @@ background: transparent !important border-color: rgba(0,0,0,.1) !important .section ul, .toctree-wrapper ul - @extend .wy-plain-list-disc + // @extend .wy-plain-list-disc .section ol.loweralpha, .section ol.loweralpha > li list-style: lower-alpha .section ol.upperalpha, .section ol.upperalpha > li list-style: upper-alpha .section ol, ol.arabic - @extend .wy-plain-list-decimal + // @extend .wy-plain-list-decimal // Complex bullet lists, they have more item margins than simple lists .section ol li, .section ul li > * @@ -330,8 +330,8 @@ .wy-table-responsive.citation:last-child, .wy-table-responsive.footnote:last-child margin-bottom: $base-line-height table.docutils - @extend .wy-table - @extend .wy-table-bordered-all + // @extend .wy-table + // @extend .wy-table-bordered-all th border-color: $table-border-color html.writer-html5 & @@ -342,13 +342,13 @@ margin-bottom: 0rem font-size: .9rem &:not(.field-list) - @extend .wy-table-striped + // @extend .wy-table-striped // Remove bottom margin for the last element (and it's last child) td .last, td .last > *:last-child margin-bottom: 0 // This table is what gets spit out for auto-generated API stuff. I style it smaller bits of padding. table.field-list - @extend .wy-table + // @extend .wy-table border: none td border: none diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index d9a53107e..26778693a 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -2,6 +2,162 @@ // that are set in wyrm_core/wy_variables.sass. You'll find wyrm in bower_components if you're looking // for a reference. + +// copied from wyrm + +// Locations +$static-img: "img/" + + +// Colors +$background-color: #edf0f2 +$section-background-color: hsl(0,0%,99%) +$dropdown-color: $section-background-color +$dropdown-border-color: darken($background-color, 10%) + +$black: #000 !default +$gray-darker: #222 !default +$gray-dark: #333 !default +$gray: #555 !default +$gray-light: #999 !default +$gray-lighter: #ccc !default +$white: #fff !default + +$green: #27AE60 +$offgreen: #1ABC9C +$blue: #2980B9 +$purple: #9B59B6 +$cobalt: #34495E +$yellow: #F1C40F +$orange: #E67E22 +$red: #E74C3C +$shell: #ECF0F1 + +// Typography +$base-font-size: 16px !default +$base-font-family: "Helvetica Neue", Arial, sans-serif !default +$base-font-family-bold: bold +$base-line-height: 24px !default +$custom-font-family: "Georgia", serif !default +$custom-font-family2: "Georgia", serif !default +$code-font-family: "Consolas", "Monaco", monospace !default +$icon-font-family: "FontAwesome" +$text-color: hsl(0,0%,25%) !default +$text-invert: hsl(0,0%,100%) !default +$text-code-color: $red +$text-code-background-color: $white +$text-code-border-color: hsl(195,7%,89%) +$text-dark: lighten($text-color,15%) !default +$text-medium: lighten($text-color,25%) !default +$text-light: lighten($text-color,45%) !default +$text-lighter: lighten($text-color,60%) !default + +// Tables +$table-background-color: transparent +$table-border-color: hsl(195, 7%, 89%) +$table-stripe-color: hsl(185,15%,96%) +$table-bg-hover-color: hsl(0,0%,85%) +$table-head-background-color: $table-border-color +$table-font-size: 90% +$table-padding-size: $base-font-size / 2 $base-font-size + +// Forms +$input-text-color: #cad2d3 !default +$input-background-color: $white !default +$input-border-color: #ccc !default +$input-shadow-color: #ddd !default +$input-focus-color: $gray-dark + +// Links +$link-color: $blue +$link-color-visited: $purple +$link-color-hover: lighten($link-color, 6%) !default +$link-color-alt: hsl(33, 100%, 51%) + + +// Buttons +$button-background-color: $green +$button-neutral-background-color: $table-stripe-color + +// Spinner +$spinner-color: $link-color + +// Menu +$menu-top-link-color: hsl(0, 0%, 95%) +$menu-background-color: rgb(52, 49, 49) +$menu-logo-color: $link-color +$nav-desktop-width: 300px +$nav-desktop-position: left + +// Z-index master list +$z-index-dropdown: 100 !default +$z-index-popover: 200 !default +$z-index-tooltip: 300 !default +$z-index-tray: 400 !default +$z-index-modal: 500 !default +$z-index-alert: 600 !default + +// By default wyrm expects the following font-classes +// to exist. By default, uses Font Awesome 4.0 +// but this is completely configurable should you +// want to use a different icon pack. +$icon-prefix: "fa" +$icon-close: "times" +$icon-arrow-left: "arrow-left" +$icon-arrow-right: "arrow-right" +$icon-arrow-down: "arrow-down" +$icon-arrow-up: "arrow-up" +$icon-expand: "expand" +$icon-compress: "compress" +$icon-trash: "trash-o" +$icon-table: "table" +$icon-link: "link" +$icon-quote-right: "quote-right" +$icon-align-left: "align-left" +$icon-align-right: "align-right" +$icon-align-justify: "align-justify" +$icon-align-center: "align-center" +$icon-arrows-alt: "arrows-alt" +$icon-picture: "picture-o" +$icon-youtube: "youtube-play" +$icon-code: "code" +$icon-text-height: "text-height" +$icon-bold: "bold" +$icon-italic: "italic" +$icon-strikethrough: "strikethrough" +$icon-list-ul: "list-ul" +$icon-list-ol: "list-ol" +$icon-outdent: "outdent" +$icon-indent: "indent" +$icon-paperclip: "paperclip" +$icon-caret-down: "caret-down" +$icon-ok: "check-circle" +$icon-remove: "times-circle" +$icon-alert: "exclamation-circle" + + + +// ------------------------------------------------------------ + +@import "neat-helpers" + +$column: golden-ratio(1em, 3) !default +$gutter: golden-ratio(1em, 1) !default +$grid-columns: 12 !default +$max-width: 100% !default +$border-box-sizing: true !default +$default-feature: min-width +$default-layout-direction: LTR !default + +$mobile: new-breakpoint(max-width 480px 4) +$tablet: new-breakpoint(max-width 768px 8) +$desktop: new-breakpoint(min-width 769px 12) +$desktop-wide: new-breakpoint(min-width 1200px 12) +$desktop-wider: new-breakpoint(min-width 1400px 12) + + +// end copy + $fa-font-path: "~font-awesome/fonts" $static-img: "../img/" diff --git a/src/sass/badge_only.sass b/src/sass/badge_only.sass index 2b0941629..9b4d486ea 100644 --- a/src/sass/badge_only.sass +++ b/src/sass/badge_only.sass @@ -6,11 +6,8 @@ // ------------------------------------------------------------ $border-box-sizing: false !default -@import wyrm_core/wy_variables @import theme_variables @import ~bourbon/app/assets/stylesheets/bourbon @import ~bourbon-neat/app/assets/stylesheets/neat -@import wyrm_core/mixin -@import wyrm_core/grid_settings @import _theme_badge_fa @import _theme_badge diff --git a/src/sass/theme.sass b/src/sass/theme.sass index 73e77e4f6..cdb5a9376 100644 --- a/src/sass/theme.sass +++ b/src/sass/theme.sass @@ -6,8 +6,7 @@ // "theme_*.sass". All other files are loaded through bower. // ------------------------------------------------------------ -// Variable defaults set by Wyrm -@import wyrm_core/wy_variables +@import ~bootstrap/scss/bootstrap // Variable overrides that change coloring and fonts for this theme. @import theme_variables @@ -16,29 +15,12 @@ @import ~bourbon/app/assets/stylesheets/bourbon // Bourbon.io/neat framework, with some default media queries -@import wyrm_core/grid_settings @import ~bourbon-neat/app/assets/stylesheets/neat // Some corrections for neat -@import wyrm_core/neat_extra -// Custom reset -@import wyrm_core/reset - -// Wyrm mixins -@import wyrm_core/mixin - -// Font Awesome with wyrm extras +// Font Awesome @import ~font-awesome/scss/font-awesome -@import wyrm_core/font_icon_defaults -// Wyrm core styles used in this theme -@import wyrm_core/alert -@import wyrm_core/button -@import wyrm_core/dropdown -@import wyrm_core/form -@import wyrm_core/generic -@import wyrm_core/table -@import wyrm_core/type // Theme specific styles. These are likely the files you want to edit. @import theme_breadcrumbs diff --git a/webpack.common.js b/webpack.common.js index 3ff0dce32..b3c1eb19d 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -37,10 +37,10 @@ module.exports = { loader: "sass-loader?indentedSyntax", options: { includePaths: [ + "node_modules/bootstrap/scss", "node_modules/bourbon/app/assets/stylesheets", "node_modules/bourbon-neat/app/assets/stylesheets", - "node_modules/font-awesome/scss", - "node_modules/wyrm/sass" + "node_modules/font-awesome/scss" ] } } From 6eb7506c32230741c0e5d654f46a6ac2b7024d65 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 20:51:03 -0500 Subject: [PATCH 02/89] Remove unused icon variables --- src/sass/_theme_variables.sass | 39 ---------------------------------- 1 file changed, 39 deletions(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 26778693a..38b63291c 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -97,45 +97,6 @@ $z-index-tray: 400 !default $z-index-modal: 500 !default $z-index-alert: 600 !default -// By default wyrm expects the following font-classes -// to exist. By default, uses Font Awesome 4.0 -// but this is completely configurable should you -// want to use a different icon pack. -$icon-prefix: "fa" -$icon-close: "times" -$icon-arrow-left: "arrow-left" -$icon-arrow-right: "arrow-right" -$icon-arrow-down: "arrow-down" -$icon-arrow-up: "arrow-up" -$icon-expand: "expand" -$icon-compress: "compress" -$icon-trash: "trash-o" -$icon-table: "table" -$icon-link: "link" -$icon-quote-right: "quote-right" -$icon-align-left: "align-left" -$icon-align-right: "align-right" -$icon-align-justify: "align-justify" -$icon-align-center: "align-center" -$icon-arrows-alt: "arrows-alt" -$icon-picture: "picture-o" -$icon-youtube: "youtube-play" -$icon-code: "code" -$icon-text-height: "text-height" -$icon-bold: "bold" -$icon-italic: "italic" -$icon-strikethrough: "strikethrough" -$icon-list-ul: "list-ul" -$icon-list-ol: "list-ol" -$icon-outdent: "outdent" -$icon-indent: "indent" -$icon-paperclip: "paperclip" -$icon-caret-down: "caret-down" -$icon-ok: "check-circle" -$icon-remove: "times-circle" -$icon-alert: "exclamation-circle" - - // ------------------------------------------------------------ From fefd4521f0ed1ff60aadc96a0af50a0eb41b87c4 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 20:57:00 -0500 Subject: [PATCH 03/89] remove unused wy-body-mask --- src/sass/_theme_layout.sass | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/sass/_theme_layout.sass b/src/sass/_theme_layout.sass index 9da8b43dc..7aed204ed 100644 --- a/src/sass/_theme_layout.sass +++ b/src/sass/_theme_layout.sass @@ -327,15 +327,6 @@ html max-width: $nav-content-width margin: auto -.wy-body-mask - position: fixed - width: 100% - height: 100% - background: rgba(0,0,0,.2) - display: none - z-index: $z-index-modal - 1 - &.on - display: block footer color: $footer-color p From 02f7b769574bd3254f02033a1c614642a7f9cedc Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:04:15 -0500 Subject: [PATCH 04/89] Sass update to bootsrap zindex values --- src/sass/_theme_badge.sass | 2 +- src/sass/_theme_layout.sass | 4 ++-- src/sass/_theme_variables.sass | 9 --------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/sass/_theme_badge.sass b/src/sass/_theme_badge.sass index b24ec10f4..c8d0c6133 100644 --- a/src/sass/_theme_badge.sass +++ b/src/sass/_theme_badge.sass @@ -6,7 +6,7 @@ color: $section-background-color background: darken($menu-background-color, 8%) font-family: $base-font-family - z-index: $z-index-tray + z-index: $zindex-popover a color: $link_color text-decoration: none diff --git a/src/sass/_theme_layout.sass b/src/sass/_theme_layout.sass index 7aed204ed..c448b011c 100644 --- a/src/sass/_theme_layout.sass +++ b/src/sass/_theme_layout.sass @@ -190,7 +190,7 @@ html width: $nav-desktop-width padding: $gutter / 2 margin-bottom: $gutter / 2 - z-index: $z-index-popover + z-index: $zindex-fixed background-color: $nav-search-background-color text-align: center color: $nav-search-color @@ -281,7 +281,7 @@ html min-height: 100% color: $menu-medium background: $nav-background-color - z-index: $z-index-popover + z-index: $zindex-fixed .wy-side-scroll width: $nav-desktop-width + 20px diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 38b63291c..c85881010 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -89,15 +89,6 @@ $menu-logo-color: $link-color $nav-desktop-width: 300px $nav-desktop-position: left -// Z-index master list -$z-index-dropdown: 100 !default -$z-index-popover: 200 !default -$z-index-tooltip: 300 !default -$z-index-tray: 400 !default -$z-index-modal: 500 !default -$z-index-alert: 600 !default - - // ------------------------------------------------------------ @import "neat-helpers" From eedd6bf2f1170d5166abdbbc396c4e880f202739 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:08:06 -0500 Subject: [PATCH 05/89] Remove Some unused vars --- src/sass/_theme_variables.sass | 6 ------ src/sass/badge_only.sass | 1 - 2 files changed, 7 deletions(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index c85881010..1b3b6104b 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -93,13 +93,7 @@ $nav-desktop-position: left @import "neat-helpers" -$column: golden-ratio(1em, 3) !default $gutter: golden-ratio(1em, 1) !default -$grid-columns: 12 !default -$max-width: 100% !default -$border-box-sizing: true !default -$default-feature: min-width -$default-layout-direction: LTR !default $mobile: new-breakpoint(max-width 480px 4) $tablet: new-breakpoint(max-width 768px 8) diff --git a/src/sass/badge_only.sass b/src/sass/badge_only.sass index 9b4d486ea..39fc80d70 100644 --- a/src/sass/badge_only.sass +++ b/src/sass/badge_only.sass @@ -4,7 +4,6 @@ // This generates the RTD sticky badge for non RTD themes. As // always, only files labeled "theme_*.sass should be edited". // ------------------------------------------------------------ -$border-box-sizing: false !default @import theme_variables @import ~bourbon/app/assets/stylesheets/bourbon From 813feafd8c4039c6aa0250ec0b6ca97c9cb37a3c Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:10:33 -0500 Subject: [PATCH 06/89] Remove Unused static-img var --- src/sass/_theme_variables.sass | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 1b3b6104b..2022bed46 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -4,11 +4,6 @@ // copied from wyrm - -// Locations -$static-img: "img/" - - // Colors $background-color: #edf0f2 $section-background-color: hsl(0,0%,99%) From 0dc2512a9265dd5e57058862d864dc1cc49d49b2 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:15:38 -0500 Subject: [PATCH 07/89] Add mising import --- src/sass/badge_only.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sass/badge_only.sass b/src/sass/badge_only.sass index 39fc80d70..5c6557fe0 100644 --- a/src/sass/badge_only.sass +++ b/src/sass/badge_only.sass @@ -5,6 +5,7 @@ // always, only files labeled "theme_*.sass should be edited". // ------------------------------------------------------------ +@import ~bootstrap/scss/bootstrap @import theme_variables @import ~bourbon/app/assets/stylesheets/bourbon @import ~bourbon-neat/app/assets/stylesheets/neat From ed130f7bc051b31e4eeaf02969b7971f0447e395 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:16:10 -0500 Subject: [PATCH 08/89] Cleanup formatting --- src/sass/_theme_variables.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 2022bed46..ec81ad8d5 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -79,7 +79,7 @@ $spinner-color: $link-color // Menu $menu-top-link-color: hsl(0, 0%, 95%) -$menu-background-color: rgb(52, 49, 49) +$menu-background-color: rgb(52, 49, 49) $menu-logo-color: $link-color $nav-desktop-width: 300px $nav-desktop-position: left From 59eba1e7b6c6fc899a90ab252d17cfd720c866ee Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:32:50 -0500 Subject: [PATCH 09/89] Convert gray scale vars to bootstrap --- src/sass/_theme_rst.sass | 2 +- src/sass/_theme_variables.sass | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index c8a10dbc5..b5a1afe56 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -316,7 +316,7 @@ html.writer-html5 & dl.footnote color: $text-medium code - color: $gray + color: $gray-500 // Remove the large vertical space between citations and footnotes .wy-table-responsive.citation, .wy-table-responsive.footnote diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index ec81ad8d5..9c414abfa 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -10,14 +10,6 @@ $section-background-color: hsl(0,0%,99%) $dropdown-color: $section-background-color $dropdown-border-color: darken($background-color, 10%) -$black: #000 !default -$gray-darker: #222 !default -$gray-dark: #333 !default -$gray: #555 !default -$gray-light: #999 !default -$gray-lighter: #ccc !default -$white: #fff !default - $green: #27AE60 $offgreen: #1ABC9C $blue: #2980B9 @@ -26,7 +18,6 @@ $cobalt: #34495E $yellow: #F1C40F $orange: #E67E22 $red: #E74C3C -$shell: #ECF0F1 // Typography $base-font-size: 16px !default @@ -61,7 +52,7 @@ $input-text-color: #cad2d3 !default $input-background-color: $white !default $input-border-color: #ccc !default $input-shadow-color: #ddd !default -$input-focus-color: $gray-dark +$input-focus-color: $gray-800 // Links $link-color: $blue @@ -115,7 +106,7 @@ $text-codexref-color: $text-color // Definition list colors $class-color: $blue -$method-color: $gray +$method-color: $gray-500 // GUI label color $guilabel-color: $blue @@ -127,7 +118,7 @@ $footer-color: $text-medium $menu-vertical-background-color: $section-background-color // Menu text colors -$menu-color: $gray +$menu-color: $gray-500 $menu-dark: lighten($menu-color,10%) !default $menu-medium: lighten($menu-color,27.5%) !default $menu-light: lighten($menu-color,45%) !default From 509f4654608bb0821a996152289f23de96b6d615 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:38:09 -0500 Subject: [PATCH 10/89] Remove wyrm colors --- src/sass/_theme_variables.sass | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 9c414abfa..0be012693 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -10,15 +10,6 @@ $section-background-color: hsl(0,0%,99%) $dropdown-color: $section-background-color $dropdown-border-color: darken($background-color, 10%) -$green: #27AE60 -$offgreen: #1ABC9C -$blue: #2980B9 -$purple: #9B59B6 -$cobalt: #34495E -$yellow: #F1C40F -$orange: #E67E22 -$red: #E74C3C - // Typography $base-font-size: 16px !default $base-font-family: "Helvetica Neue", Arial, sans-serif !default From 1963f8f3cda4b0b62b5977ad1326abb0304a68d7 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 21:42:51 -0500 Subject: [PATCH 11/89] Remove unused colors for backgrounds and buttons --- src/sass/_theme_variables.sass | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 0be012693..6a4ea5da7 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -5,10 +5,8 @@ // copied from wyrm // Colors -$background-color: #edf0f2 $section-background-color: hsl(0,0%,99%) $dropdown-color: $section-background-color -$dropdown-border-color: darken($background-color, 10%) // Typography $base-font-size: 16px !default @@ -51,14 +49,6 @@ $link-color-visited: $purple $link-color-hover: lighten($link-color, 6%) !default $link-color-alt: hsl(33, 100%, 51%) - -// Buttons -$button-background-color: $green -$button-neutral-background-color: $table-stripe-color - -// Spinner -$spinner-color: $link-color - // Menu $menu-top-link-color: hsl(0, 0%, 95%) $menu-background-color: rgb(52, 49, 49) From 866b49556a232c36f4702a58cc9f65e331c133cb Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:08:32 -0500 Subject: [PATCH 12/89] Change literal color to red var --- src/sass/_theme_rst.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index b5a1afe56..6eb03a242 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -375,7 +375,7 @@ line-height: normal &.literal - color: $text-code-color + color: $red &.xref, a & font-weight: bold color: $text-codexref-color From 5148401c84c832e9dd0d04adb2320893dc089a92 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:08:56 -0500 Subject: [PATCH 13/89] Remove more unused vars --- src/sass/_theme_variables.sass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/sass/_theme_variables.sass b/src/sass/_theme_variables.sass index 6a4ea5da7..98128fa39 100644 --- a/src/sass/_theme_variables.sass +++ b/src/sass/_theme_variables.sass @@ -16,12 +16,7 @@ $base-line-height: 24px !default $custom-font-family: "Georgia", serif !default $custom-font-family2: "Georgia", serif !default $code-font-family: "Consolas", "Monaco", monospace !default -$icon-font-family: "FontAwesome" $text-color: hsl(0,0%,25%) !default -$text-invert: hsl(0,0%,100%) !default -$text-code-color: $red -$text-code-background-color: $white -$text-code-border-color: hsl(195,7%,89%) $text-dark: lighten($text-color,15%) !default $text-medium: lighten($text-color,25%) !default $text-light: lighten($text-color,45%) !default @@ -72,7 +67,6 @@ $desktop-wider: new-breakpoint(min-width 1400px 12) // end copy $fa-font-path: "~font-awesome/fonts" -$static-img: "../img/" $nav-content-width: 800px $nav-media-query: (($nav-desktop-width) + ($nav-content-width)) @@ -107,7 +101,6 @@ $menu-lighter: lighten($menu-color,60%) !default // Menu link colors $menu-link-color: $text-color -$menu-link-dark: $text-dark $menu-link-medium: $text-medium $menu-link-light: $text-lighter $menu-link-active: $white From 34a07bb908fb7ebfa112f57aedaf9552c5946ede Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:22:00 -0500 Subject: [PATCH 14/89] Remove unused wy-breadcrumbs-extra --- src/sass/_theme_breadcrumbs.sass | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/sass/_theme_breadcrumbs.sass b/src/sass/_theme_breadcrumbs.sass index fb5e022eb..b9d487b9b 100644 --- a/src/sass/_theme_breadcrumbs.sass +++ b/src/sass/_theme_breadcrumbs.sass @@ -16,16 +16,9 @@ background: none &.literal color: $text-color -.wy-breadcrumbs-extra - margin-bottom: 0 - color: $text-light - font-size: 80% - display: inline-block +media($mobile) - .wy-breadcrumbs-extra - display: none .wy-breadcrumbs li.wy-breadcrumbs-aside display: none From 59bfa060c0426951c3fc6bafd7dcbacd271e1c2f Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:35:12 -0500 Subject: [PATCH 15/89] Migrate .admonition --- src/sass/_theme_rst.sass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index 6eb03a242..fbf6146e0 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -113,7 +113,7 @@ // These are the various note pullouts that sphinx applies .note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo, .admonition - // @extend .wy-alert + @extend .alert // These block elements are unsuitable for having floating objects next // to them clear: both @@ -126,13 +126,13 @@ &:before margin-right: 4px .note, .seealso - // @extend .wy-alert.wy-alert-info + @extend .alert-info .hint, .tip, .important - // @extend .wy-alert.wy-alert-success + @extend .alert-success .error, .danger - // @extend .wy-alert.wy-alert-danger + @extend .alert-danger .warning, .caution, .attention, .admonition-todo - // @extend .wy-alert.wy-alert-warning + @extend .alert-warning // Some people put tables in notes. Let's give them very basic support. .admonition table border-color: rgba(0,0,0,.1) From 1360f90f6a3e71053931dc611baf963bd9b70ba8 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:39:52 -0500 Subject: [PATCH 16/89] Migrate basic tables --- src/sass/_theme_rst.sass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index fbf6146e0..cffdad081 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -330,7 +330,7 @@ .wy-table-responsive.citation:last-child, .wy-table-responsive.footnote:last-child margin-bottom: $base-line-height table.docutils - // @extend .wy-table + @extend .table // @extend .wy-table-bordered-all th border-color: $table-border-color @@ -342,13 +342,13 @@ margin-bottom: 0rem font-size: .9rem &:not(.field-list) - // @extend .wy-table-striped + @extend .table-striped // Remove bottom margin for the last element (and it's last child) td .last, td .last > *:last-child margin-bottom: 0 // This table is what gets spit out for auto-generated API stuff. I style it smaller bits of padding. table.field-list - // @extend .wy-table + @extend .table border: none td border: none From dad1a5d71ec6d851f114a117dbd5b9eb4f6af6de Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:43:17 -0500 Subject: [PATCH 17/89] Add borded tables --- src/sass/_theme_rst.sass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index cffdad081..7c5ce69dc 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -331,7 +331,7 @@ margin-bottom: $base-line-height table.docutils @extend .table - // @extend .wy-table-bordered-all + @extend .table-bordered th border-color: $table-border-color html.writer-html5 & From 400a82877530a78143765663da587c25a0b2d9aa Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 22:47:26 -0500 Subject: [PATCH 18/89] Responsive tables --- src/sass/_theme_rst.sass | 8 ++++---- src/theme.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index 7c5ce69dc..72e08954d 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -319,15 +319,15 @@ color: $gray-500 // Remove the large vertical space between citations and footnotes - .wy-table-responsive.citation, .wy-table-responsive.footnote + .table-responsive.citation, .table-responsive.footnote margin-bottom: 0 // Re-add vertical space to element directly following citation and footnotes, // if the following element is of a different type - .wy-table-responsive.citation + :not(.citation), - .wy-table-responsive.footnote + :not(.footnote) + .table-responsive.citation + :not(.citation), + .table-responsive.footnote + :not(.footnote) margin-top: $base-line-height // Re-add vertical space after citation and footnotes if it is the last child of a parent - .wy-table-responsive.citation:last-child, .wy-table-responsive.footnote:last-child + .table-responsive.citation:last-child, .table-responsivefootnote:last-child margin-bottom: $base-line-height table.docutils @extend .table diff --git a/src/theme.js b/src/theme.js index 530827e8a..082687fc1 100644 --- a/src/theme.js +++ b/src/theme.js @@ -100,14 +100,14 @@ function ThemeNav () { // Make tables responsive $("table.docutils:not(.field-list,.footnote,.citation)") - .wrap("
"); + .wrap("
"); // Add extra class to responsive tables that contain // footnotes or citations so that we can target them for styling $("table.docutils.footnote") - .wrap("
"); + .wrap("
"); $("table.docutils.citation") - .wrap("
"); + .wrap("
"); // Add expand links to all parents of nested ul $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () { From d1de49a420fa10f0ba3ded8adb10e2140376c0df Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 23:01:37 -0500 Subject: [PATCH 19/89] Add blockquotes --- src/sass/_theme_rst.sass | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sass/_theme_rst.sass b/src/sass/_theme_rst.sass index 72e08954d..7e587c246 100644 --- a/src/sass/_theme_rst.sass +++ b/src/sass/_theme_rst.sass @@ -49,6 +49,7 @@ // For the most part, its safe to assume that sphinx wants you to use a blockquote as an indent. It gets // used in many different ways, so don't assume you can apply some fancy style, just leave it be. blockquote + @extend .blockquote margin-left: $base-line-height line-height: $base-line-height margin-bottom: $base-line-height From c700eb023ab6ab98a2b3558df124cf2fd337b8e6 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 23:01:56 -0500 Subject: [PATCH 20/89] Remove unused code --- src/sass/_theme_layout.sass | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/sass/_theme_layout.sass b/src/sass/_theme_layout.sass index c448b011c..29e028ebe 100644 --- a/src/sass/_theme_layout.sass +++ b/src/sass/_theme_layout.sass @@ -2,31 +2,10 @@ html font-size: $base-font-size -.wy-affix - position: fixed - top: $gutter - .wy-menu a:hover text-decoration: none -.wy-menu-horiz - +clearfix - ul, li - display: inline-block - li:hover - background: rgba(255,255,255,.1) - li - &.divide-left - border-left: solid 1px hsl(0, 0%, 25%) - &.divide-right - border-right: solid 1px hsl(0, 0%, 25%) - a - height: $base-font-size * 2 - display: inline-block - line-height: $base-font-size * 2 - padding: 0 $base-font-size - .wy-menu-vertical width: $nav-desktop-width From d0a1a492f517b3900b674aa7d7dd302ebbeb8e53 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 22 Feb 2021 23:10:19 -0500 Subject: [PATCH 21/89] Update searchbox --- sphinx_rtd_theme/searchbox.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sphinx_rtd_theme/searchbox.html b/sphinx_rtd_theme/searchbox.html index bc3ee5f0d..cf3fe6985 100644 --- a/sphinx_rtd_theme/searchbox.html +++ b/sphinx_rtd_theme/searchbox.html @@ -1,7 +1,7 @@ {%- if 'singlehtml' not in builder %} -
-
- +