mirror of
https://github.com/arfct/itty-bitty.git
synced 2026-03-11 08:54:33 +00:00
ingredient formatting
This commit is contained in:
parent
a47e125f6e
commit
292323bddd
2 changed files with 10 additions and 7 deletions
|
|
@ -246,10 +246,13 @@ li:hover .noun {
|
|||
margin-left:2em;
|
||||
}
|
||||
.ingredients .quantity {
|
||||
float:left;
|
||||
margin-left:-2.5em;
|
||||
width:2em;
|
||||
text-align:right;
|
||||
float:
|
||||
left;
|
||||
margin-left: -2.2em;
|
||||
min-width: 1.8em;
|
||||
text-align:
|
||||
right;
|
||||
margin-right: 0.3em;
|
||||
}
|
||||
|
||||
.ingredient.complete,
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ function highlightStep(e) {
|
|||
|
||||
}
|
||||
|
||||
const ingredientMatch = /^(?:A )?([\/0-9 \u00BC-\u00BE\u2153-\u215E\u2009]*)\s(.*)/
|
||||
const ingredientMatch = /^(?:A )?([\-\/0-9 \u00BC-\u00BE\u2153-\u215E\u2009]*)\s(.*)/
|
||||
|
||||
|
||||
function ingredientEl(string, terms) {
|
||||
|
|
@ -154,9 +154,9 @@ function ingredientEl(string, terms) {
|
|||
let match = FRACTION_MAP.replace(clean(string)).match(ingredientMatch);
|
||||
|
||||
if (match) {
|
||||
return [m("span.quantity", match[1].replace(" ", "\u202F")), m("div", {innerHTML:highlightTerms(match[2], terms)})]
|
||||
return [m("span.quantity", match[1].replace(" ", "\u202F")), " ", m("span", {innerHTML:highlightTerms(match[2], terms)})]
|
||||
}
|
||||
return [m("span.quantity", ""), m("div", {innerHTML:string})];
|
||||
return [m("span.quantity", ""), m("span", {innerHTML:string})];
|
||||
}
|
||||
|
||||
function highlightTerms(string, terms) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue