Browse Source

[matrix] Modal cleanup

* General modal cleanup

* Remove second scrollbar caused by modal
pull/6176/head
Josh 5 years ago
committed by Rapptz
parent
commit
9653ec5188
  1. 10
      docs/_static/custom.js
  2. 6
      docs/_static/style.css
  3. 53
      docs/_templates/layout.html

10
docs/_static/custom.js

@ -9,7 +9,7 @@ let sidebar;
function closeModal(modal) { function closeModal(modal) {
activeModal = null; activeModal = null;
modal.style.display = 'none'; modal.hidden = true;
} }
function openModal(modal) { function openModal(modal) {
@ -18,7 +18,7 @@ function openModal(modal) {
} }
activeModal = modal; activeModal = modal;
modal.style.removeProperty('display'); modal.hidden = false;
} }
function updateSetting(element) { function updateSetting(element) {
@ -30,7 +30,11 @@ function updateSetting(element) {
function getRootAttributeToggle(attributeName, valueName) { function getRootAttributeToggle(attributeName, valueName) {
function toggleRootAttribute(set) { function toggleRootAttribute(set) {
document.documentElement.setAttribute(`data-${attributeName}`, set ? valueName : null); if (set) {
document.documentElement.setAttribute(`data-${attributeName}`, valueName);
} else {
document.documentElement.removeAttribute(`data-${attributeName}`);
}
} }
return toggleRootAttribute; return toggleRootAttribute;
} }

6
docs/_static/style.css

@ -303,7 +303,7 @@ div.modal {
top: 0; top: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: hidden;
background-color: rgba(0,0,0,0.4); background-color: rgba(0,0,0,0.4);
cursor: pointer; cursor: pointer;
} }
@ -334,6 +334,10 @@ div.modal-content > span.close:focus {
color: #444; color: #444;
} }
div.modal input {
cursor: pointer;
}
/* copy button */ /* copy button */
.relative-copy { .relative-copy {

53
docs/_templates/layout.html

@ -77,31 +77,6 @@
</aside> </aside>
{#- The actual body of the contents #} {#- The actual body of the contents #}
<main class="grid-item"> <main class="grid-item">
<div id="settings" class="modal" style="display: none;" onclick="if (event.target == this){ closeModal(settingsModal); }">
<div class="modal-content">
<span class="close" onclick="closeModal(settingsModal);" title="Close">&times;</span>
<h1>Settings</h1>
<div class='setting'>
<h3>Use a sans-serif font:
<label class="toggle" title="Use a sans serif font? Your system font will be used, falling back to `sans-serif`.">
<input type="checkbox" name="useSansFont" onclick="updateSetting(this);">
<span class="toggle-slider"></span>
</label>
</h3>
</div>
<div class='setting'>
<h3>Enable dark theme:
<label class="toggle" title="Enable the dark theme.">
<input type="checkbox" name="useDarkTheme" onclick="updateSetting(this);">
<span class="toggle-slider"></span>
</label>
</h3>
</div>
</div>
</div>
{% block body %} {% endblock %} {% block body %} {% endblock %}
</main> </main>
{%- block footer %} {%- block footer %}
@ -132,5 +107,33 @@
} }
</script> </script>
{%- endif %} {%- endif %}
<div id="settings" class="modal" onclick="if (event.target == this){ closeModal(settingsModal); }" hidden>
<div class="modal-content">
<span class="close" onclick="closeModal(settingsModal);" title="Close">&times;</span>
<h1>Settings</h1>
<div class='setting'>
<h3>Use a sans-serif font:
<label class="toggle"
title="Use a sans serif font? Your system font will be used, falling back to `sans-serif`.">
<input type="checkbox" name="useSansFont" onclick="updateSetting(this);">
<span class="toggle-slider"></span>
</label>
</h3>
</div>
<div class='setting'>
<h3>Enable dark theme:
<label class="toggle" title="Enable the dark theme.">
<input type="checkbox" name="useDarkTheme" onclick="updateSetting(this);">
<span class="toggle-slider"></span>
</label>
</h3>
</div>
</div>
</div>
</body> </body>
</html> </html>

Loading…
Cancel
Save