This is an automated email from the ASF dual-hosted git repository.
jleroux 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 7bdc53d Improved: Fixes licenses issues in *.less files from Rainbow
Stone theme
7bdc53d is described below
commit 7bdc53d739a6c2870f0d2ae380afef027b17f171
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Fri Jul 9 21:26:53 2021 +0200
Improved: Fixes licenses issues in *.less files from Rainbow Stone theme
Removes tabs and trailing blanks in helveticus-main-theme.less as a "by
product"
---
.../webapp/helveticus/helveticus-main-theme.less | 131 ++++++++++++---------
.../helveticus/webapp/helveticus/helveticus.less | 19 +++
.../webapp/rainbowstone/rainbowstone-amber.less | 19 +++
.../webapp/rainbowstone/rainbowstone-emerald.less | 19 +++
.../webapp/rainbowstone/rainbowstone-ruby.less | 19 +++
.../webapp/rainbowstone/rainbowstone-saphir.less | 19 +++
6 files changed, 170 insertions(+), 56 deletions(-)
diff --git a/themes/helveticus/webapp/helveticus/helveticus-main-theme.less
b/themes/helveticus/webapp/helveticus/helveticus-main-theme.less
index 951826b..351e3e0 100644
--- a/themes/helveticus/webapp/helveticus/helveticus-main-theme.less
+++ b/themes/helveticus/webapp/helveticus/helveticus-main-theme.less
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
*******************************************************************************/
+
@app-bar-height: 60px;
@footer-height: 20px;
@home-menu-tile-height: 80px;
@@ -10,7 +29,7 @@
html{font-size: 10px;}
body {
- font-family: 'Quicksand', sans-serif;
+ font-family: 'Quicksand', sans-serif;
font-weight:400;
font-size: 1.2rem;
background: @grey-light;
@@ -58,14 +77,14 @@ span.label{
}
/*** BUTTON /LINK / NAV STYLES ***/
-a, a:hover, * {
+a, a:hover, * {
text-decoration:none;
- -o-transition:.5s;
- -ms-transition:.5s;
- -moz-transition:.5s;
- -webkit-transition:.5s;
+ -o-transition:.5s;
+ -ms-transition:.5s;
+ -moz-transition:.5s;
+ -webkit-transition:.5s;
}
-a {
+a {
color:@dark-color-theme;
&:hover{
color:@shadow-color-light;
@@ -170,7 +189,7 @@ input[type="submit"], .smallSubmit{
flex-wrap: wrap;
align-items: center;
column-gap: 0.5rem;
- row-gap: 1rem;
+ row-gap: 1rem;
li {
a {
display:block;
@@ -192,7 +211,7 @@ input[type="submit"], .smallSubmit{
color:@dark-color-theme;
&:hover{
color: @main-color-theme;
- background:@dark-color-theme;
+ background:@dark-color-theme;
}
}
}
@@ -208,8 +227,8 @@ input[type="submit"], .smallSubmit{
font-weight: 600;
&:hover{
color: @main-color-theme;
- background:@dark-color-theme;
- }
+ background:@dark-color-theme;
+ }
}
&.button-style-2 > a{
background: white;
@@ -222,8 +241,8 @@ input[type="submit"], .smallSubmit{
font-weight: 600;
&:hover{
color: @main-color-theme;
- background:@dark-color-theme;
- }
+ background:@dark-color-theme;
+ }
}
}
@@ -239,8 +258,8 @@ a.buttontext{
margin:0.3rem;
&:hover{
color: @main-color-theme;
- background:@dark-color-theme;
- }
+ background:@dark-color-theme;
+ }
}
/*** HEADER STYLE ***/
@@ -273,15 +292,15 @@ a.buttontext{
align-items: center;
margin-left: 1rem;
.app-btn{
- opacity:0.85;
+ opacity:0.85;
padding:1.8rem 0.9rem;
border-top-left-radius :0.4rem;
border-top-right-radius :0.4rem;
&.selected{
- opacity:1;
+ opacity:1;
background-color:white;
&:hover{
- opacity:1;
+ opacity:1;
background-color:white;
}
#app-selected {
@@ -289,7 +308,7 @@ a.buttontext{
color: @font-color-for-main
}
}
- }
+ }
&:hover{
opacity:1;
}
@@ -319,7 +338,7 @@ a.buttontext{
font-weight: 500;
span{
width:4rem;
- opacity:0.85;
+ opacity:0.85;
padding:0.5rem 0.9rem;
border-top-left-radius :0.4rem;
border-top-right-radius :0.4rem;
@@ -330,10 +349,10 @@ a.buttontext{
background-color: @main-color-theme;
color: @font-color-for-main;
}
- }
+ }
#more-app:hover #more-app-list {
display: block;
- }
+ }
#more-app-list {
display: none;
position: absolute;
@@ -343,8 +362,8 @@ a.buttontext{
border-radius: 4px;
padding:0 2rem;
box-shadow: 0 0 50px 0 rgba(82,63,105,.15);
- li {
- margin:1rem 0.5rem;
+ li {
+ margin:1rem 0.5rem;
a {
display:block;
padding:0.2rem 0.5rem;
@@ -353,7 +372,7 @@ a.buttontext{
color: @dark-color-theme;
}
}
- }
+ }
li.selected {
background-color: rgba(255, 255, 255, .9);
a {
@@ -364,7 +383,7 @@ a.buttontext{
background-color: @main-color-theme;
}
}
- }
+ }
}
}
#main-nav-bar-right {
@@ -400,7 +419,7 @@ a.buttontext{
font-size: 1.4rem;
position: absolute;
top:@app-bar-height;
- right:2rem;
+ right:2rem;
background-color: rgba(255, 255, 255, .9);
border-radius: 4px;
padding:0 2rem;
@@ -413,7 +432,7 @@ a.buttontext{
justify-content: center;
align-items: center;
}
- #user-lang{
+ #user-lang{
span{
padding-left: 2rem;
background-position: left center;
@@ -422,7 +441,7 @@ a.buttontext{
#logout {
color: @dark-color-theme;
}
- }
+ }
}
}
}
@@ -439,8 +458,8 @@ a.buttontext{
column-gap: 0.5rem;
padding: 1rem;
li {
- li{
- &.selected, &:hover{
+ li{
+ &.selected, &:hover{
a{
background-color: @main-color-theme;
border-radius: 0.5rem;
@@ -455,7 +474,7 @@ a.buttontext{
font-size:1.2rem;
display: flex;
}
- }
+ }
}
}
}
@@ -477,9 +496,9 @@ a.buttontext{
margin-left:1%
}
}
- .left {
- float:left;
- width: 12%;
+ .left {
+ float:left;
+ width: 12%;
input[type="text"]{
width: ~"calc(100% - 2rem)"
}
@@ -503,7 +522,7 @@ a.buttontext{
}
.nocolumns {
width: auto;
- }
+ }
}
.lefthalf {
float: left;
@@ -563,7 +582,7 @@ a.buttontext{
color: white;
font-size: 1.2rem;
font-weight: 600;
- background: @font-color-for-light;
+ background: @font-color-for-light;
border-radius:0.3rem;
text-transform: uppercase;
&:hover{
@@ -591,7 +610,7 @@ a.buttontext{
}
.disabled {
opacity:0.75;
- }
+ }
.collapsed, .collapsed:hover {
background: url("images/plus-circle.svg") no-repeat center center /
cover;
display: inline-block;
@@ -646,8 +665,8 @@ a.buttontext{
label{
color:@shadow-color-light;
font-weight:500;
- font-size:1.3rem;
- }
+ font-size:1.3rem;
+ }
}
}
}
@@ -759,7 +778,7 @@ a.buttontext{
background-color: @dark-color-theme ;
}
}
- }
+ }
.nav-first-disabled,
.nav-previous-disabled,
.nav-next-disabled,
@@ -774,7 +793,7 @@ a.buttontext{
background-position: center center;
background-size: 16px;
}
- }
+ }
.nav-first a,
.nav-first-disabled span{
background-image: url('data:image/svg+xml;utf8,<svg
xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"
fill="none" stroke="%233699ff" stroke-width="2" stroke-linecap="round"
stroke-linejoin="round"><polyline points="11 17 6 12 11 7"></polyline><polyline
points="18 17 13 12 18 7"></polyline></svg>');
@@ -803,7 +822,7 @@ a.buttontext{
background-image: url('data:image/svg+xml;utf8,<svg
xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"
fill="none" stroke="%23e1f0ff" stroke-width="2" stroke-linecap="round"
stroke-linejoin="round"><polyline points="13 17 18 12 13
7"></polyline><polyline points="6 17 11 12 6 7"></polyline></svg>');
}
}
-
+
.nav-first-disabled,
.nav-previous-disabled,
.nav-next-disabled,
@@ -929,11 +948,11 @@ span.tooltip{
color: #000000;
margin-bottom: 1em;
width: 100%;
- tr{
- th{
+ tr{
+ th{
font-weight: 600;
text-align: left;
- }
+ }
&.header-row{
font-weight: 600;
text-align: left;
@@ -963,13 +982,13 @@ span.tooltip{
color: white;
font-size: 1.2rem;
font-weight: 600;
- background: @font-color-for-light;
+ background: @font-color-for-light;
border-radius:0.3rem;
text-transform: uppercase;
margin:0.5rem 0;
&:hover{
background: @main-color-theme;
- color: @font-color-for-light
+ color: @font-color-for-light
}
}
}
@@ -1002,7 +1021,7 @@ span.tooltip{
}
.alternate-rowValidate {
background: @successLight;
- }
+ }
.Warn {
background: @danger;
}
@@ -1021,15 +1040,15 @@ span.tooltip{
background-color: @light2-color-theme;
.sort-order-asc{
background: url(/images/arrow-gr-up.png) no-repeat right;
- padding-right: 20px;
+ padding-right: 20px;
}
.sort-order-desc{
background: url(/images/arrow-gr-dw.png) no-repeat right;
- padding-right: 20px;
+ padding-right: 20px;
}
.sort-order{
background: url(/images/arrow-gr.png) no-repeat right;
- padding-right: 20px;
+ padding-right: 20px;
color:@shadow-color-light
}
}
@@ -1046,10 +1065,10 @@ form .basic-table,
width: auto;
tr {
>td {
- padding:0.5rem;
+ padding:0.5rem;
&.has-tooltip{
padding-bottom:1.7rem;
- }
+ }
}
&.has-tooltip td{
padding-bottom: 2.5rem;
@@ -1150,7 +1169,7 @@ form .basic-table,
font-weight: 600;
color:@medium-color-theme
}
-}
+}
.webToolList{
margin-left:2rem;
li{
@@ -1206,4 +1225,4 @@ form .basic-table,
#EditProdCatalog .basic-table td span.tooltip{
position:static
-}
\ No newline at end of file
+}
diff --git a/themes/helveticus/webapp/helveticus/helveticus.less
b/themes/helveticus/webapp/helveticus/helveticus.less
index cb5245c..d1ad438 100644
--- a/themes/helveticus/webapp/helveticus/helveticus.less
+++ b/themes/helveticus/webapp/helveticus/helveticus.less
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
*******************************************************************************/
+
/* helveticus colors */
@blue: #00b6d1;
@blue-dark: #3699ff;
diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-amber.less
b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-amber.less
index e1377b4..1318315 100644
--- a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-amber.less
+++ b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-amber.less
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
*******************************************************************************/
+
/* Amber colors */
@amber-dark: #bc4216;
@amber-main: #f08906;
diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-emerald.less
b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-emerald.less
index 0b78dff..47edaeb 100644
--- a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-emerald.less
+++ b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-emerald.less
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
*******************************************************************************/
+
/* Emerald colors */
@green-dark: #197948;
@green-main: #23af9b;
diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less
b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less
index f98226e..9285f64 100644
--- a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less
+++ b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
*******************************************************************************/
+
/* Ruby colors */
@red-dark: #420000;
@red-main: #bf1616;
diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-saphir.less
b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-saphir.less
index 9560148..feb3f8a 100644
--- a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-saphir.less
+++ b/themes/rainbowstone/webapp/rainbowstone/rainbowstone-saphir.less
@@ -1,3 +1,22 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+
*******************************************************************************/
+
/* Saphir colors */
@blue-dark: #002333;
@blue-main: #005982;
