squidfunk
/
mkdocs-material
mirror of https://github.com/squidfunk/mkdocs-material.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved interop of social plugin with other themes

This commit is contained in:
squidfunk 2024-04-17 11:43:48 +07:00
parent 324ccdb737
commit 6a761ed418
No known key found for this signature in database
GPG Key ID: 5ED40BC4F9C436DF
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
material/plugins/social/plugin.py
View File

@ -408,7 +408,7 @@ class SocialPlugin(BasePlugin[SocialConfig]):
return Image.open(path).convert("RGBA") return Image.open(path).convert("RGBA")
# Handle icons # Handle icons
icon = theme["icon"] or {} icon = theme.get("icon") or {}
if "logo" in icon and icon["logo"]: if "logo" in icon and icon["logo"]:
logo = icon["logo"] logo = icon["logo"]
else: else:
@ -448,13 +448,7 @@ class SocialPlugin(BasePlugin[SocialConfig]):
def _load_font(self, config): def _load_font(self, config):
name = self.config.cards_layout_options.get("font_family") name = self.config.cards_layout_options.get("font_family")
if not name: if not name:
name = config.theme.get("font", {}).get("text", "Roboto")
# Retrieve from theme (default: Roboto)
theme = config.theme
if isinstance(theme["font"], dict) and "text" in theme["font"]:
name = theme["font"]["text"]
else:
name = "Roboto"
# Resolve relevant fonts # Resolve relevant fonts
font = {} font = {}

10
src/plugins/social/plugin.py
View File

@ -408,7 +408,7 @@ class SocialPlugin(BasePlugin[SocialConfig]):
return Image.open(path).convert("RGBA") return Image.open(path).convert("RGBA")
# Handle icons # Handle icons
icon = theme["icon"] or {} icon = theme.get("icon") or {}
if "logo" in icon and icon["logo"]: if "logo" in icon and icon["logo"]:
logo = icon["logo"] logo = icon["logo"]
else: else:
@ -448,13 +448,7 @@ class SocialPlugin(BasePlugin[SocialConfig]):
def _load_font(self, config): def _load_font(self, config):
name = self.config.cards_layout_options.get("font_family") name = self.config.cards_layout_options.get("font_family")
if not name: if not name:
name = config.theme.get("font", {}).get("text", "Roboto")
# Retrieve from theme (default: Roboto)
theme = config.theme
if isinstance(theme["font"], dict) and "text" in theme["font"]:
name = theme["font"]["text"]
else:
name = "Roboto"
# Resolve relevant fonts # Resolve relevant fonts
font = {} font = {}