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/09/06 13:09:56 UTC
svn commit: r1807479 - in /myfaces/tobago/trunk/tobago-theme:
tobago-theme-charlotteville/src/main/patches/
tobago-theme-charlotteville/src/main/scss/
tobago-theme-richmond/src/main/patches/
tobago-theme-richmond/src/main/scss/ tobago-theme-scarborough...
Author: hnoeth
Date: Wed Sep 6 13:09:56 2017
New Revision: 1807479
URL: http://svn.apache.org/viewvc?rev=1807479&view=rev
Log:
TOBAGO-1759 Update Bootstrap to 4.0.0 beta 1 (from alpha 6)
* a _custom.scss must be provided by themes (could be empty);
* _custom.scss is now added to bootstrap.scss for theme creation
Added:
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss
- copied, changed from r1807443, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss
Modified:
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/_custom.scss
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/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch
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/_custom.scss
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch
Modified: 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=1807479&r1=1807478&r2=1807479&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/patches/append-tobago-theme-to-bootstrap.patch Wed Sep 6 13:09:56 2017
@@ -1,12 +1,22 @@
Index: scss/bootstrap.scss
-Info: This patch is valid for Bootstrap 4 alpha 5
+Info: This patch is valid for Bootstrap 4 beta
<+>UTF-8
===================================================================
--- scss/bootstrap.scss
+++ scss/bootstrap.scss
-@@ -52,3 +52,6 @@
-
- // Utility classes
+@@ -8,6 +8,9 @@
+ @import "functions";
+ @import "variables";
+ @import "mixins";
++
++@import "custom";
++
+ @import "print";
+ @import "reboot";
+ @import "type";
+@@ -39,3 +42,6 @@
+ @import "popover";
+ @import "carousel";
@import "utilities";
+
+// Tobago
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=1807479&r1=1807478&r2=1807479&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 Wed Sep 6 13:09:56 2017
@@ -20,4 +20,4 @@
// Copy variables from `_variables.scss` to this file to override default values
// without modifying source files.
-$body-bg: #ffeecf !default;
+$body-bg: #ffeecf;
Modified: 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=1807479&r1=1807478&r2=1807479&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/patches/append-tobago-theme-to-bootstrap.patch Wed Sep 6 13:09:56 2017
@@ -1,12 +1,22 @@
Index: scss/bootstrap.scss
-Info: This patch is valid for Bootstrap 4 alpha 5
+Info: This patch is valid for Bootstrap 4 beta
<+>UTF-8
===================================================================
--- scss/bootstrap.scss
+++ scss/bootstrap.scss
-@@ -52,3 +52,6 @@
-
- // Utility classes
+@@ -8,6 +8,9 @@
+ @import "functions";
+ @import "variables";
+ @import "mixins";
++
++@import "custom";
++
+ @import "print";
+ @import "reboot";
+ @import "type";
+@@ -39,3 +42,6 @@
+ @import "popover";
+ @import "carousel";
@import "utilities";
+
+// Tobago
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=1807479&r1=1807478&r2=1807479&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 Wed Sep 6 13:09:56 2017
@@ -20,11 +20,13 @@
// Copy variables from `_variables.scss` to this file to override default values
// without modifying source files.
-$brand-primary: #ffd080 !default;
-$brand-success: #bcf8ac !default;
-$brand-info: #00ffff !default;
-$brand-warning: #f0fd4e !default;
-$brand-danger: #ffa9a9 !default;
+$theme-colors: (
+ primary: #ffd080,
+ success: #bcf8ac,
+ info: #00ffff,
+ warning: #f0fd4e,
+ danger: #ffa9a9
+);
-$body-bg: #eceeef !default;
-$body-color: #5facff !default;
+$body-bg: #eceeef;
+$body-color: #5facff;
Modified: 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=1807479&r1=1807478&r2=1807479&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/patches/append-tobago-theme-to-bootstrap.patch Wed Sep 6 13:09:56 2017
@@ -1,12 +1,22 @@
Index: scss/bootstrap.scss
-Info: This patch is valid for Bootstrap 4 alpha 5
+Info: This patch is valid for Bootstrap 4 beta
<+>UTF-8
===================================================================
--- scss/bootstrap.scss
+++ scss/bootstrap.scss
-@@ -52,3 +52,6 @@
-
- // Utility classes
+@@ -8,6 +8,9 @@
+ @import "functions";
+ @import "variables";
+ @import "mixins";
++
++@import "custom";
++
+ @import "print";
+ @import "reboot";
+ @import "type";
+@@ -39,3 +42,6 @@
+ @import "popover";
+ @import "carousel";
@import "utilities";
+
+// Tobago
Modified: 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=1807479&r1=1807478&r2=1807479&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/patches/append-tobago-theme-to-bootstrap.patch Wed Sep 6 13:09:56 2017
@@ -1,12 +1,22 @@
Index: scss/bootstrap.scss
-Info: This patch is valid for Bootstrap 4 alpha 5
+Info: This patch is valid for Bootstrap 4 beta
<+>UTF-8
===================================================================
--- scss/bootstrap.scss
+++ scss/bootstrap.scss
-@@ -52,3 +52,6 @@
-
- // Utility classes
+@@ -8,6 +8,9 @@
+ @import "functions";
+ @import "variables";
+ @import "mixins";
++
++@import "custom";
++
+ @import "print";
+ @import "reboot";
+ @import "type";
+@@ -39,3 +42,6 @@
+ @import "popover";
+ @import "carousel";
@import "utilities";
+
+// Tobago
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=1807479&r1=1807478&r2=1807479&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 Wed Sep 6 13:09:56 2017
@@ -20,4 +20,4 @@
// Copy variables from `_variables.scss` to this file to override default values
// without modifying source files.
-$body-bg: #e2e2e2 !default;
+$body-bg: #e2e2e2;
Modified: 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=1807479&r1=1807478&r2=1807479&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/patches/append-tobago-theme-to-bootstrap.patch Wed Sep 6 13:09:56 2017
@@ -1,10 +1,20 @@
Index: scss/bootstrap.scss
-Info: This patch is valid for Bootstrap 4 alpha 5
+Info: This patch is valid for Bootstrap 4 beta
<+>UTF-8
===================================================================
--- scss/bootstrap.scss
+++ scss/bootstrap.scss
-@@ -39,3 +39,6 @@
+@@ -8,6 +8,9 @@
+ @import "functions";
+ @import "variables";
+ @import "mixins";
++
++@import "custom";
++
+ @import "print";
+ @import "reboot";
+ @import "type";
+@@ -39,3 +42,6 @@
@import "popover";
@import "carousel";
@import "utilities";
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss (from r1807443, 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-standard/src/main/scss/_custom.scss?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss&r1=1807443&r2=1807479&rev=1807479&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/scss/_custom.scss (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/scss/_custom.scss Wed Sep 6 13:09:56 2017
@@ -19,5 +19,3 @@
//
// Copy variables from `_variables.scss` to this file to override default values
// without modifying source files.
-
-$body-bg: #e2e2e2 !default;