You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2017/11/02 15:05:30 UTC
[myfaces-tobago] 01/05: TOBAGO-1819: A dark theme for ambiant light
situations: roxborough
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 0724588e244a1792076257604ddbb960ca6bc795
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Nov 1 19:25:51 2017 +0100
TOBAGO-1819: A dark theme for ambiant light situations: roxborough
---
tobago-assembly/pom.xml | 4 ++--
tobago-example/pom.xml | 9 +--------
.../src/main/webapp/WEB-INF/tobago-config.xml | 2 +-
.../html/richmond/standard/property/demo.properties.xml | 2 +-
tobago-theme/pom.xml | 2 +-
tobago-theme/rebuild-theme.sh | 2 +-
.../pom.xml | 10 +++++-----
.../src/main/appended-resources/META-INF/NOTICE | 0
.../main/patches/append-tobago-theme-to-bootstrap.patch | 0
.../tobago-bootstrap/_version/css/bootstrap.css | 0
.../tobago-bootstrap/_version/css/bootstrap.css.map | 0
.../tobago-bootstrap/_version/css/bootstrap.min.css | 0
.../tobago-bootstrap/_version/css/bootstrap.min.css.map | 0
.../roxborough}/tobago-bootstrap/_version/js/bootstrap.js | 0
.../tobago-bootstrap/_version/js/bootstrap.min.js | 0
.../src/main/resources/META-INF/tobago-config.xml | 14 +++++++-------
.../src/main/scss/_custom.scss | 0
.../src/main/scss/_tobago-theme.scss | 0
18 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/tobago-assembly/pom.xml b/tobago-assembly/pom.xml
index 4365fc7..6419371 100644
--- a/tobago-assembly/pom.xml
+++ b/tobago-assembly/pom.xml
@@ -206,13 +206,13 @@ XXX TOBAGO-1654
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
+-->
<artifactItem>
<groupId>${project.groupId}</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
+ <artifactId>tobago-theme-roxborough</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
</artifactItem>
--->
<artifactItem>
<groupId>${project.groupId}</groupId>
<artifactId>tobago-theme-speyside</artifactId>
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 43e68cb..7933a31 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -131,13 +131,11 @@
<version>${project.version}</version>
</dependency>
-->
-<!--
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
+ <artifactId>tobago-theme-roxborough</artifactId>
<version>${project.version}</version>
</dependency>
--->
<!--
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
@@ -187,11 +185,6 @@
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</profile>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
index 2c92235..e2f8dc4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml
@@ -37,7 +37,7 @@
<supported-theme>speyside</supported-theme>
<!-- TODO: Can be removed after closing TOBAGO-1664 -->
<!--<supported-theme>scarborough</supported-theme>-->
- <!--<supported-theme>richmond</supported-theme>-->
+ <supported-theme>roxborough</supported-theme>
<!--<supported-theme>charlotteville</supported-theme>-->
</theme-config>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml b/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml
index 1b325bf..a5d9191 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/richmond/standard/property/demo.properties.xml
@@ -19,5 +19,5 @@
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
- <entry key="theme_photo">Flowers near Richmond</entry>
+ <entry key="theme_photo">Flowers near Roxborough</entry>
</properties>
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index 93acc7f..71f8700 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -68,6 +68,7 @@
<modules>
<module>tobago-theme-standard</module>
<module>tobago-theme-speyside</module>
+ <module>tobago-theme-roxborough</module>
</modules>
<dependencies>
@@ -84,7 +85,6 @@
<id>all-modules</id>
<modules>
<module>tobago-theme-scarborough</module>
- <module>tobago-theme-richmond</module>
<module>tobago-theme-charlotteville</module>
</modules>
</profile>
diff --git a/tobago-theme/rebuild-theme.sh b/tobago-theme/rebuild-theme.sh
index 7c4275d..8e64dcd 100755
--- a/tobago-theme/rebuild-theme.sh
+++ b/tobago-theme/rebuild-theme.sh
@@ -51,7 +51,7 @@ function rebuild_theme() {
mvn -Pall-modules clean
rebuild_theme charlotteville
-rebuild_theme richmond
+rebuild_theme roxborough
rebuild_theme scarborough
rebuild_theme speyside
rebuild_theme standard
diff --git a/tobago-theme/tobago-theme-richmond/pom.xml b/tobago-theme/tobago-theme-roxborough/pom.xml
similarity index 90%
rename from tobago-theme/tobago-theme-richmond/pom.xml
rename to tobago-theme/tobago-theme-roxborough/pom.xml
index 2ac254d..4ccbece 100644
--- a/tobago-theme/tobago-theme-richmond/pom.xml
+++ b/tobago-theme/tobago-theme-roxborough/pom.xml
@@ -23,12 +23,12 @@
<artifactId>tobago-theme</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
- <artifactId>tobago-theme-richmond</artifactId>
+ <artifactId>tobago-theme-roxborough</artifactId>
<packaging>jar</packaging>
- <name>Tobago Theme Richmond</name>
+ <name>Tobago Theme Roxborough</name>
<properties>
- <theme.name>richmond</theme.name>
+ <theme.name>roxborough</theme.name>
</properties>
<build>
@@ -44,8 +44,8 @@
<phase>compile</phase>
<configuration>
<target>
- <move file="${project.build.outputDirectory}/META-INF/resources/tobago/richmond/tobago-bootstrap/_version"
- tofile="${project.build.outputDirectory}/META-INF/resources/tobago/richmond/tobago-bootstrap/${project.version}">
+ <move file="${project.build.outputDirectory}/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version"
+ tofile="${project.build.outputDirectory}/META-INF/resources/tobago/roxborough/tobago-bootstrap/${project.version}">
</move>
</target>
</configuration>
diff --git a/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE b/tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE
rename to tobago-theme/tobago-theme-roxborough/src/main/appended-resources/META-INF/NOTICE
diff --git a/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch b/tobago-theme/tobago-theme-roxborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
rename to tobago-theme/tobago-theme-roxborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css.map b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.css.map
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.css.map
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css.map b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/css/bootstrap.min.css.map
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/css/bootstrap.min.css.map
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.js b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.js
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.js
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.js
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.min.js b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/resources/tobago/richmond/tobago-bootstrap/_version/js/bootstrap.min.js
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/resources/tobago/roxborough/tobago-bootstrap/_version/js/bootstrap.min.js
diff --git a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
similarity index 79%
rename from tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
rename to tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
index 5c97bb6..10f3eb5 100644
--- a/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/tobago-config.xml
+++ b/tobago-theme/tobago-theme-roxborough/src/main/resources/META-INF/tobago-config.xml
@@ -22,7 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://myfaces.apache.org/tobago/tobago-config http://myfaces.apache.org/tobago/tobago-config-4.0.xsd"
version="4.0">
- <name>tobago-theme-richmond</name>
+ <name>tobago-theme-roxborough</name>
<ordering>
<after>
<name>tobago-theme-standard</name>
@@ -30,8 +30,8 @@
</ordering>
<theme-definitions>
<theme-definition>
- <name>richmond</name>
- <display-name>Richmond</display-name>
+ <name>roxborough</name>
+ <display-name>Roxborough</display-name>
<fallback>standard</fallback>
<versioned>true</versioned>
<resources production="true">
@@ -39,16 +39,16 @@
<script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
<style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</excludes>
- <script name="/tobago/richmond/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
- <style name="/tobago/richmond/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
+ <script name="/tobago/roxborough/tobago-bootstrap/${project.version}/js/bootstrap.min.js"/>
+ <style name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/bootstrap.min.css"/>
</resources>
<resources production="false">
<excludes>
<script name="/tobago/standard/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
<style name="/tobago/standard/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</excludes>
- <script name="/tobago/richmond/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
- <style name="/tobago/richmond/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
+ <script name="/tobago/roxborough/tobago-bootstrap/${project.version}/js/bootstrap.js"/>
+ <style name="/tobago/roxborough/tobago-bootstrap/${project.version}/css/bootstrap.css"/>
</resources>
</theme-definition>
</theme-definitions>
diff --git a/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss b/tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss
rename to tobago-theme/tobago-theme-roxborough/src/main/scss/_custom.scss
diff --git a/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-roxborough/src/main/scss/_tobago-theme.scss
similarity index 100%
rename from tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss
rename to tobago-theme/tobago-theme-roxborough/src/main/scss/_tobago-theme.scss
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.