Skip to content

Theme fix - use style sources from theme instead from built-in #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Theme fix - use style sources from theme instead from built-in #91

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dcb16ef
Theme fix - use style sources from theme instead from built-in
Nov 6, 2023
e9d6085
add ci pipeline
Nov 7, 2023
f79caf3
Fix pipeline (from poetry to setuptools+twine)
Nov 7, 2023
97d1362
Bump version: 1.6.0 -> 1.6.1a1
Nov 7, 2023
1921ef2
Move SASS css generation to the theme
Nov 13, 2023
d010690
Move CSS generation to theme
Nov 13, 2023
50538e6
Cleanup code
Nov 13, 2023
94278e9
Cleanup artifacts
Nov 13, 2023
4f3d2ce
Reset version to 1.6.0
Nov 13, 2023
868f54f
Theme version back to 0.1.0
Nov 16, 2023
9faded6
Put docstring back in get_config_var and get_theme_var
Nov 23, 2023
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
19 changes: 15 additions & 4 deletions sphinx_simplepdf/builders/simplepdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import re
from typing import Any, Dict
import subprocess
from importlib import import_module
import weasyprint

import sass
Expand Down Expand Up @@ -44,7 +45,7 @@ def __init__(self, *args, **kwargs):

debug_sphinx = {
"version": __version__,
"confidr": self.app.confdir,
"confdir": self.app.confdir,
"srcdir": self.app.srcdir,
"outdir": self.app.outdir,
"extensions": self.app.config.extensions,
Expand All @@ -55,9 +56,19 @@ def __init__(self, *args, **kwargs):
# Generate main.css
logger.info("Generating css files from scss-templates")
css_folder = os.path.join(self.app.outdir, f"_static")
scss_folder = os.path.join(
os.path.dirname(__file__), "..", "themes", "simplepdf_theme", "static", "styles", "sources"
)

theme_folder = os.path.join(os.path.dirname(__file__), "..", "themes", "simplepdf_theme")

if self.app.config.simplepdf_theme is not None:
try:
theme_folder = os.path.dirname(import_module(self.app.config.html_theme).__file__)
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be simplepdf_theme instead of html_theme?

except ImportError:
logger.warning(f"Could not import {self.app.config.html_theme}")
# use built-in theme
pass

scss_folder = os.path.join(theme_folder, "static", "styles", "sources")

sass.compile(
dirname=(scss_folder, css_folder),
output_style="nested",
Expand Down