This doesn't look right since it contains lots of duplications...
Maybe you could introduce a css file other than style.css that
contains all the imports?
Thanks
-Vincent
On Jul 21, 2008, at 1:08 PM, jvdrean (SVN) wrote:
Author: jvdrean
Date: 2008-07-21 13:08:37 +0200 (Mon, 21 Jul 2008)
New Revision: 11397
Modified:
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
black.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
blue.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
darkblue.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
darkgray.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
gray.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
green.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
kaki.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
orange.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
purple.css
xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/style-
red.css
Log:
XSTOUCAN-41 : When using style-*.css, stylesheets included with
@import in style.css are ignored
Replaced style.css import by style.css content itself in style-*.css.
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-black.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-black.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-black.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/black.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-blue.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-blue.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-blue.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/blue.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-darkblue.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-darkblue.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-darkblue.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/darkblue.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-darkgray.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-darkgray.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-darkgray.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/darkgray.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-gray.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-gray.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-gray.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/gray.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-green.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-green.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-green.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/green.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-kaki.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-kaki.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-kaki.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/kaki.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-orange.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-orange.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-orange.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/orange.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-purple.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-purple.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-purple.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/purple.css";
Modified: xwiki-platform/skins/trunk/toucan/src/main/resources/
toucan/style-red.css
===================================================================
--- xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-red.css 2008-07-21 11:04:54 UTC (rev 11396)
+++ xwiki-platform/skins/trunk/toucan/src/main/resources/toucan/
style-red.css 2008-07-21 11:08:37 UTC (rev 11397)
@@ -1,2 +1,8 @@
-@import "style.css";
+@import "microformats.css";
+@import "fullscreenEdit.css";
+@import "css/table/table.css";
+@import "usersandgroups.css";
+@import "suggest/ajaxSuggest.css";
+@import "rss.css";
+@import "toucan.css";
@import "css/colors/red.css";