diff --git a/_config.yml b/_config.yml index ff71148..cb3d880 100644 --- a/_config.yml +++ b/_config.yml @@ -17,3 +17,15 @@ collections: permalink: "/:collection/:name" recipes_per_page: 15 + +fractions: + "1": "&‌#8530;" + "125": "⅛" + "2": "⅕" + "25": "¼" + "3": "⅓" + "4": "⅖" + "5": "½" + "6": "⅗" + "75": "¾" + "8": "⅘" diff --git a/_includes/fractionalise.html b/_includes/fractionalise.html new file mode 100644 index 0000000..e2e0f2b --- /dev/null +++ b/_includes/fractionalise.html @@ -0,0 +1,14 @@ +{%- assign decimal = input | split: "." | last -%} +{%- assign output = input -%} +{%- assign item_split = input | split: "" -%} + +{%- if item_split contains "." -%} + {%- if site.fractions contains decimal -%} + {%- assign prefix = input | split: "." | first -%} + {%- if prefix == "0" -%} + {%- assign output = site.fractions[decimal] -%} + {%- else -%} + {%- assign output = prefix | append: site.fractions[decimal] -%} + {%- endif -%} + {%- endif -%} +{%- endif -%} diff --git a/_includes/ingredients.html b/_includes/ingredients.html index 1839644..f984957 100644 --- a/_includes/ingredients.html +++ b/_includes/ingredients.html @@ -10,10 +10,21 @@ {%- assign tag = tag | append: " class='optional'" -%} {%- endif -%} - {%- assign amount = item[0] | append: " " -%} + {%- assign input = item[0] -%} + {%- include fractionalise.html -%} + + {%- assign amount = output | append: " " -%} {%- assign end = "" -%} {%- if item[0][0] -%} - {%- assign amount = item[0][0] | append: " to " | append: item[0][1] | append: " " -%} + {%- assign input = item[0][0] -%} + {%- include fractionalise.html -%} + {%- assign from = output -%} + + {%- assign input = item[0][1] -%} + {%- include fractionalise.html -%} + {%- assign to = output -%} + + {%- assign amount = from | append: " to " | append: to | append: " " -%} {%- elsif item[0] == 0 -%} {%- assign amount = "" -%} {%- assign end = " to taste" -%} diff --git a/assets/style.css b/assets/style.css index f7083d4..fac6682 100644 --- a/assets/style.css +++ b/assets/style.css @@ -11,6 +11,7 @@ body { margin: 0; } #main { + width: 80%; max-width: 1500px; flex-grow: 1; margin: 0 auto;