Skip to content
Draft
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
b0c1832
Inital Move to bootstrap
Blendify Feb 23, 2021
6eb7506
Remove unused icon variables
Blendify Feb 23, 2021
fefd452
remove unused wy-body-mask
Blendify Feb 23, 2021
02f7b76
Sass update to bootsrap zindex values
Blendify Feb 23, 2021
eedd6bf
Remove Some unused vars
Blendify Feb 23, 2021
813feaf
Remove Unused static-img var
Blendify Feb 23, 2021
0dc2512
Add mising import
Blendify Feb 23, 2021
ed130f7
Cleanup formatting
Blendify Feb 23, 2021
59eba1e
Convert gray scale vars to bootstrap
Blendify Feb 23, 2021
509f465
Remove wyrm colors
Blendify Feb 23, 2021
1963f8f
Remove unused colors for backgrounds and buttons
Blendify Feb 23, 2021
866b495
Change literal color to red var
Blendify Feb 23, 2021
5148401
Remove more unused vars
Blendify Feb 23, 2021
34a07bb
Remove unused wy-breadcrumbs-extra
Blendify Feb 23, 2021
59bfa06
Migrate .admonition
Blendify Feb 23, 2021
1360f90
Migrate basic tables
Blendify Feb 23, 2021
dad1a5d
Add borded tables
Blendify Feb 23, 2021
400a828
Responsive tables
Blendify Feb 23, 2021
d1de49a
Add blockquotes
Blendify Feb 23, 2021
c700eb0
Remove unused code
Blendify Feb 23, 2021
d0a1a49
Update searchbox
Blendify Feb 23, 2021
402d196
Initial breadcrumbs
Blendify Feb 23, 2021
9fa20ae
Add alert heading
Blendify Feb 23, 2021
7915088
Remove duplicate font stack
Blendify Feb 23, 2021
37c8833
Cleanup: Remove unused vars
Blendify Feb 23, 2021
023cf01
Remove unused custom font family
Blendify Feb 23, 2021
3242c93
Remove unused table vars
Blendify Feb 23, 2021
a0efa83
Use bootstap breakpoints
Blendify Feb 23, 2021
c9957fb
Fix list padding
Blendify Feb 23, 2021
8439999
Merge list includes from wyrm
Blendify Feb 23, 2021
c4733dc
Lighten border colors
Blendify Feb 23, 2021
76facb8
Use darker gray for nav background
Blendify Feb 23, 2021
b8d383d
Cleanup Sidebar colors
Blendify Feb 23, 2021
643e72f
Update buttons
Blendify Feb 23, 2021
904527d
Remove $custom-font-family
Blendify Feb 23, 2021
2d7508f
Use bootstrap var names
Blendify Feb 23, 2021
e9c72c5
Fix syntax
Blendify Feb 23, 2021
4726038
Merge branch 'master' into blendify/v2
Blendify Feb 23, 2021
cb445eb
Merge branch 'master' into blendify/v2
Blendify Feb 23, 2021
12bc1a0
remove wy-body-for-nav
Blendify Feb 23, 2021
2c63bc7
Remove wy-grid-for-nav
Blendify Feb 23, 2021
b84f56b
Rename wy-nav-shift to sidebar collapse
Blendify Feb 23, 2021
be9262f
Remove wy-menu
Blendify Feb 23, 2021
b907507
Initial Bootstrap layout
Blendify Feb 23, 2021
6a927aa
Update Main Content Layout
Blendify Feb 26, 2021
5e60c37
More layout fixes
Blendify Feb 26, 2021
be49272
Port sidebar navigation
Blendify Feb 26, 2021
51ab0be
Basic kbd support
Blendify Feb 26, 2021
9fe3642
Set font family for body and not html
Blendify Feb 26, 2021
c8c28e1
Fix font difference
Blendify Feb 26, 2021
8a9e4f7
Add back literal border
Blendify Feb 26, 2021
84bc56e
Update some old classes
Blendify Feb 27, 2021
1bc8580
Remove Preinstall for good
Blendify Feb 27, 2021
f7536a7
Fix Breadcrumbs aside
Blendify Feb 27, 2021
0b08d5f
Fix breadcrumb classes
Blendify Feb 28, 2021
881c9ce
Fix breadcrumb classes
Blendify Feb 28, 2021
a5a9008
Merge branch 'blendify/v2' of github.com:readthedocs/sphinx_rtd_theme…
Blendify Feb 28, 2021
44b98be
Revert Demo doc changes
Blendify Feb 28, 2021
b5323a4
Remove html5 shiv for ie 9 support
Blendify Mar 1, 2021
bc9cb59
Merge branch 'master' into blendify/v2
Blendify Mar 1, 2021
9907652
Merge branch 'master' into blendify/v2
Blendify Mar 1, 2021
c96caa7
Update lockfile
Blendify Mar 1, 2021
7748a34
Fix sidebar scroll
Blendify Mar 1, 2021
d9ed99c
Cleanup: Whitespace
Blendify Mar 1, 2021
9d49402
Add some padding to rst versions
Blendify Mar 1, 2021
a46d397
Fix one off pixel error
Blendify Mar 2, 2021
74b0260
Fix API class background
Blendify Mar 2, 2021
da4c161
Improve method parameter contrast
Blendify Mar 2, 2021
a33aa24
Remove underline from heading hover
Blendify Mar 2, 2021
4c8b380
Increase sidebar title contrast
Blendify Mar 2, 2021
a7a7f46
Fix literal-block padding
Blendify Mar 2, 2021
0bed94e
Admonition use text color
Blendify Mar 2, 2021
f3d5f38
Match old nav background color
Blendify Mar 2, 2021
c3ab8bb
Fix sidebar breakpoints
Blendify Mar 2, 2021
5abb62f
Fix GUI Labels
Blendify Mar 2, 2021
29fa23a
Set font size for blockquotes
Blendify Mar 2, 2021
229ff95
Remove HTML4 Styling
Blendify Mar 2, 2021
30de695
Cleanup neat import
Blendify Mar 2, 2021
0205a77
Optimize Badge Only Imports
Blendify Mar 2, 2021
c490c3b
Use Bootstrap clearfix
Blendify Mar 2, 2021
28a72b1
Fix syntax
Blendify Mar 2, 2021
f0f116e
Remove unused sidebar sass
Blendify Mar 2, 2021
1b24af1
Cleanup: Theme Variables
Blendify Mar 2, 2021
dc3b0c2
Remove Semicolins from sass
Blendify Mar 2, 2021
d8567ae
Add back comment
Blendify Mar 2, 2021
15c9630
Remove Semicolins
Blendify Mar 2, 2021
c92d09e
Commit compiled assets for test
Blendify Mar 2, 2021
4c3ec57
Revert "Commit compiled assets for test"
Blendify Mar 2, 2021
d2c4b2e
Merge branch 'master' into blendify/v2
Blendify Mar 4, 2021
1a79dc2
Revert npm7 changes
Blendify Mar 4, 2021
5734cf8
Remove Bourbon
Blendify Mar 4, 2021
a30c614
Use dart sass instead of node-sass
Blendify Mar 4, 2021
7677443
Correct Sass Syntax
Blendify Mar 4, 2021
0902912
Fix API docs
Blendify Mar 5, 2021
bb79a97
Merge branch 'master' into blendify/v2
Blendify Mar 15, 2021
57cf83a
Add missing endblock
Blendify Mar 15, 2021
1d790f6
Merge branch 'master' into blendify/v2
Blendify Mar 20, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions bin/preinstall.js
Original file line number Diff line number Diff line change
@@ -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);
}
1 change: 0 additions & 1 deletion docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 12 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
12 changes: 6 additions & 6 deletions sphinx_rtd_theme/breadcrumbs.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@

