From 1c15338bd5337e87da6f8e2d4c79afabca444b4f Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 1 May 2019 12:13:10 -0700 Subject: [PATCH] Make reset ignored button consistent with enable/disable all rules buttons --- css/80_app.css | 16 ++++------------ data/core.yaml | 2 +- dist/locales/en.json | 2 +- modules/ui/issues.js | 9 ++++++--- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index cd40b8049..34c179fe2 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -3306,40 +3306,32 @@ button.autofix.action.active { padding: 0 10px; } -.layer-list.issues-list { - margin-bottom: 5px; -} - .layer-list.issues-list li.issue { border-color: inherit; /* override .layer-list styles */ color: inherit; height: unset; } -.layer-list.issue-rules-list { +.layer-list.issue-rules-list, +.layer-list.issues-list { margin-bottom: 0; } -.issue-rules-links { +.section-footer { display: flex; flex-flow: row nowrap; flex-direction: row-reverse; height: 30px; } -.issue-rules-link { +.section-footer a { padding: 5px; } -.issues-none { - margin-top: 5px; - margin-bottom: 5px; -} .issues-none .box { border-radius: 4px; border: 1px solid #72d979; background: #c6ffca; padding: 5px !important; display: flex; - margin-bottom: 5px; } .issues-none .icon { color: #05ac10; diff --git a/data/core.yaml b/data/core.yaml index 9740ac13c..2d4dfded0 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -1312,7 +1312,7 @@ en: suggested: "Suggested updates:" enable_all: Enable All disable_all: Disable All - reset_ignored: Reset ignored ({count}) + reset_ignored: Reset Ignored ({count}) fix_one: title: fix fix_all: diff --git a/dist/locales/en.json b/dist/locales/en.json index edf2906b6..deb53ed44 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1612,7 +1612,7 @@ "suggested": "Suggested updates:", "enable_all": "Enable All", "disable_all": "Disable All", - "reset_ignored": "Reset ignored ({count})", + "reset_ignored": "Reset Ignored ({count})", "fix_one": { "title": "fix" }, diff --git a/modules/ui/issues.js b/modules/ui/issues.js index 96e642a52..2a3d5e177 100644 --- a/modules/ui/issues.js +++ b/modules/ui/issues.js @@ -313,15 +313,18 @@ export function uiIssues(context) { // enter var resetIgnoredEnter = resetIgnored.enter() + .append('div') + .attr('class', 'reset-ignored section-footer'); + + resetIgnoredEnter .append('a') - .attr('class', 'reset-ignored') .attr('href', '#'); // update resetIgnored = resetIgnored .merge(resetIgnoredEnter); - resetIgnored + resetIgnored.select('a') .text(t('issues.reset_ignored', { count: ignoredIssues.length.toString() })); resetIgnored.on('click', function() { @@ -344,7 +347,7 @@ export function uiIssues(context) { var ruleLinks = containerEnter .append('div') - .attr('class', 'issue-rules-links'); + .attr('class', 'issue-rules-links section-footer'); ruleLinks .append('a')