Skip to content

Commit

Permalink
worked on task well-949
Browse files Browse the repository at this point in the history
  • Loading branch information
@majin22
majin22 committed Oct 18, 2021
1 parent 0c99df2 commit bd7da24
Show file tree
Hide file tree
Showing 14 changed files with 39 additions and 26 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nutrition-label-jquery-plugin",
"version": "11.0.5",
"version": "11.0.6",
"homepage": "https://github.com/nutritionix/nutrition-label",
"authors": [
"Leo Joseph Gajitos <leejay22@gmail.com>",
Expand Down
8 changes: 8 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@

version 11.0.6 - October 19, 2021

- accessibility improvements listed here https://github.com/nutritionix/nutrition-label/issues/135

------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------

version 11.0.5 - October 17, 2021

- accessibility improvements listed here https://github.com/nutritionix/nutrition-label/issues/134

------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------

version 11.0.4 - December 12, 2020

- css changes from Rommel to fix the validation issue "contrast between foreground and background colors meets WCAG 2 AA contrast ratio thresholds" for Axe https://dequeuniversity.com/rules/axe/3.5/region?application=AxeChrome
Expand Down
2 changes: 1 addition & 1 deletion dist/css/nutritionLabel-min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions dist/css/nutritionLabel.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand Down Expand Up @@ -304,7 +304,8 @@
.nf-highlight,
.nf-serving,
.nf-amount-per-serving,
.nf-calories {
.nf-calories,
.nf-text-strong {
font-family: 'Archivo Black', sans-serif;
}

Expand Down Expand Up @@ -515,6 +516,10 @@ div, span{
.nf .nf-spaceBelow {
height: 10px;
}
.nf-text-strong {
font-size: 1.2em;
line-height: 1.3;
}

/*******************************************************************************************************************
*************************************END OF THE 2018 LABEL RELATED STYLES******************************************
Expand Down
4 changes: 2 additions & 2 deletions dist/js/nutritionLabel-min.js
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions dist/js/nutritionLabel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand Down Expand Up @@ -2308,22 +2308,22 @@

nutritionLabel += globalTab1 + '<div class="' + ($this.settings.showAmountPerServing ? 'line' : 'addedPadding') + '">\n';

if ($this.settings.showFatCalories) {
nutritionLabel += generateAttributeWithoutPercentageHtmlLegacy(
//$localSettings valueIndex unitIndex naIndex attributeText localTabValue lineClass attributeDisplayType itemPropValue localExtraTab roundFunctionName
$this.settings, 'valueFatCalories', 'unitFatCalories', 'naFatCalories', 'textFatCalories', globalTab2, 'fr', 2, '', '', 'roundCalories'
);
}

if ($this.settings.showCalories) {
nutritionLabel += generateAttributeWithoutPercentageHtmlLegacy(
//$localSettings valueIndex unitIndex naIndex attributeText localTabValue lineClass attributeDisplayType itemPropValue localExtraTab roundFunctionName
$this.settings, 'valueCalories', 'unitCalories', 'naCalories', 'textCalories', globalTab2, '', 1, 'calories', '', 'roundCalories'
$this.settings, 'valueCalories', 'unitCalories', 'naCalories', 'textCalories', globalTab2, 'fl', 1, 'calories', '', 'roundCalories'
);
} else if ($this.settings.showFatCalories) {
nutritionLabel += globalTab2 + '<div>&nbsp;</div>\n';
}

if ($this.settings.showFatCalories) {
nutritionLabel += generateAttributeWithoutPercentageHtmlLegacy(
//$localSettings valueIndex unitIndex naIndex attributeText localTabValue lineClass attributeDisplayType itemPropValue localExtraTab roundFunctionName
$this.settings, 'valueFatCalories', 'unitFatCalories', 'naFatCalories', 'textFatCalories', globalTab2, 'ar', 2, '', '', 'roundCalories'
);
}

nutritionLabel += globalTab1 + '</div>\n';
nutritionLabel += globalTab1 + '<div class="bar2"></div>\n';

Expand Down
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand All @@ -29,7 +29,7 @@
<body>
<div class="container" style="width: 1250px;">
<div class="hero-unit">
<h1>Nutrition Label version 11.0.5</h1>
<h1>Nutrition Label version 11.0.6</h1>
<h4>from Nutritionix</h4>
<h4><a href="http://github.com/nutritionix/nutrition-label" target="_newDemo">Homepage</a></h4>
<p>
Expand Down
2 changes: 1 addition & 1 deletion nutritionLabel-min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions nutritionLabel-min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nutritionLabel-stable-ver-11.0.4.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand Down
2 changes: 1 addition & 1 deletion nutritionLabel-stable-ver-11.0.4.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand Down
2 changes: 1 addition & 1 deletion nutritionLabel.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand Down
4 changes: 2 additions & 2 deletions nutritionLabel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @license This Nutritionix jQuery Nutrition Label is dual licensed under the MIT and GPL licenses. |
* @link http://www.nutritionix.com |
* @github http://github.com/nutritionix/nutrition-label |
* @current version 11.0.5 |
* @current version 11.0.6 |
* @stable version 11.0.4 |
* @supported browser Firefox, Chrome, IE8+ |
* @description To be able to create a FDA-style nutrition label with any nutrition data source |
Expand Down Expand Up @@ -2322,7 +2322,7 @@
//$localSettings valueIndex unitIndex naIndex attributeText localTabValue lineClass attributeDisplayType itemPropValue localExtraTab roundFunctionName
$this.settings, 'valueFatCalories', 'unitFatCalories', 'naFatCalories', 'textFatCalories', globalTab2, 'ar', 2, '', '', 'roundCalories'
);
}
}

nutritionLabel += globalTab1 + '</div>\n';
nutritionLabel += globalTab1 + '<div class="bar2"></div>\n';
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nutrition-label-jquery-plugin",
"version": "11.0.5",
"version": "11.0.6",
"description": "To be able to create a FDA-style nutrition label with any nutrition data source",
"main": "nutritionLabel-min.js",
"dependencies": {},
Expand Down

0 comments on commit bd7da24

Please sign in to comment.