Author: sevein
Date: Wed Aug 24 18:32:32 2011
New Revision: 9598
Log:
More changes in Trillium
Deleted:
trunk/plugins/qtTrilliumPlugin/modules/search/
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
trunk/plugins/qtTrilliumPlugin/css/header.css
trunk/plugins/qtTrilliumPlugin/css/main.css
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified:
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
==============================================================================
---
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Wed Aug 24 18:30:49 2011 (r9597)
+++
trunk/plugins/qtTrilliumPlugin/config/qtTrilliumPluginConfiguration.class.php
Wed Aug 24 18:32:32 2011 (r9598)
@@ -27,14 +27,15 @@
{
$context = $event->getSubject();
- $context->response->addStylesheet('/plugins/sfClassicPlugin/css/main',
'last', array('media' => 'all'));
+ // $context->response->addStylesheet('/plugins/sfClassicPlugin/css/main',
'last', array('media' => 'all'));
// $context->response->addStylesheet('/plugins/sfCaribouPlugin/css/style',
'last', array('media' => 'all'));
// $context->response->addStylesheet('/plugins/sfCaribouPlugin/css/print',
'last', array('media' => 'print'));
//
$context->response->addStylesheet('/plugins/sfCaribouPlugin/css/print-ie',
'last', array('condition' => 'IE', 'media' => 'print'));
//
$context->response->addJavaScript('/plugins/sfCaribouPlugin/js/navigation',
'last');
+
$context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/main',
'last', array('media' => 'all'));
$context->response->addStylesheet('/plugins/qtTrilliumPlugin/css/header',
'last', array('media' => 'all'));
- }
+ }
public function initialize()
{
Modified: trunk/plugins/qtTrilliumPlugin/css/header.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/header.css Wed Aug 24 18:30:49
2011 (r9597)
+++ trunk/plugins/qtTrilliumPlugin/css/header.css Wed Aug 24 18:32:32
2011 (r9598)
@@ -50,6 +50,7 @@
#logo {
position: relative;
float: left;
+ margin-right: 4px;
}
#logo > img {
@@ -68,18 +69,21 @@
#name-and-slogan > #site-name > a {
float: left;
display: block;
- padding: 8px 20px 12px;
- margin-left: -10px;
color: #ffffff;
font-size: 20px;
- font-weight: 200;
- line-height: 1;
+ line-height: 40px;
+ font-weight: normal;
}
#name-and-slogan > #site-slogan {
display: none;
}
+#logo a:hover,
+#name-and-slogan a:hover {
+ background-color: transparent;
+}
+
/* Search */
#header .search {
@@ -151,19 +155,7 @@
}
#header .search > .content > form > input[type=submit] {
- border: 0;
- margin: 0;
- position: absolute;
- cursor: pointer;
- display: block;
- top: 7px;
- right: 8px;
- background-image:
url(http://a1.twimg.com/a/1314204713/phoenix/img/sprite-icons.png);
- background-position: -224px -96px;
- background-color: transparent;
- width: 14px;
- height: 14px;
- font-size: 0;
+ display: none;
}
/* Menu */
Modified: trunk/plugins/qtTrilliumPlugin/css/main.css
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 24 18:30:49 2011
(r9597)
+++ trunk/plugins/qtTrilliumPlugin/css/main.css Wed Aug 24 18:32:32 2011
(r9598)
@@ -1,3 +1,25 @@
-#page-wrapper {
- margin-top: 0;
+html, body {
+ background-color: #fff;
+}
+
+body {
+ margin: 0;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-size: 13px;
+ font-weight: normal;
+ line-height: 18px;
+ color: #808080;
+ text-rendering: optimizeLegibility;
+}
+
+a {
+ color: #0069d6;
+ text-decoration: none;
+ line-height: inherit;
+ font-weight: inherit;
+}
+
+a:hover {
+ color: #0050a3;
+ text-decoration: underline;
}
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Wed Aug 24
18:30:49 2011 (r9597)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Wed Aug 24
18:32:32 2011 (r9598)
@@ -7,7 +7,7 @@
// Dropdown example for topbar nav
// ===============================
- $('body').bind('click', function (e)
+ $(document.body).bind('click', function (e)
{
$('a.menu').parent('li').removeClass("open");
});
@@ -15,6 +15,7 @@
$('a.menu').click(function (e)
{
var $li = $(this).parent("li").toggleClass('open');
+
return false;
});
@@ -50,8 +51,6 @@
<ul>
- <li><?php echo link_to(__('Home'), array('module' => 'staticpage'))
?></a></li>
-
<li class="menu">
<?php echo get_component('menu', 'browseMenu', array('sf_cache_key'
=> 'settings')) ?>
</li>
@@ -91,7 +90,7 @@
</ul>
</li>
<?php else: ?>
- <li><?php echo link_to(__('Log in'), array('module' => 'user',
'action' => 'login')) ?></li>
+ <li><?php echo link_to('<strong>'.__('Log in').'</strong>',
array('module' => 'user', 'action' => 'login')) ?></li>
<?php endif; ?>
</ul>
--
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.com/group/qubit-commits?hl=en.
