Browse Source

Further CSS tweaks

n1474335 7 years ago
parent
commit
53b92ae8ef
2 changed files with 11 additions and 14 deletions
  1. 1 1
      src/web/OutputWaiter.mjs
  2. 10 13
      src/web/stylesheets/utils/_overrides.css

+ 1 - 1
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 <i>${opSequence}</i> will result in <span class="data-text">"${Utils.truncate(result, 30)}"</span>`);
+        magicButton.setAttribute("data-original-title", `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.truncate(result, 30)}"</span>`);
         magicButton.setAttribute("data-recipe", JSON.stringify(recipeConfig), null, "");
         magicButton.classList.remove("hidden");
     }

+ 10 - 13
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);
 }