From 8008615b04c2f8bb594d53508f3dd5c1ce55e2bc Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Mon, 10 Nov 2014 12:11:54 +0000 Subject: [PATCH] Implemented menu separators and disabled items. Separators are for the main menu, disabled items are for main and game menus. As part of this, the disabled menu items' titles are no longer set. Also moved a few main menu items around. --- resources/report/css/overrides.css | 21 ++++++++++++++++++--- resources/report/js/script.js | 10 +++------- resources/report/report.html | 4 +++- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/resources/report/css/overrides.css b/resources/report/css/overrides.css index 973d9c73..c8a5717e 100644 --- a/resources/report/css/overrides.css +++ b/resources/report/css/overrides.css @@ -20,6 +20,21 @@ color: black; } +/* This override adds separator menu items. */ +html /deep/ paper-item[separator] { + height: 1px; + min-height: 1px; + margin: 10px 0; + background: #CECECE; + pointer-events: none; +} + +/* This override disable menu items. */ +html /deep/ paper-item[disabled] { + opacity: 0.6 !important; + pointer-events: none; +} + /* These overrides change the colour of the tab ink effect and their underline. */ paper-tabs::shadow #selectionBar { background-color: #4285f4; @@ -28,17 +43,17 @@ paper-tab::shadow #ink { color: #4285f4; } -/* These overrides change the font size of the sidebar items to be the body text size. */ +/* This override change the font size of the sidebar items to be the body text size. */ #cardsNav /deep/ #label { font-size: 10pt; } -/* These overrides change the position of the link in so that it doesn't cover up tooltips. */ +/* This override change the position of the link in so that it doesn't cover up tooltips. */ loot-plugin-item::shadow ::content > a { left: 112px; } -/* These overrides change the positioning of the progress dialog to adapt to content changes. */ +/* This override change the positioning of the progress dialog to adapt to content changes. */ #progressDialog { position: inherit !important; margin: auto; diff --git a/resources/report/js/script.js b/resources/report/js/script.js index 24ff3fdd..1a1e8672 100644 --- a/resources/report/js/script.js +++ b/resources/report/js/script.js @@ -70,13 +70,11 @@ var loot = { } var redateButton = document.getElementById('redatePluginsButton'); if (index != undefined && loot.settings.games[index].type == 'Skyrim') { - redateButton.classList.toggle('disabled', false); - redateButton.title = ''; + redateButton.removeAttribute('disabled'); redateButton.removeEventListener('mouseenter', showHoverText, false); redateButton.removeEventListener('mouseleave', hideHoverText, false); } else { - redateButton.classList.toggle('disabled', true); - redateButton.title = 'A Skyrim-specific feature'; + redateButton.setAttribute('disabled', true); redateButton.addEventListener('mouseenter', showHoverText, false); redateButton.addEventListener('mouseleave', hideHoverText, false); } @@ -153,13 +151,11 @@ var loot = { for (var i = 0; i < gameMenuItems.length; ++i) { if (this.installedGames.indexOf(gameMenuItems[i].getAttribute('value')) == -1) { gameMenuItems[i].setAttribute('disabled', true); - gameMenuItems[i].title = 'No install detected'; gameMenuItems[i].removeEventListener('click', changeGame, false); gameMenuItems[i].addEventListener('mouseenter', showHoverText, false); gameMenuItems[i].addEventListener('mouseleave', hideHoverText, false); } else { gameMenuItems[i].removeAttribute('disabled'); - gameMenuItems[i].title = ''; gameMenuItems[i].addEventListener('click', changeGame, false); gameMenuItems[i].removeEventListener('mouseenter', showHoverText, false); gameMenuItems[i].removeEventListener('mouseleave', hideHoverText, false); @@ -818,7 +814,7 @@ function cancelSort(evt) { }).catch(processCefError); } function redatePlugins(evt) { - if (evt.target.classList.contains('disabled')) { + if (evt.target.hasAttribute('disabled')) { return; } diff --git a/resources/report/report.html b/resources/report/report.html index 7f87ca17..4cf1c132 100644 --- a/resources/report/report.html +++ b/resources/report/report.html @@ -42,12 +42,14 @@ - + + +