Author: jablko
Date: Tue Sep 29 13:41:00 2009
New Revision: 3593
Log:
Change stylesheet positions to override YUI stylesheets -- force
Modified:
trunk/apps/qubit/config/view.yml
trunk/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php
trunk/plugins/sfAlouettePlugin/config/sfAlouettePluginConfiguration.class.php
trunk/plugins/sfColumbiaPlugin/config/sfColumbiaPluginConfiguration.class.php
trunk/web/css/form.css
trunk/web/css/main.css
Modified: trunk/apps/qubit/config/view.yml
==============================================================================
--- trunk/apps/qubit/config/view.yml Tue Sep 29 13:29:04 2009 (r3592)
+++ trunk/apps/qubit/config/view.yml Tue Sep 29 13:41:00 2009 (r3593)
@@ -17,11 +17,11 @@
/sfDrupalPlugin/vendor/drupal/themes/garland/print: { media: print,
position: first }
/vendor/yui/button/assets/skins/sam/button: { position: first }
/vendor/yui/menu/assets/skins/sam/menu: { position: first }
- form: { position: first }
- graphic: { position: first }
- layout: { position: first }
+ form:
+ graphic:
+ layout:
main: { position: last }
- menu: { position: first }
+ menu:
javascripts: [/vendor/jquery, /sfDrupalPlugin/vendor/drupal/misc/drupal,
qubit, /vendor/yui/yahoo-dom-event/yahoo-dom-event,
/vendor/yui/element/element-min, /vendor/yui/button/button-min,
/vendor/yui/container/container_core-min, /vendor/yui/menu/menu-min]
Modified: trunk/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php
==============================================================================
--- trunk/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php Tue Sep
29 13:29:04 2009 (r3592)
+++ trunk/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php Tue Sep
29 13:41:00 2009 (r3593)
@@ -261,7 +261,12 @@
foreach ((array) $assets as $key => $options)
{
$position = '';
- if (is_array($options))
+ if (is_string($options))
+ {
+ $key = $options;
+ $options = array();
+ }
+ else
{
if (isset($options['position']))
{
@@ -269,11 +274,6 @@
unset($options['position']);
}
}
- else
- {
- $key = $options;
- $options = array();
- }
if ('-*' == $key)
{
Modified:
trunk/plugins/sfAlouettePlugin/config/sfAlouettePluginConfiguration.class.php
==============================================================================
---
trunk/plugins/sfAlouettePlugin/config/sfAlouettePluginConfiguration.class.php
Tue Sep 29 13:29:04 2009 (r3592)
+++
trunk/plugins/sfAlouettePlugin/config/sfAlouettePluginConfiguration.class.php
Tue Sep 29 13:41:00 2009 (r3593)
@@ -32,7 +32,7 @@
{
$context = $event->getSubject();
- $context->getResponse()->addStylesheet('/sfAlouettePlugin/css/style.css');
+ $context->response->addStylesheet('/sfAlouettePlugin/css/style', 'last');
}
/**
Modified:
trunk/plugins/sfColumbiaPlugin/config/sfColumbiaPluginConfiguration.class.php
==============================================================================
---
trunk/plugins/sfColumbiaPlugin/config/sfColumbiaPluginConfiguration.class.php
Tue Sep 29 13:29:04 2009 (r3592)
+++
trunk/plugins/sfColumbiaPlugin/config/sfColumbiaPluginConfiguration.class.php
Tue Sep 29 13:41:00 2009 (r3593)
@@ -32,7 +32,7 @@
{
$context = $event->getSubject();
- $context->getResponse()->addStylesheet('/sfColumbiaPlugin/css/style.css');
+ $context->response->addStylesheet('/sfColumbiaPlugin/css/style', 'last');
}
/**
Modified: trunk/web/css/form.css
==============================================================================
--- trunk/web/css/form.css Tue Sep 29 13:29:04 2009 (r3592)
+++ trunk/web/css/form.css Tue Sep 29 13:41:00 2009 (r3593)
@@ -18,7 +18,7 @@
border: 0;
}
-form input
+form input, .yui-skin-sam .yui-ac-input
{
width: 95%;
padding: 0 3px 3px 3px;
Modified: trunk/web/css/main.css
==============================================================================
--- trunk/web/css/main.css Tue Sep 29 13:29:04 2009 (r3592)
+++ trunk/web/css/main.css Tue Sep 29 13:41:00 2009 (r3593)
@@ -169,5 +169,4 @@
.yui-skin-sam .yui-ac-input
{
position: static;
- width: 95%;
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
