Merge pull request #1107 from jobara/FLUID-6781

FLUID-6781: fix URL to open-sans font

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

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

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/",

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

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 {

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;

tests/manual-tests/framework/preferences/assortedContent/index.html

@@ -120,8 +120,8 @@ <h2>HTML 5</h2>
                     This is only a partial list of HTML5 elements. For a complete list please see the
                     <a href="https://developer.mozilla.org/en/docs/Web/Guide/HTML/HTML5/HTML5_element_list">HTML5 element list</a>
                     on <a href="https://developer.mozilla.org/en-US/"><abbr title="Mozilla Developer Network">MDN</abbr></a>
-                    or the <a href="http://www.w3.org/TR/html5/">HTML5</a> document from the
-                    <a href="http://www.w3.org/"><abbr title="World Wid Web Consortium">W3C</abbr></a>.
+                    or the <a href="https://html.spec.whatwg.org/multipage/">HTML5</a> document from the
+                    <a href="https://www.w3.org/"><abbr title="World Wid Web Consortium">W3C</abbr></a>.
                 </p>
                 <div class="overflow-test"> 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.  </div>
                 <section>
@@ -190,7 +190,7 @@ <h3>Grouping</h3>
                                 <td>&lt;figure&gt;, &lt;figcaption&gt;</td>
                                 <td>
                                     <figure class="test-figure">
-                                        <img alt="Fluid Infusion logo" src="https://wiki.fluidproject.org/download/attachments/24939866/INFUSION_orange.png">
+                                        <img alt="Fluid Infusion logo" src="./images/INFUSION_orange.png">
                                         <figcaption>The Fluid Infusion logo</figcaption>
                                     </figure>
                                 </td>
@@ -210,7 +210,7 @@ <h3>Text</h3>
                         <tbody>
                             <tr>
                                 <td>&lt;a&gt;</td>
-                                <td><a href="http://fluidproject.org">Fluid Project</a></td>
+                                <td><a href="https://fluidproject.org">Fluid Project</a></td>
                             </tr>
                             <tr>
                                 <td>&lt;em&gt;</td>