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/03/17 15:10:06 UTC
svn commit: r1787403 - in /myfaces/tobago/trunk:
tobago-core/src/main/resources/scss/ tobago-theme/
tobago-theme/tobago-theme-charlotteville/src/main/patches/
tobago-theme/tobago-theme-charlotteville/src/main/scss/
tobago-theme/tobago-theme-richmond/sr...
Author: lofwyr
Date: Fri Mar 17 15:10:06 2017
New Revision: 1787403
URL: http://svn.apache.org/viewvc?rev=1787403&view=rev
Log:
TOBAGO-1722: Theme builder should be optimized: _tobago.scss should use SCSS variables from Bootstrap
Added:
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_tobago-theme.scss
- copied, changed from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss
- copied, changed from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss
- copied, changed from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss
- copied, changed from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss
- copied, changed from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
Modified:
myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss
myfaces/tobago/trunk/tobago-theme/pom.xml
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
Modified: myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/resources/scss/_tobago.scss Fri Mar 17 15:10:06 2017
@@ -16,6 +16,12 @@
*/
/*
+used variables: only for the IDE, should not really used by the build system.
+*/
+$brand-info: #00f !default;
+
+
+/*
Todo: check, if this is needed? (It doesn't work with the build system)
.tobago-file-real {
@@ -915,21 +921,21 @@ fixme: there is a problem with the selec
.tobago-has-info .form-check-label,
.tobago-has-info .form-check-inline,
.tobago-has-info .custom-control {
- color: #5bc0de;
+ color: $brand-info;
}
.tobago-has-info .form-control {
- border-color: #5bc0de;
+ border-color: $brand-info;
}
.tobago-has-info .input-group-addon {
- color: #5bc0de;
+ color: $brand-info;
background-color: #eaf6ea;
- border-color: #5bc0de;
+ border-color: $brand-info;
}
.tobago-has-info .form-control-feedback {
- color: #5bc0de;
+ color: $brand-info;
}
.tobago-has-info .form-control-success {
Modified: myfaces/tobago/trunk/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/pom.xml?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-theme/pom.xml Fri Mar 17 15:10:06 2017
@@ -82,7 +82,7 @@
<executions>
<execution>
<!--load Bootstrap sources via git to target/checkout -->
- <id>step #1: copy-bootstrap</id>
+ <id>step #1: checkout-bootstrap</id>
<phase>generate-resources</phase>
<goals>
<goal>checkout</goal>
@@ -139,7 +139,7 @@
</execution>
<execution>
<!-- copy the result to target/classes -->
- <id>step #9: copy-bootstrap-dist</id>
+ <id>step #10: copy-bootstrap-dist</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
@@ -166,12 +166,33 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-patch-plugin</artifactId>
+ <version>1.2</version>
+ <configuration>
+ <patches>
+ <patch>append-tobago-theme-to-bootstrap.patch</patch>
+ </patches>
+ <targetDirectory>${project.build.directory}/bootstrap</targetDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <!-- copy the result to target/classes -->
+ <id>step #4: append-tobago-theme-to-bootstrap</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>apply</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<!-- copy customization to target/bootstrap -->
- <id>step #4: unpack-custom</id>
+ <id>step #5: unpack-custom</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
@@ -211,7 +232,7 @@
<execution>
<!-- install "node" and "npm" -->
- <id>step #5: install node and npm</id>
+ <id>step #6: install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
@@ -220,7 +241,7 @@
<execution>
<!-- install "grunt-cli" -->
- <id>step #6: npm install grunt-cli</id>
+ <id>step #7: npm install grunt-cli</id>
<goals>
<goal>npm</goal>
</goals>
@@ -232,7 +253,7 @@
<execution>
<!-- install all other required stuff for "bootstrap" -->
- <id>step #7: npm install</id>
+ <id>step #8: npm install</id>
<goals>
<goal>npm</goal>
</goals>
@@ -244,7 +265,7 @@
<execution>
<!-- build "bootstrap" with "grunt" -->
- <id>step #8: grunt build</id>
+ <id>step #9: grunt build</id>
<goals>
<goal>grunt</goal>
</goals>
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch?rev=1787403&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch Fri Mar 17 15:10:06 2017
@@ -0,0 +1,13 @@
+Index: scss/bootstrap.scss
+Info: This patch is valid for Bootstrap 4 alpha 5
+<+>UTF-8
+===================================================================
+--- scss/bootstrap.scss
++++ scss/bootstrap.scss
+@@ -52,3 +52,6 @@
+
+ // Utility classes
+ @import "utilities";
++
++// Tobago
++@import "tobago-theme";
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_custom.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_custom.scss?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_custom.scss Fri Mar 17 15:10:06 2017
@@ -21,6 +21,3 @@
// without modifying source files.
$body-bg: #ffeecf !default;
-
-// todo: get this from the JAR
-@import "tobago";
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_tobago-theme.scss (from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_tobago-theme.scss?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_tobago-theme.scss&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss&r1=1787304&r2=1787403&rev=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/scss/_tobago-theme.scss Fri Mar 17 15:10:06 2017
@@ -15,5 +15,8 @@
* limitations under the License.
*/
+// add here code to include after bootstrap
+// usually the _tobago.scss file
+
@import "tobago";
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch?rev=1787403&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch Fri Mar 17 15:10:06 2017
@@ -0,0 +1,13 @@
+Index: scss/bootstrap.scss
+Info: This patch is valid for Bootstrap 4 alpha 5
+<+>UTF-8
+===================================================================
+--- scss/bootstrap.scss
++++ scss/bootstrap.scss
+@@ -52,3 +52,6 @@
+
+ // Utility classes
+ @import "utilities";
++
++// Tobago
++@import "tobago-theme";
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_custom.scss Fri Mar 17 15:10:06 2017
@@ -28,6 +28,3 @@ $brand-danger: #ffa9a9 !def
$body-bg: #eceeef !default;
$body-color: #5facff !default;
-
-// todo: get this from the JAR
-@import "tobago";
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss (from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss&r1=1787304&r2=1787403&rev=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/scss/_tobago-theme.scss Fri Mar 17 15:10:06 2017
@@ -15,5 +15,8 @@
* limitations under the License.
*/
+// add here code to include after bootstrap
+// usually the _tobago.scss file
+
@import "tobago";
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch?rev=1787403&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch Fri Mar 17 15:10:06 2017
@@ -0,0 +1,13 @@
+Index: scss/bootstrap.scss
+Info: This patch is valid for Bootstrap 4 alpha 5
+<+>UTF-8
+===================================================================
+--- scss/bootstrap.scss
++++ scss/bootstrap.scss
+@@ -52,3 +52,6 @@
+
+ // Utility classes
+ @import "utilities";
++
++// Tobago
++@import "tobago-theme";
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_custom.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_custom.scss?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_custom.scss Fri Mar 17 15:10:06 2017
@@ -21,6 +21,3 @@
// without modifying source files.
$body-bg: #bbccdd !default;
-
-// todo: get this from the JAR
-@import "tobago";
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss (from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss&r1=1787304&r2=1787403&rev=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/scss/_tobago-theme.scss Fri Mar 17 15:10:06 2017
@@ -15,5 +15,8 @@
* limitations under the License.
*/
+// add here code to include after bootstrap
+// usually the _tobago.scss file
+
@import "tobago";
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch?rev=1787403&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch Fri Mar 17 15:10:06 2017
@@ -0,0 +1,13 @@
+Index: scss/bootstrap.scss
+Info: This patch is valid for Bootstrap 4 alpha 5
+<+>UTF-8
+===================================================================
+--- scss/bootstrap.scss
++++ scss/bootstrap.scss
+@@ -52,3 +52,6 @@
+
+ // Utility classes
+ @import "utilities";
++
++// Tobago
++@import "tobago-theme";
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss Fri Mar 17 15:10:06 2017
@@ -21,6 +21,3 @@
// without modifying source files.
$body-bg: #e2e2e2 !default;
-
-// todo: get this from the JAR
-@import "tobago";
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss (from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss&r1=1787304&r2=1787403&rev=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_tobago-theme.scss Fri Mar 17 15:10:06 2017
@@ -15,5 +15,8 @@
* limitations under the License.
*/
+// add here code to include after bootstrap
+// usually the _tobago.scss file
+
@import "tobago";
Added: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch?rev=1787403&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch (added)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch Fri Mar 17 15:10:06 2017
@@ -0,0 +1,13 @@
+Index: scss/bootstrap.scss
+Info: This patch is valid for Bootstrap 4 alpha 5
+<+>UTF-8
+===================================================================
+--- scss/bootstrap.scss
++++ scss/bootstrap.scss
+@@ -52,3 +52,6 @@
+
+ // Utility classes
+ @import "utilities";
++
++// Tobago
++@import "tobago-theme";
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss?rev=1787403&r1=1787402&r2=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss Fri Mar 17 15:10:06 2017
@@ -15,5 +15,4 @@
* limitations under the License.
*/
-@import "tobago";
-
+// define variables here
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss (from r1787304, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss&r1=1787304&r2=1787403&rev=1787403&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_tobago-theme.scss Fri Mar 17 15:10:06 2017
@@ -15,5 +15,8 @@
* limitations under the License.
*/
+// add here code to include after bootstrap
+// usually the _tobago.scss file
+
@import "tobago";