Merge pull request #1184 from duckduckgo/brian/nutrition-fixes

Nutrition fixes
duckduckgo · Oct 22, 2014 · 52751b3 · 52751b3
2 parents 09ac90e + 10f7552
commit 52751b3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/share/spice/nutrition/content.handlebars b/share/spice/nutrition/content.handlebars
@@ -4,16 +4,18 @@
     	<span class="nutrition__measurement">{{label}}</span>
 	{{/if}}
 </h1>
-{{#if portions}}
-    <div class="nutrition__portion  frm__select">
-        <select class="nutrition__portion__dropdown">
-            {{#each portions}}
-                <option value="{{id}}">{{name}}</option>
-            {{/each}}
-        </select>
-    </div>
-{{else}}
-    {{#if currentPortion}}
-        <div class="nutrition__portion">{{currentPortion.name}}</div>
+<div class="zci__content">
+    {{#if portions}}
+        <div class="nutrition__portion  frm__select">
+            <select class="nutrition__portion__dropdown">
+                {{#each portions}}
+                    <option value="{{id}}">{{name}}</option>
+                {{/each}}
+            </select>
+        </div>
+    {{else}}
+        {{#if currentPortion}}
+            <div class="nutrition__portion">{{currentPortion.name}}</div>
+        {{/if}}
     {{/if}}
-{{/if}}
+</div>
diff --git a/share/spice/nutrition/nutrition.css b/share/spice/nutrition/nutrition.css
@@ -2,10 +2,6 @@
     font-size: 1.75em;
     font-weight: normal;
 }
-.nutrition__portion {
-    margin-bottom: .5em;
-}
 .nutrition__portion.frm__select {
-    margin-bottom: .5em;
     margin-left: -2px;
 }
diff --git a/share/spice/nutrition/nutrition.js b/share/spice/nutrition/nutrition.js
@@ -70,7 +70,7 @@
             var item = api_result.hits[i].fields,
                 regex = new RegExp(foodItem, 'i');
 
-            if (DDG.stringsRelevant(item.item_name, foodItem) && regex.test(item.item_name)) {
+            if (DDG.stringsRelevant(item.item_name, foodItem, [], 3) && regex.test(item.item_name)) {
 
                 // if there's already portitions in the array, and the item isn't
                 // found until after the first comma, don't show it.