<div role="navigation" aria-label="breadcrumbs navigation">

<ul class="wy-breadcrumbs">
<ol class="breadcrumb">
{% block breadcrumbs %}
<li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
<li class="breadcrumb-item"><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
{% for doc in parents %}
<li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
{% endfor %}
<li>{{ title }}</li>
{% endblock %}
{% block breadcrumbs_aside %}
<li class="wy-breadcrumbs-aside">
<li class="breadcrumb-aside">
{% if hasdoc(pagename) and display_vcs_links %}
{% if display_github %}
{% if check_meta and 'github_url' in meta %}
Expand Down Expand Up @@ -68,15 +68,15 @@
{% endif %}
</li>
{% endblock %}
</ul>
</ol>

{% if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
<div class="rst-breadcrumbs-buttons" role="navigation" aria-label="breadcrumb navigation">
{% if prev %}
<a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
<a href="{{ prev.link|e }}" class="btn btn-light float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
{% endif %}
{% if next %}
<a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
<a href="{{ next.link|e }}" class="btn btn-light float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
{% endif %}
</div>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions sphinx_rtd_theme/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
{%- if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
<div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
{%- if prev %}
<a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
<a href="{{ prev.link|e }}" class="btn btn-light float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> {{ _('Previous') }}</a>
{%- endif %}
{%- if next %}
<a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
<a href="{{ next.link|e }}" class="btn btn-light float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
{%- endif %}
</div>
{%- endif %}
Expand Down
6 changes: 3 additions & 3 deletions sphinx_rtd_theme/searchbox.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%- if 'singlehtml' not in builder %}
<div role="search">
<form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
<input type="text" name="q" placeholder="{{ _('Search docs') }}" />
<div class="form-outline" role="search">
<form id="rtd-search-form" action="{{ pathto('search') }}" method="get">
<input type="search" name="q" class="form-control" placeholder="{{ _('Search docs') }}" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
Expand Down
14 changes: 7 additions & 7 deletions src/sass/_theme_badge.sass
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
width: $nav-desktop-width
color: $section-background-color
background: darken($menu-background-color, 8%)
font-family: $base-font-family
z-index: $z-index-tray
font-family: $font-family-base
z-index: $zindex-popover
a
color: $link_color
text-decoration: none
.rst-badge-small
display: none
.rst-current-version
padding: $base-line-height / 2
padding: $line-height-base / 2
background-color: darken($menu-background-color, 5%)
display: block
text-align: right
Expand Down Expand Up @@ -41,7 +41,7 @@
display: block
.rst-other-versions
font-size: 90%
padding: $base-line-height / 2
padding: $line-height-base / 2
color: $text-medium
display: none
hr
Expand All @@ -56,7 +56,7 @@
margin: 0
a
display: inline-block
padding: $base-line-height / 4
padding: $line-height-base / 4
color: $section-background-color
&.rst-badge
width: auto
Expand All @@ -82,11 +82,11 @@
width: auto
height: 30px
line-height: 30px
padding: 0 $base-line-height / 4
padding: 0 $line-height-base / 4
display: block
text-align: center

+media($tablet)
@include media-breakpoint-down(md)
.rst-versions
width: 85%
display: none
Expand Down
1 change: 0 additions & 1 deletion src/sass/_theme_badge_fa.sass
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
font-weight: normal
line-height: 1
text-decoration: inherit
+font-smooth

a .fa
display: inline-block
Expand Down
35 changes: 6 additions & 29 deletions src/sass/_theme_breadcrumbs.sass
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
.wy-breadcrumbs
+clearfix
.breadcrumb
padding-left: 0px
background-color: inherit
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Set $breadcrumb-bg here instread.


.wy-breadcrumbs li
display: inline-block
&.wy-breadcrumbs-aside
float: right
a
display: inline-block
padding: 5px
&:first-child
padding-left: 0
code
padding: 5px
border: none
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
@include media-breakpoint-down(sm)
.breadcrumb li.breadcrumb-aside
display: none

@media print
.wy-breadcrumbs li.wy-breadcrumbs-aside
.breadcrumb li.breadcrumb-aside
display: none
Loading