diff --git a/resources/report/bower.json b/resources/report/bower.json index d49d85a8..37dea245 100644 --- a/resources/report/bower.json +++ b/resources/report/bower.json @@ -34,6 +34,7 @@ "paper-toast": "Polymer/paper-toast#~0.5.1", "core-list": "WrinklyNinja/core-list#z-order-items", "core-dropdown": "WrinklyNinja/core-dropdown#null-dimensions-positions-fix", - "jed-gettext-parser": "~1.0.0" + "jed-gettext-parser": "~1.0.0", + "paper-toggle-button": "Polymer/paper-toggle-button#~0.5.4" } } diff --git a/resources/report/css/overrides.css b/resources/report/css/overrides.css index 2bc9d326..6df503c3 100644 --- a/resources/report/css/overrides.css +++ b/resources/report/css/overrides.css @@ -86,3 +86,14 @@ html /deep/ paper-checkbox::shadow #checkbox.checked { border-color: #3F51B5; background-color: #3F51B5; } + +/* Style the paper-toggle-button colours. */ +html /deep/ paper-toggle-button::shadow [checked] .toggle-bar { + background-color: rgba(63, 81, 181, 0.5); +} +html /deep/ paper-toggle-button::shadow [checked] .toggle-button { + background-color: #3F51B5; +} +html /deep/ paper-toggle-button::shadow [checked] .toggle-ink { + color: #3F51B5; +} diff --git a/resources/report/css/style.css b/resources/report/css/style.css index d9e24bed..153aad44 100644 --- a/resources/report/css/style.css +++ b/resources/report/css/style.css @@ -189,6 +189,9 @@ li.warn { #settingsDialog > div > :last-child { margin-right: 0; } +#settingsDialog core-label [for]:last-child { + margin-left: 16px; +} #gameTable { margin: 32px 0 0; } diff --git a/resources/report/html/loot-plugin-card.html b/resources/report/html/loot-plugin-card.html index b67f7a8c..edb92cfa 100644 --- a/resources/report/html/loot-plugin-card.html +++ b/resources/report/html/loot-plugin-card.html @@ -16,11 +16,13 @@ loot-clear-metadata + + @@ -138,12 +140,20 @@ loot-clear-metadata core-tooltip > core-icon { vertical-align: inherit !important; } - #showOnlyConflicts { - display: block; + core-menu > core-label { + font-size: 1rem; + font-weight: 500; padding: 0 16px; height: 48px; line-height: 48px; } + core-menu > core-label > core-icon { + margin-right: 32px; + color: rgba(0, 0, 0, 0.54); + } + core-menu > core-label [for] { + margin-left: 32px; + }
@@ -172,7 +182,11 @@ loot-clear-metadata - + + +
Show Only Conflicts
+ +
Edit Metadata diff --git a/resources/report/html/loot-plugin-editor.html b/resources/report/html/loot-plugin-editor.html index 8e1e25fd..07445703 100644 --- a/resources/report/html/loot-plugin-editor.html +++ b/resources/report/html/loot-plugin-editor.html @@ -11,12 +11,14 @@ loot-editor-close + + - + @@ -77,9 +79,6 @@ loot-editor-close #main > paper-checkbox, #main > core-tooltip { line-height: 48px; } - #main > core-tooltip { - display: table; - } #main > div > div:first-child { margin-right: 16px; } @@ -155,9 +154,15 @@ loot-editor-close
- - - + +
Enable Edits
+ +
+ + +
Global Priority
+ +
Priority Value
diff --git a/resources/report/js/l10n.js b/resources/report/js/l10n.js index 13f55ed3..940ad709 100644 --- a/resources/report/js/l10n.js +++ b/resources/report/js/l10n.js @@ -64,7 +64,7 @@ pluginCard.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads BSA").fetch()); pluginCard.getElementById('hasUserEdits').setAttribute('label', l10n.translate("Has User Metadata").fetch()); - pluginCard.getElementById('showOnlyConflicts').setAttribute('label', l10n.translate("Show Only Conflicts").fetch()); + pluginCard.getElementById('showOnlyConflicts').previousElementSibling.textContent = l10n.translate("Show Only Conflicts").fetch(); pluginCard.getElementById('editMetadata').lastChild.textContent = l10n.translate("Edit Metadata").fetch(); pluginCard.getElementById('copyMetadata').lastChild.textContent = l10n.translate("Copy Metadata").fetch(); pluginCard.getElementById('clearMetadata').lastChild.textContent = l10n.translate("Clear User Metadata").fetch(); @@ -82,9 +82,9 @@ pluginEditor.getElementById('emptyPlugin').setAttribute('label', l10n.translate("Empty Plugin").fetch()); pluginEditor.getElementById('loadsBSA').setAttribute('label', l10n.translate("Loads BSA").fetch()); - pluginEditor.getElementById('enableEdits').setAttribute('label', l10n.translate("Enable Edits").fetch()); - pluginEditor.getElementById('globalPriority').parentElement.setAttribute('label', l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch()); - pluginEditor.getElementById('globalPriority').setAttribute('label', l10n.translate("Global Priority").fetch()); + pluginEditor.getElementById('enableEdits').previousElementSibling.textContent = l10n.translate("Enable Edits").fetch(); + pluginEditor.getElementById('globalPriority').parentElement.parentElement.setAttribute('label', l10n.translate("Global priorities are compared against all other plugins. Normal priorities are compared against only conflicting plugins.").fetch()); + pluginEditor.getElementById('globalPriority').previousElementSibling.textContent = l10n.translate("Global Priority").fetch(); pluginEditor.getElementById('priorityValue').parentElement.previousElementSibling.textContent = l10n.translate("Priority Value").fetch(); pluginEditor.getElementById('tableTabs').querySelector('[data-for=main]').textContent = l10n.translate("Main").fetch(); @@ -277,10 +277,10 @@ document.getElementById('languageSelect').previousElementSibling.textContent = l10n.translate("Language").fetch(); document.getElementById('languageSelect').previousElementSibling.label = l10n.translate("Language changes will be applied after LOOT is restarted.").fetch(); - document.getElementById('enableDebugLogging').label = l10n.translate("Enable debug logging").fetch(); + document.getElementById('enableDebugLogging').previousElementSibling.textContent = l10n.translate("Enable debug logging").fetch(); document.getElementById('enableDebugLogging').parentElement.label = l10n.translate("The output is logged to the LOOTDebugLog.txt file.").fetch(); - document.getElementById('updateMasterlist').label = l10n.translate("Update masterlist before sorting").fetch(); + document.getElementById('updateMasterlist').previousElementSibling.textContent = l10n.translate("Update masterlist before sorting").fetch(); var gameTable = document.getElementById('gameTable'); gameTable.querySelector('th:first-child').textContent = l10n.translate("Name").fetch(); diff --git a/resources/report/report.html b/resources/report/report.html index a05ff08e..3fe2d1e2 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -24,6 +24,7 @@ + @@ -37,6 +38,7 @@ + @@ -256,10 +258,16 @@
- - + + +
Enable debug logging
+ +
- + +
Update masterlist before sorting
+ +