diff --git a/src/core/Utils.mjs b/src/core/Utils.mjs index c35aef13..78d4d97d 100755 --- a/src/core/Utils.mjs +++ b/src/core/Utils.mjs @@ -828,11 +828,11 @@ class Utils { */ static async displayFilesAsHTML(files) { const formatDirectory = function(file) { - const html = `
${Utils.escapeHtml(Utils.arrayBufferToStr(buff.buffer))}
+ ${Utils.escapeHtml(Utils.arrayBufferToStr(buff.buffer))}
Category | Token | diff --git a/src/core/operations/Diff.mjs b/src/core/operations/Diff.mjs index 8c72245c..1fd6e5d8 100644 --- a/src/core/operations/Diff.mjs +++ b/src/core/operations/Diff.mjs @@ -47,9 +47,10 @@ class Diff extends Operation { "value": true }, { - "name": "Ignore whitespace (relevant for word and line)", + "name": "Ignore whitespace", "type": "boolean", - "value": false + "value": false, + "hint": "Relevant for word and line" } ]; } diff --git a/src/core/operations/ParseColourCode.mjs b/src/core/operations/ParseColourCode.mjs index a80e3b3a..ca6ee80d 100644 --- a/src/core/operations/ParseColourCode.mjs +++ b/src/core/operations/ParseColourCode.mjs @@ -113,7 +113,7 @@ CMYK: ${cmyk} document.getElementById('input-text').value = 'rgba(' + color.r + ', ' + color.g + ', ' + color.b + ', ' + color.a + ')'; window.app.autoBake(); - }); + }).children(".colorpicker").removeClass('dropdown-menu'); `; } diff --git a/src/core/operations/ParseDateTime.mjs b/src/core/operations/ParseDateTime.mjs index bb88c95d..8b39616d 100644 --- a/src/core/operations/ParseDateTime.mjs +++ b/src/core/operations/ParseDateTime.mjs @@ -7,7 +7,6 @@ import Operation from "../Operation"; import moment from "moment-timezone"; import {DATETIME_FORMATS, FORMAT_EXAMPLES} from "../lib/DateTime"; -import OperationError from "../errors/OperationError"; /** * Parse DateTime operation @@ -60,7 +59,7 @@ class ParseDateTime extends Operation { date = moment.tz(input, inputFormat, inputTimezone); if (!date || date.format() === "Invalid date") throw Error; } catch (err) { - throw new OperationError(`Invalid format.\n\n${FORMAT_EXAMPLES}`); + return `Invalid format.\n\n${FORMAT_EXAMPLES}`; } output += "Date: " + date.format("dddd Do MMMM YYYY") + diff --git a/src/core/operations/ToTable.mjs b/src/core/operations/ToTable.mjs index d2e8d2c1..5f6b9670 100644 --- a/src/core/operations/ToTable.mjs +++ b/src/core/operations/ToTable.mjs @@ -152,7 +152,7 @@ class ToTable extends Operation { // If the first row is a header then put it in with cells.
if (firstRowHeader) {
const row = tableData.shift();
- output += "";
+ output += "";
output += outputRow(row, "th");
output += "";
}
diff --git a/src/core/operations/TranslateDateTimeFormat.mjs b/src/core/operations/TranslateDateTimeFormat.mjs
index 6ed72d9f..98fe253a 100644
--- a/src/core/operations/TranslateDateTimeFormat.mjs
+++ b/src/core/operations/TranslateDateTimeFormat.mjs
@@ -68,7 +68,7 @@ class TranslateDateTimeFormat extends Operation {
date = moment.tz(input, inputFormat, inputTimezone);
if (!date || date.format() === "Invalid date") throw Error;
} catch (err) {
- throw new OperationError(`Invalid format.\n\n${FORMAT_EXAMPLES}`);
+ return `Invalid format.\n\n${FORMAT_EXAMPLES}`;
}
return date.tz(outputTimezone).format(outputFormat);
diff --git a/src/web/HTMLIngredient.mjs b/src/web/HTMLIngredient.mjs
index e6793503..f94f8ca6 100755
--- a/src/web/HTMLIngredient.mjs
+++ b/src/web/HTMLIngredient.mjs
@@ -115,6 +115,7 @@ class HTMLIngredient {
${this.disabled ? " disabled" : ""}
value="${this.name}"> ${this.name}
+ ${this.hint ? "" + this.hint + "" : ""}
`;
break;
diff --git a/src/web/html/index.html b/src/web/html/index.html
index f8e1ad1e..4dbf649c 100755
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -241,7 +241,7 @@
-
+
@@ -290,7 +290,7 @@
-
+
Size: diff --git a/src/web/stylesheets/components/_operation.css b/src/web/stylesheets/components/_operation.css index e891da0a..a0678d36 100755 --- a/src/web/stylesheets/components/_operation.css +++ b/src/web/stylesheets/components/_operation.css @@ -66,7 +66,7 @@ div.toggle-string { .operation [class^='bmd-label'], .operation [class*=' bmd-label'] { - top: 13px; + top: 13px !important; left: 12px; z-index: 10; } @@ -109,12 +109,16 @@ div.toggle-string { filter: brightness(100%); } -.bmd-form-group.is-filled label.bmd-label-floating, -.bmd-form-group.is-focused label.bmd-label-floating { - top: 4px; +.operation .bmd-form-group.is-filled label.bmd-label-floating, +.operation .bmd-form-group.is-focused label.bmd-label-floating { + top: 4px !important; left: 12px; } +.operation .bmd-form-group .bmd-help { + margin-top: -17px; +} + .input-group .form-control { border-top-left-radius: 4px !important; } diff --git a/src/web/stylesheets/components/_pane.css b/src/web/stylesheets/components/_pane.css index 95220b19..46caaf70 100755 --- a/src/web/stylesheets/components/_pane.css +++ b/src/web/stylesheets/components/_pane.css @@ -33,7 +33,7 @@ padding: 0; } -.card { +.io-card.card { box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); transition: 0.3s; width: 400px; @@ -49,11 +49,11 @@ flex-direction: row; } -.card:hover { +.io-card.card:hover { box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); } -.card>img { +.io-card.card>img { float: left; width: 128px; height: 128px; @@ -61,13 +61,13 @@ margin-top: 11px; } -.card-body .close { +.io-card.card .card-body .close { position: absolute; right: 10px; top: 4px; } -.card-body { +.io-card.card .card-body { float: left; padding: 16px; width: 250px; @@ -77,12 +77,12 @@ user-select: text; } -.card-body>.btn { +.io-card.card .card-body>.btn { margin-bottom: 5px; margin-top: 5px; } -.card input[type=number] { +.io-card.card input[type=number] { padding-right: 6px; padding-left: 6px; } diff --git a/src/web/stylesheets/layout/_modals.css b/src/web/stylesheets/layout/_modals.css index 0436dbe2..a49c579d 100755 --- a/src/web/stylesheets/layout/_modals.css +++ b/src/web/stylesheets/layout/_modals.css @@ -72,3 +72,8 @@ #faqs a.btn { text-transform: unset; } + +#faqs > div { + padding: 20px; + border-left: 2px solid var(--primary-border-colour); +} |
---|