Skip to content

Commit

Permalink
[fc] Repository: plone.staticresources
Browse files Browse the repository at this point in the history
Branch: refs/heads/1.x
Date: 2021-10-21T16:09:48+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: plone/plone.staticresources@9bc2a08

Revert "use / for font url to fix production-bundle issues"

This reverts commit 0228cd7.

Fixes #162
Ref: #168

Files changed:
A news/168.bugfix
M src/plone/staticresources/static/plone-fontello.less
M src/plone/staticresources/static/plone-glyphicons.less
  • Loading branch information
thet committed Oct 21, 2021
1 parent 702557b commit 31b9704
Showing 1 changed file with 13 additions and 22 deletions.
35 changes: 13 additions & 22 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,31 +1,22 @@
Repository: mockup
Repository: plone.staticresources


Branch: refs/heads/3.x
Date: 2021-10-21T13:01:18+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/mockup/commit/21e7c2cfb7b138840607c99f887dd5487a9cb5c9
Branch: refs/heads/1.x
Date: 2021-10-21T16:09:48+02:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.staticresources/commit/9bc2a08fc8dc439dd4b33b495daa1816aec0af23

Preparing release 3.2.7
Revert "use / for font url to fix production-bundle issues"

Files changed:
M CHANGES.rst
D news/1053.bugfix

b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex ed733811b..89519f044 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,16 @@ Changelog\n \n .. towncrier release notes start\n \n+3.2.7 (2021-10-21)\n+------------------\n+\n+Bug fixes:\n+\n+\n+- Call fileUpload view explict with @@ to avoid plone.rest clashes.\n+ [jensens] (#1053)\n+\n+\n 3.2.6 (2021-03-22)\n ------------------\n \ndiff --git a/news/1053.bugfix b/news/1053.bugfix\ndeleted file mode 100644\nindex 93b321330..000000000\n--- a/news/1053.bugfix\n+++ /dev/null\n@@ -1,2 +0,0 @@\n-Call fileUpload view explict with @@ to avoid plone.rest clashes.\n-[jensens]\n'

Repository: mockup


Branch: refs/heads/3.x
Date: 2021-10-21T13:04:38+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/mockup/commit/6b3217d3c74b2addf67ee979900939b5acce6704
This reverts commit 0228cd7.

vb
Fixes #162
Ref: #168

Files changed:
M package.json
A news/168.bugfix
M src/plone/staticresources/static/plone-fontello.less
M src/plone/staticresources/static/plone-glyphicons.less

b'diff --git a/package.json b/package.json\nindex 16488b77b..22a0eeb8d 100644\n--- a/package.json\n+++ b/package.json\n@@ -1,6 +1,6 @@\n {\n "name": "mockup",\n- "version": "3.2.7",\n+ "version": "3.2.8",\n "description": "A collection of client side patterns for faster and easier web development",\n "homepage": "http://plone.github.io/mockup",\n "license": "BSD-3-Clause",\n'
b'diff --git a/news/168.bugfix b/news/168.bugfix\nnew file mode 100644\nindex 00000000..b2018e76\n--- /dev/null\n+++ b/news/168.bugfix\n@@ -0,0 +1,4 @@\n+Fix problem with fontello resources.\n+Fixes #162 reverting commit 0228cd7\n+Ref: #168\n+[erral]\ndiff --git a/src/plone/staticresources/static/plone-fontello.less b/src/plone/staticresources/static/plone-fontello.less\nindex d730aae2..345eebbe 100644\n--- a/src/plone/staticresources/static/plone-fontello.less\n+++ b/src/plone/staticresources/static/plone-fontello.less\n@@ -1,2 +1,2 @@\n-@fontsPrefix: \'/++plone++static/fonts/\';\n+@fontsPrefix: \'++plone++static/fonts/\';\n @import url("fonts/plone-fontello.less");\ndiff --git a/src/plone/staticresources/static/plone-glyphicons.less b/src/plone/staticresources/static/plone-glyphicons.less\nindex cca9c094..d6c80cf7 100644\n--- a/src/plone/staticresources/static/plone-glyphicons.less\n+++ b/src/plone/staticresources/static/plone-glyphicons.less\n@@ -1,4 +1,4 @@\n @import "@{bowerPath}/bootstrap/less/variables.less"; // Modify this for custom colors, font-sizes, etc\n @import "@{bowerPath}/bootstrap/less/glyphicons.less";\n // this override only works because of modifyVarsNoEmbed is used in generated Gruntfile.js\n-@icon-font-path: "/++plone++static/fonts/";\n+@icon-font-path: "++plone++static/fonts/";\n'

0 comments on commit 31b9704

Please sign in to comment.