This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch jewel-ui
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 8a13a81a3495360c8f38136db9fd0664b7b24aed
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Thu Mar 8 16:57:35 2018 +0100
introducing SASS processing in JewelTheme.
Only Maven, ANT should be updated to support this
---
frameworks/themes/JewelTheme/pom.xml | 26 +++++++++++++++++++
.../JewelTheme/src/main/resources/defaults.css | 30 ++++++++++++----------
.../resources/{defaults.css => sass/defaults.scss} | 9 ++++++-
pom.xml | 8 ++++++
4 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/frameworks/themes/JewelTheme/pom.xml
b/frameworks/themes/JewelTheme/pom.xml
index 087dd0e..7232d7f 100644
--- a/frameworks/themes/JewelTheme/pom.xml
+++ b/frameworks/themes/JewelTheme/pom.xml
@@ -79,6 +79,32 @@
</includeFiles>
</configuration>
</plugin>
+ <plugin>
+ <groupId>nl.geodienstencentrum.maven</groupId>
+ <artifactId>sass-maven-plugin</artifactId>
+ <version>3.5.2</version>
+ <configuration>
+ <resources>
+ <resource>
+ <source>
+ <directory>${basedir}/src/main/resources/sass</directory>
+ <includes>
+ <include>**/*.scss</include>
+ </includes>
+ </source>
+ <destination>${basedir}/src/main/resources</destination>
+ </resource>
+ </resources>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-css-using-sass</id>
+ <goals>
+ <goal>update-stylesheets</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 93b9cd7..ea29ba4 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -16,19 +16,23 @@
* limitations under the License.
*
*/
+@namespace j "library://ns.apache.org/royale/jewel";
+@namespace "http://www.w3.org/1999/xhtml";;
+.royale *, .royale *:before, .royale *:after {
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+ /* fonts: ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); */
+}
- @namespace j "library://ns.apache.org/royale/jewel";
- @namespace "http://www.w3.org/1999/xhtml";;
+.royale {
+ padding: 10px;
+ margin: 10px;
+}
- .royale *, .royale *:before, .royale *:after {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- /* fonts:
ClassReference("org.apache.royale.jewel.JewelThemeFontInject"); */
- }
+body {
+ font: 100% "Lato-Bold", sans-serif;
+ color: #333;
+}
- .royale {
- padding: 10px;
- margin: 10px;
- }
-
\ No newline at end of file
+/*# sourceMappingURL=defaults.css.map */
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/sass/defaults.scss
similarity index 90%
copy from frameworks/themes/JewelTheme/src/main/resources/defaults.css
copy to frameworks/themes/JewelTheme/src/main/resources/sass/defaults.scss
index 93b9cd7..b31b1ab 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/sass/defaults.scss
@@ -31,4 +31,11 @@
padding: 10px;
margin: 10px;
}
-
\ No newline at end of file
+
+$font-stack: 'Lato-Bold', sans-serif;
+$primary-color: #333;
+
+body {
+ font: 100% $font-stack;
+ color: $primary-color;
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d72ac3b..1391233 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,12 @@
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.0.0</version>
</plugin>
+
+ <plugin>
+ <groupId>nl.geodienstencentrum.maven</groupId>
+ <artifactId>sass-maven-plugin</artifactId>
+ <version>3.5.2</version>
+ </plugin>
<!--
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
@@ -197,6 +203,8 @@
<!-- Ignore IntelliJ IDEA project files -->
<exclude>**/*.iml</exclude>
<exclude>**/.idea/**</exclude>
+ <!-- SASS cc.map generated files by sass-maven-plugin-->
+ <exclude>**/*.css.map</exclude>
<!--
Exclude any eventually existing content of target directories.
Some times when building with a bigger maven reactor and then
--
To stop receiving notification emails like this one, please contact
carlosrov...@apache.org.
