[Rt-commit] rt branch, 4.0-trunk, updated. rt-4.0.0rc4-40-gdd5310d

[Alex Vandiver]

The branch, 4.0-trunk has been updated
       via  dd5310de7ad5db58e84bfbcb67d2f9d1fe9d379d (commit)
       via  4c1fd8d44dc9e8de5cb835fb82619e9196a44895 (commit)
      from  45e9c282733f23f473eeaa489c9551e39d02772c (commit)

Summary of changes:
 share/html/Admin/Global/Theme.html              |    3 +--
 share/html/NoAuth/css/{ => base}/farbtastic.css |    0
 share/html/NoAuth/css/base/main.css             |    1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename share/html/NoAuth/css/{ => base}/farbtastic.css (100%)

- Log -----------------------------------------------------------------
commit 4c1fd8d44dc9e8de5cb835fb82619e9196a44895
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Fri Jan 28 12:50:15 2011 -0500

    Push farbtastic css into css/base.

diff --git a/share/html/Admin/Global/Theme.html b/share/html/Admin/Global/Theme.html
index ce50d2c..9b1628a 100644
--- a/share/html/Admin/Global/Theme.html
+++ b/share/html/Admin/Global/Theme.html
@@ -47,8 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header,
     Title => loc("Theme"),
-    LinkRel => { stylesheet => '/NoAuth/css/farbtastic.css' }
-    &>
+&>
 <& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
diff --git a/share/html/NoAuth/css/farbtastic.css b/share/html/NoAuth/css/base/farbtastic.css
similarity index 100%
rename from share/html/NoAuth/css/farbtastic.css
rename to share/html/NoAuth/css/base/farbtastic.css
diff --git a/share/html/NoAuth/css/base/main.css b/share/html/NoAuth/css/base/main.css
index 09bd68b..ba06ea4 100644
--- a/share/html/NoAuth/css/base/main.css
+++ b/share/html/NoAuth/css/base/main.css
@@ -53,6 +53,7 @@
 @import "superfish-navbar.css";
 @import "superfish-vertical.css";
 @import "tablesorter.css";
+ at import "farbtastic.css";
 @import "collection.css";
 @import "forms.css";
 @import "misc.css";

commit dd5310de7ad5db58e84bfbcb67d2f9d1fe9d379d
Merge: 45e9c28 4c1fd8d
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Feb 8 16:42:09 2011 -0500

    Merge branch '4.0/farbtastic-to-base' into 4.0-trunk


-----------------------------------------------------------------------