You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/11/16 10:01:56 UTC
[myfaces-tobago] 01/02: TOBAGO-1825 Plain bootstrap for 'Standard'
theme,
'Scarborough' is the new default. * scarborough as default theme * create
plain bootstrap standard theme
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 1f38c9283d8f4666161d4360787e9285d0fd98e0
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Nov 16 11:00:59 2017 +0100
TOBAGO-1825 Plain bootstrap for 'Standard' theme, 'Scarborough' is the new default.
* scarborough as default theme
* create plain bootstrap standard theme
---
tobago-example/pom.xml | 2 --
.../tobago-example-demo/src/main/webapp/WEB-INF/tobago-config.xml | 4 ++--
tobago-theme/pom.xml | 1 +
.../tobago-theme-scarborough/src/main/scss/_tobago-theme.scss | 7 +++++++
.../tobago-theme-standard/src/main/scss/_tobago-theme.scss | 7 -------
5 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 7933a31..ec6f8ee 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -136,13 +136,11 @@
<artifactId>tobago-theme-roxborough</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
</dependency>
--->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
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 06f2075..2639de5 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
@@ -33,10 +33,10 @@
<!-- using all available themes, if this is not set -->
<theme-config>
- <default-theme>standard</default-theme>
+ <default-theme>scarborough</default-theme>
+ <supported-theme>standard</supported-theme>
<supported-theme>speyside</supported-theme>
<!-- TODO: Can be removed after closing TOBAGO-1664 -->
- <!--<supported-theme>scarborough</supported-theme>-->
<supported-theme>roxborough</supported-theme>
<!--<supported-theme>charlotteville</supported-theme>-->
</theme-config>
diff --git a/tobago-theme/pom.xml b/tobago-theme/pom.xml
index 51bdf86..ad6e4f9 100644
--- a/tobago-theme/pom.xml
+++ b/tobago-theme/pom.xml
@@ -68,6 +68,7 @@
<modules>
<module>tobago-theme-standard</module>
+ <module>tobago-theme-scarborough</module>
<module>tobago-theme-speyside</module>
<module>tobago-theme-roxborough</module>
</modules>
diff --git a/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
index 270a84b..882905e 100644
--- a/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
+++ b/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
@@ -18,5 +18,12 @@
// add here code to include after bootstrap
// usually the _tobago.scss file
+$white: #fff !default;
+$gray-400: #ced4da !default;
+
+.btn-secondary {
+ @include button-variant($white, $gray-400);
+}
+
@import "tobago";
diff --git a/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss b/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
index 882905e..270a84b 100644
--- a/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
+++ b/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
@@ -18,12 +18,5 @@
// add here code to include after bootstrap
// usually the _tobago.scss file
-$white: #fff !default;
-$gray-400: #ced4da !default;
-
-.btn-secondary {
- @include button-variant($white, $gray-400);
-}
-
@import "tobago";
--
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.