This is an automated email from the ASF dual-hosted git repository.
pgil pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 180b24c Improved: Improve rainbowstone theme (OFBIZ-12237)
180b24c is described below
commit 180b24c64e893ef8fdc163382d0a781bbfae50fb
Author: Gil Portenseigne <p...@apache.org>
AuthorDate: Mon Jun 28 17:42:19 2021 +0200
Improved: Improve rainbowstone theme (OFBIZ-12237)
Remove quicksand binary files, and add import from fonts.googleapis.com
to solve licencing issue.
Remove licence notice from the LICENCE FILE.
Fix theme link into README.
Fix some comments in javascript.css files.
Thanks Jacques for your guidance !
---
LICENSE | 6 -----
themes/flatgrey/webapp/flatgrey/javascript.css | 6 ++---
themes/rainbowstone/README.md | 2 +-
.../fonts/quicksand/quicksand-regular.woff | 0
.../fonts/quicksand/quicksand-regular.woff2 | Bin 42676 -> 0 bytes
.../webapp/rainbowstone/javascript.css | 6 ++---
.../rainbowstone/rainbowstone-main-theme.less | 30 +++++++++------------
7 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/LICENSE b/LICENSE
index 951a55d..87cb277 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,12 +208,6 @@ For details, see framework/resources/fonts/NotoSans/.
=========================================================================
-This product bundles the "Quicksand" fonts as a binary, which is available
-under the "SIL OFL License 1.1" license.
-For details, see themes/rainbowstone/webapp/rainbowstone/fonts/quicksand
-
-=========================================================================
-
This product bundles "timezones" files, which are available in the "Public
Domain".
For details, see themes/common/webapp/common/js/plugins/date/timezones.
diff --git a/themes/flatgrey/webapp/flatgrey/javascript.css
b/themes/flatgrey/webapp/flatgrey/javascript.css
index 24e882e..811e431 100644
--- a/themes/flatgrey/webapp/flatgrey/javascript.css
+++ b/themes/flatgrey/webapp/flatgrey/javascript.css
@@ -17,9 +17,9 @@
* under the License.
*/
-/* ------------------------------------------------------------------------ */
-/* This CSS file is used for the Helveticus visual theme JavaScript styles. */
-/* ------------------------------------------------------------------------ */
+/* ----------------------------------------------------------------------- */
+/* This CSS file is used for the Flat Grey visual theme JavaScript styles. */
+/* ----------------------------------------------------------------------- */
#wait-spinner {
z-index: 50000;
diff --git a/themes/rainbowstone/README.md b/themes/rainbowstone/README.md
index ebbc1f5..372705b 100644
--- a/themes/rainbowstone/README.md
+++ b/themes/rainbowstone/README.md
@@ -11,4 +11,4 @@ The Rainbowstone theme uses the Quicksand font which is
licensed under the [SIL
## more information
For more information about this component visit the product page in the OFBiz
WIKI,
-which can be found at
https://cwiki.apache.org/confluence/display/OFBIZ/Rainbowstone
+which can be found at
https://cwiki.apache.org/confluence/display/OFBIZ/Visual+Themes+Gallery
diff --git
a/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff
b/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff
deleted file mode 100644
index e69de29..0000000
diff --git
a/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2
b/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2
deleted file mode 100644
index 4937db2..0000000
Binary files
a/themes/rainbowstone/webapp/rainbowstone/fonts/quicksand/quicksand-regular.woff2
and /dev/null differ
diff --git a/themes/rainbowstone/webapp/rainbowstone/javascript.css
b/themes/rainbowstone/webapp/rainbowstone/javascript.css
index 748836f..b3984cc 100644
--- a/themes/rainbowstone/webapp/rainbowstone/javascript.css
+++ b/themes/rainbowstone/webapp/rainbowstone/javascript.css
@@ -17,9 +17,9 @@
* under the License.
*/
-/* ----------------------------------------------------------------------- */
-/* This CSS file is used for the Flat Grey visual theme JavaScript styles. */
-/* ----------------------------------------------------------------------- */
+/* --------------------------------------------------------------------------
*/
+/* This CSS file is used for the Rainbowstone visual theme JavaScript styles.
*/
+/* --------------------------------------------------------------------------
*/
#wait-spinner {
z-index: 50000;
diff --git
a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
index ee14b3f..0fffe1e 100644
--- a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
+++ b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-main-theme.less
@@ -39,13 +39,7 @@
@box-border-color: #d7d7d7;
-@font-face {
- font-family: 'quicksandregular';
- src: url('fonts/quicksand/quicksand-regular.woff2') format('woff2'),
- url('fonts/quicksand/quicksand-regular.woff') format('woff');
- font-weight: normal;
- font-style: normal;
-}
+@import
url('https://fonts.googleapis.com/css2?family=Quicksand:wght@300;400&display=swap');
/* ---------------------------------- */
/* Begin special checkbox type switch */
@@ -110,7 +104,7 @@
padding-left: 35px;
position: relative;
cursor: pointer;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
font-size: 12px;
}
@@ -497,7 +491,7 @@ li.line-odd {
flex-direction: row;
align-items: center;
justify-content: space-between;
- font-family: quicksandregular,sans-serif;
+ font-family: Quicksand,sans-serif;
background-color: @dark-color-theme;
z-index: 5;
height: @app-bar-height;
@@ -799,7 +793,7 @@ a.user-pref-btn {
min-width: 75px;
padding-left: 6px;
padding-right: 6px;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
border-bottom: solid 1px @black;
font-size: 12px;
@media screen and (max-width: 1500px) {
@@ -999,7 +993,7 @@ a.user-pref-btn {
padding: 5px 10px 5px 10px;
border-bottom: solid 1px @black;
span {
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif
!important;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif !important;
font-size: 15px;
font-weight: bold;
width: 110px;
@@ -1445,7 +1439,7 @@ form .basic-table,
.info-message-title {
min-width:150px;
margin: 5px;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
font-size: 16px;
font-weight: bold;
}
@@ -1488,7 +1482,7 @@ form .basic-table,
table.msg-list {
width: 100%;
font-size: 16px;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
padding: 0;
thead {
height: 100%;
@@ -1559,7 +1553,7 @@ table.msg-list {
display: flex;
justify-content: center;
align-items: center;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
color: @dark-color-theme;
height: 100%;
width: 100%;
@@ -1603,14 +1597,14 @@ select.paginate-select {
}
.paginate-select-label {
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
font-size: 16px;
padding-left: 15px;
padding-right: 15px;
}
.paginate-information {
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
font-size: 16px;
padding-left: 15px;
padding-right: 15px;
@@ -1634,7 +1628,7 @@ ul.paginate-pg-list li:hover{
.nav-pager {
background-color: @greydark;
color: @white;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif;
font-size: 9px;
font-weight: bold;
line-height: 3.5em;
@@ -1843,7 +1837,7 @@ input[type="button"] {
flex-direction: row;
align-items: center;
justify-content: space-between;
- font-family: "quicksandregular", Arial, "Lucida Grande", sans-serif
!important;
+ font-family: "Quicksand", Arial, "Lucida Grande", sans-serif !important;
z-index: 10;
span {
