Skip to content
Snippets Groups Projects
Commit 074a0c86 authored by squidfunk's avatar squidfunk
Browse files

Fixed issues with color overrides by always setting color attributes

parent f5f5baa8
No related branches found
No related tags found
No related merge requests found
...@@ -81,10 +81,10 @@ ...@@ -81,10 +81,10 @@
{% if not palette is mapping %} {% if not palette is mapping %}
{% set palette = palette | first %} {% set palette = palette | first %}
{% endif %} {% endif %}
{% set scheme = palette.scheme | replace(" ", "-") | lower %} {% set scheme = palette.scheme | d("default", true) %}
{% set primary = palette.primary | replace(" ", "-") | lower %} {% set primary = palette.primary | d("indigo", true) %}
{% set accent = palette.accent | replace(" ", "-") | lower %} {% set accent = palette.accent | d("indigo", true) %}
<body dir="{{ direction }}" data-md-color-scheme="{{ scheme }}" data-md-color-primary="{{ primary }}" data-md-color-accent="{{ accent }}"> <body dir="{{ direction }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}" data-md-color-primary="{{ primary | replace(' ', '-') }}" data-md-color-accent="{{ accent | replace(' ', '-') }}">
{% else %} {% else %}
<body dir="{{ direction }}"> <body dir="{{ direction }}">
{% endif %} {% endif %}
......
...@@ -34,9 +34,10 @@ ...@@ -34,9 +34,10 @@
{% if not config.theme.palette is mapping %} {% if not config.theme.palette is mapping %}
<form class="md-header__option" data-md-component="palette"> <form class="md-header__option" data-md-component="palette">
{% for option in config.theme.palette %} {% for option in config.theme.palette %}
{% set primary = option.primary | replace(" ", "-") | lower %} {% set scheme = option.scheme | d("default", true) %}
{% set accent = option.accent | replace(" ", "-") | lower %} {% set primary = option.primary | d("indigo", true) %}
<input class="md-option" data-md-color-media="{{ option.media }}" data-md-color-scheme="{{ option.scheme }}" data-md-color-primary="{{ primary }}" data-md-color-accent="{{ accent }}" {% if option.toggle %} aria-label="{{ option.toggle.name }}" {% else %} aria-hidden="true" {% endif %} type="radio" name="__palette" id="__palette_{{ loop.index }}"> {% set accent = option.accent | d("indigo", true) %}
<input class="md-option" data-md-color-media="{{ option.media }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}" data-md-color-primary="{{ primary | replace(' ', '-') }}" data-md-color-accent="{{ accent | replace(' ', '-') }}" {% if option.toggle %} aria-label="{{ option.toggle.name }}" {% else %} aria-hidden="true" {% endif %} type="radio" name="__palette" id="__palette_{{ loop.index }}">
{% if option.toggle %} {% if option.toggle %}
<label class="md-header__button md-icon" title="{{ option.toggle.name }}" for="__palette_{{ loop.index0 or loop.length }}" hidden> <label class="md-header__button md-icon" title="{{ option.toggle.name }}" for="__palette_{{ loop.index0 or loop.length }}" hidden>
{% include ".icons/" ~ option.toggle.icon ~ ".svg" %} {% include ".icons/" ~ option.toggle.icon ~ ".svg" %}
......
...@@ -159,14 +159,14 @@ ...@@ -159,14 +159,14 @@
{% if not palette is mapping %} {% if not palette is mapping %}
{% set palette = palette | first %} {% set palette = palette | first %}
{% endif %} {% endif %}
{% set scheme = palette.scheme | replace(" ", "-") | lower %} {% set scheme = palette.scheme | d("default", true) %}
{% set primary = palette.primary | replace(" ", "-") | lower %} {% set primary = palette.primary | d("indigo", true) %}
{% set accent = palette.accent | replace(" ", "-") | lower %} {% set accent = palette.accent | d("indigo", true) %}
<body <body
dir="{{ direction }}" dir="{{ direction }}"
data-md-color-scheme="{{ scheme }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}"
data-md-color-primary="{{ primary }}" data-md-color-primary="{{ primary | replace(' ', '-') }}"
data-md-color-accent="{{ accent }}" data-md-color-accent="{{ accent | replace(' ', '-') }}"
> >
{% else %} {% else %}
<body dir="{{ direction }}"> <body dir="{{ direction }}">
......
...@@ -73,14 +73,15 @@ ...@@ -73,14 +73,15 @@
{% if not config.theme.palette is mapping %} {% if not config.theme.palette is mapping %}
<form class="md-header__option" data-md-component="palette"> <form class="md-header__option" data-md-component="palette">
{% for option in config.theme.palette %} {% for option in config.theme.palette %}
{% set primary = option.primary | replace(" ", "-") | lower %} {% set scheme = option.scheme | d("default", true) %}
{% set accent = option.accent | replace(" ", "-") | lower %} {% set primary = option.primary | d("indigo", true) %}
{% set accent = option.accent | d("indigo", true) %}
<input <input
class="md-option" class="md-option"
data-md-color-media="{{ option.media }}" data-md-color-media="{{ option.media }}"
data-md-color-scheme="{{ option.scheme }}" data-md-color-scheme="{{ scheme | replace(' ', '-') }}"
data-md-color-primary="{{ primary }}" data-md-color-primary="{{ primary | replace(' ', '-') }}"
data-md-color-accent="{{ accent }}" data-md-color-accent="{{ accent | replace(' ', '-') }}"
{% if option.toggle %} {% if option.toggle %}
aria-label="{{ option.toggle.name }}" aria-label="{{ option.toggle.name }}"
{% else %} {% else %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment