Compare commits

..

No commits in common. "147858801632e3c3a52750a601a13b60d4d5d5a5" and "702564d15e2fa692d80c796f0ed45ccd0c37b72d" have entirely different histories.

3 changed files with 9 additions and 33 deletions

View File

@ -13,15 +13,6 @@
} }
} }
/* Image overflow fix
------------------------------------------------------------------------------------- */
@media all {
img {
max-width: 100%;
height: auto;
}
}
/* Side Navigation /* Side Navigation
------------------------------------------------------------------------------------- */ ------------------------------------------------------------------------------------- */
@media all { @media all {

View File

@ -14,10 +14,8 @@ class ThemeHook:
js: List[dict], js: List[dict],
css_template: Optional[str] = None, css_template: Optional[str] = None,
js_template: Optional[str] = None, js_template: Optional[str] = None,
js_type: Optional[str] = None,
html_tags: Optional[Union[dict, str]] = None, html_tags: Optional[Union[dict, str]] = None,
header_padding: Optional[str] = "4em" header_padding: Optional[str] = "4em"):
):
""" """
:param name: Theme python name :param name: Theme python name
:type name: str :type name: str
@ -31,14 +29,11 @@ class ThemeHook:
:type css_template: Optional[str], optional :type css_template: Optional[str], optional
:param js_template: _description_, defaults to None :param js_template: _description_, defaults to None
:type js_template: Optional[str], optional :type js_template: Optional[str], optional
:param js_type: The type of the JS (e.g.: 'module'), defaults to None
:type js_type: Optional[str], optional
:param html_tags: Attributes added to the `<html>` tag, defaults to None :param html_tags: Attributes added to the `<html>` tag, defaults to None
:type html_tags: Optional[dict|str], optional :type html_tags: Optional[dict|str], optional
:param header_padding: Top padding, defaults to "4em" :param header_padding: Top padding, defaults to "4em"
:type header_padding: Optional[str], optional :type header_padding: Optional[str], optional
""" """
self.name = name self.name = name
self.description = description self.description = description
@ -50,15 +45,11 @@ class ThemeHook:
self.css_template = css_template self.css_template = css_template
self.js_template = js_template self.js_template = js_template
# Define the JS type (e.g.: 'module')
self.js_type = js_type
self.html_tags = ( self.html_tags = (
" ".join([f"{key}={value}" for key, value in html_tags.items()]) " ".join([f"{key}={value}" for key, value in html_tags.items()])
if isinstance(html_tags, dict) if isinstance(html_tags, dict)
else html_tags else html_tags
) )
self.header_padding = header_padding self.header_padding = header_padding
def get_name(self): def get_name(self):
return f"{self.__class__.__module__}.{self.__class__.__name__}" return f"{self.__class__.__module__}.{self.__class__.__name__}"

View File

@ -4,13 +4,7 @@
{% include theme.js_template %} {% include theme.js_template %}
{% else %} {% else %}
{% for x in theme.js %} {% for x in theme.js %}
<script <script src="{{ x.url }}" integrity="{{ x.integrity }}" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
{% if x.js_type %}type="{{ x.js_type }}"{% endif %}
src="{{ x.url }}"
integrity="{{ x.integrity }}"
crossorigin="anonymous"
referrerpolicy="no-referrer"
></script>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<!-- allianceauth.theme.{{ theme.name }} JS Ends--> <!-- allianceauth.theme.{{ theme.name }} JS Ends-->