diff --git a/CHANGELOG.md b/CHANGELOG.md index b67a80d77f..9c9ab3d4e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,17 @@ Infusion from v2.0.0 onwards adheres to [Semantic Versioning](https://semver.org ### More Info +## [4.7.1] - 2024-07-30 + +### Fixed + +* [FLUID-6781](https://issues.fluidproject.org/browse/FLUID-6781) 404 error for sourcing open-sans font in + SeparatedPanelPrefsEditor styles. + +### More Info + +* [Changes in 4.7.1](https://github.com/fluid-project/infusion/compare/v4.7.0...v4.7.1) + ## [4.7.0] - 2024-07-29 ### Added @@ -1028,7 +1039,8 @@ A pre-release of [0.3.0]. * [Issues addressed in 0.1.0](https://issues.fluidproject.org/projects/FLUID/versions/10000) * [Changes in 0.1.0](https://github.com/fluid-project/infusion/commits/v0.1.0) -[Unreleased]: https://github.com/fluid-project/infusion/compare/v4.7.0...HEAD +[Unreleased]: https://github.com/fluid-project/infusion/compare/v4.7.1...HEAD +[4.7.1]: https://github.com/fluid-project/infusion/releases/tag/v4.7.1 [4.7.0]: https://github.com/fluid-project/infusion/releases/tag/v4.7.0 [4.6.0]: https://github.com/fluid-project/infusion/releases/tag/v4.6.0 [4.5.0]: https://github.com/fluid-project/infusion/releases/tag/v4.5.0 diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 48736190c7..36734709e5 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,9 +1,15 @@ -# Release Notes for Fluid Infusion 4.6.0 +# Release Notes for Fluid Infusion 4 [Fluid Project](https://fluidproject.org) [Infusion Documentation](https://github.com/fluid-project/infusion-docs) +## What's New in 4.7.1 + +* Maintenance release which resolves + * [FLUID-6781](https://issues.fluidproject.org/browse/FLUID-6781) 404 error for sourcing open-sans font in + SeparatedPanelPrefsEditor styles. + ## What's New in 4.7.0 * New features diff --git a/package.json b/package.json index 670e915390..c4cd69b324 100755 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "infusion", "description": "Infusion is an application framework for developing flexible stuff with JavaScript", - "version": "4.7.0", + "version": "4.7.1", "author": "Fluid Project", "bugs": "http://issues.fluidproject.org/browse/FLUID", "homepage": "http://www.fluidproject.org/", diff --git a/src/framework/core/js/Fluid.js b/src/framework/core/js/Fluid.js index 96320cd093..3a2602e343 100644 --- a/src/framework/core/js/Fluid.js +++ b/src/framework/core/js/Fluid.js @@ -1,5 +1,5 @@ /*! - * Fluid Infusion v4.7.0 + * Fluid Infusion v4.7.1 * * Infusion is distributed under the Educational Community License 2.0 and new BSD licenses: * http://wiki.fluidproject.org/display/fluid/Fluid+Licensing @@ -30,7 +30,7 @@ Underscore may be freely distributed under the MIT license. var fluid = fluid || {}; // eslint-disable-line no-redeclare -fluid.version = "Infusion 4.7.0"; +fluid.version = "Infusion 4.7.1"; // Export this for use in environments like node.js, where it is useful for // configuring stack trace behaviour diff --git a/src/framework/preferences/css/sass/SeparatedPanelPrefsEditor.scss b/src/framework/preferences/css/sass/SeparatedPanelPrefsEditor.scss index 09132d0e4f..439b2ff281 100644 --- a/src/framework/preferences/css/sass/SeparatedPanelPrefsEditor.scss +++ b/src/framework/preferences/css/sass/SeparatedPanelPrefsEditor.scss @@ -5,7 +5,7 @@ $icon-font: 'PrefsFramework-Icons'; font-family: 'Open Sans Variable'; font-style: normal; font-weight: 300 800; - src: url('../../../lib/open-sans/files/open-sans-latin-wght-normal.woff2') format('woff2-variations'); + src: url('../../../lib/opensans/fonts/open-sans-latin-wght-normal.woff2') format('woff2-variations'); } body { diff --git a/tests/manual-tests/framework/preferences/assortedContent/css/preferences.css b/tests/manual-tests/framework/preferences/assortedContent/css/preferences.css index 72201021a0..250ddfc461 100644 --- a/tests/manual-tests/framework/preferences/assortedContent/css/preferences.css +++ b/tests/manual-tests/framework/preferences/assortedContent/css/preferences.css @@ -89,7 +89,7 @@ input.submit { } .text-area button { - background-image: url("http://wiki.fluidproject.org/download/attachments/24939866/INFUSION_orange_graphic.png"); + background-image: url("../images/INFUSION_orange_graphic.png"); background-repeat: no-repeat; background-size: contain; height: 2rem; diff --git a/tests/manual-tests/framework/preferences/assortedContent/images/INFUSION_orange.png b/tests/manual-tests/framework/preferences/assortedContent/images/INFUSION_orange.png new file mode 100644 index 0000000000..628e515c79 Binary files /dev/null and b/tests/manual-tests/framework/preferences/assortedContent/images/INFUSION_orange.png differ diff --git a/tests/manual-tests/framework/preferences/assortedContent/images/INFUSION_orange_graphic.png b/tests/manual-tests/framework/preferences/assortedContent/images/INFUSION_orange_graphic.png new file mode 100644 index 0000000000..a0e42e5c11 Binary files /dev/null and b/tests/manual-tests/framework/preferences/assortedContent/images/INFUSION_orange_graphic.png differ diff --git a/tests/manual-tests/framework/preferences/assortedContent/index.html b/tests/manual-tests/framework/preferences/assortedContent/index.html index abe601960b..e37dce079d 100644 --- a/tests/manual-tests/framework/preferences/assortedContent/index.html +++ b/tests/manual-tests/framework/preferences/assortedContent/index.html @@ -120,8 +120,8 @@

HTML 5

This is only a partial list of HTML5 elements. For a complete list please see the HTML5 element list on MDN - or the HTML5 document from the - W3C. + or the HTML5 document from the + W3C.

This box tests some fancy CSS3 properties. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
@@ -190,7 +190,7 @@

Grouping

<figure>, <figcaption>
- Fluid Infusion logo + Fluid Infusion logo
The Fluid Infusion logo
@@ -210,7 +210,7 @@

Text

<a> - Fluid Project + Fluid Project <em>