From 53b92ae8ef3fdf460b43b4ea6d3e9b67286a6560 Mon Sep 17 00:00:00 2001 From: n1474335 Date: Fri, 3 Aug 2018 19:58:44 +0100 Subject: [PATCH] Further CSS tweaks --- src/web/OutputWaiter.mjs | 2 +- src/web/stylesheets/utils/_overrides.css | 23 ++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/web/OutputWaiter.mjs b/src/web/OutputWaiter.mjs index bfbc484f..408037c3 100755 --- a/src/web/OutputWaiter.mjs +++ b/src/web/OutputWaiter.mjs @@ -474,7 +474,7 @@ class OutputWaiter { */ showMagicButton(opSequence, result, recipeConfig) { const magicButton = document.getElementById("magic"); - magicButton.setAttribute("data-original-title", `Running ${opSequence} will result in "${Utils.truncate(result, 30)}"`); + magicButton.setAttribute("data-original-title", `${opSequence} will produce "${Utils.truncate(result, 30)}"`); magicButton.setAttribute("data-recipe", JSON.stringify(recipeConfig), null, ""); magicButton.classList.remove("hidden"); } diff --git a/src/web/stylesheets/utils/_overrides.css b/src/web/stylesheets/utils/_overrides.css index 08f043a9..0d4aaaf1 100755 --- a/src/web/stylesheets/utils/_overrides.css +++ b/src/web/stylesheets/utils/_overrides.css @@ -36,40 +36,36 @@ margin-bottom: 0; } -/* + button, a:focus { outline: none; } -.btn-secondary { +.btn.btn-raised.btn-secondary { color: var(--btn-default-font-colour); background-color: var(--btn-default-bg-colour); border-color: var(--btn-default-border-colour); } -.btn-secondary:hover, -.btn-secondary:active, -.btn-secondary:hover:active, -.open>.dropdown-toggle.btn-secondary { +.btn.btn-raised.btn-secondary:hover, +.btn.btn-raised.btn-secondary:active, +.btn.btn-raised.btn-secondary:hover:active { color: var(--btn-default-hover-font-colour); background-color: var(--btn-default-hover-bg-colour); border-color: var(--btn-default-hover-border-colour); } -.btn-secondary:focus, -.open>.dropdown-toggle.btn-secondary:hover, -.open>.dropdown-toggle.btn-secondary:focus { +.btn.btn-raised.btn-secondary:focus { color: var(--btn-default-font-colour); background-color: var(--btn-default-bg-colour); border-color: var(--btn-default-hover-border-colour); } -.btn-secondary[disabled]:hover { +.btn.btn-raised.btn-secondary[disabled]:hover { background-color: var(--primary-background-colour); border-color: var(--primary-border-colour); } -*/ .btn.btn-raised.btn-success { color: var(--btn-success-font-colour); @@ -157,13 +153,14 @@ optgroup { .popover-body { max-height: 95vh; overflow-y: auto; + color: var(--primary-font-colour); } -.popover.right>.arrow { +.bs-popover-right>.arrow { border-right-color: var(--popover-border-colour); } -.popover.right>.arrow:after { +.bs-popover-right>.arrow:after { border-right-color: var(--popover-background); }