Author: sevein
Date: Fri Sep 9 15:55:07 2011
New Revision: 9694
Log:
New changes in the header
Modified:
trunk/plugins/qtTrilliumPlugin/css/less/_header.less
trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less
trunk/plugins/qtTrilliumPlugin/templates/_header.php
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_header.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_header.less Fri Sep 9
15:19:29 2011 (r9693)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_header.less Fri Sep 9
15:55:07 2011 (r9694)
@@ -11,79 +11,63 @@
> #first-level {
- height: 40px;
+ height: 30px;
background: #222;
#gradient > .vertical(#222, #444);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
- #name-and-slogan {
-
- float: left;
- margin-left: 20px;
+ }
- #site-name {
+ > #second-level {
- line-height: 20px;
+ height: 72px;
+ #gradient > .vertical(#fff, #f4f4f4);
+ @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+ .box-shadow(@shadow);
+ border-bottom: 1px solid #666;
- > a {
+ > div {
+
+ .clearfix();
- float: left;
- display: block;
- padding: 8px 20px 12px;
- margin-left: -20px; // negative indent to left-align the text down
the page
- color: @white;
- font-size: 20px;
- font-weight: 200;
- line-height: 1;
+ > #logo-name-and-slogan {
- &:hover {
+ width: 280px;
+ height: 72px;
+ float: left;
+ background-color: #eee;
+ text-align: center;
- text-decoration: none;
+ * {
- }
+ display: inline;
}
- }
-
- /*
- * qtTrilliumPlugin does not show the site description anywhere
- */
-
- #site-slogan {
-
- display: none;
+ > #logo {
- }
+ clear: both;
- }
+ img {
- }
+ height: 50%;
- > #second-level {
+ }
- height: 72px;
- #gradient > .vertical(#fff, #f4f4f4);
- @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
- .box-shadow(@shadow);
- border-bottom: 1px solid #666;
+ }
- > div {
+ > #name-and-slogan {
- .clearfix();
+ > #site-name {
- > #logo {
+ }
- float: left;
- margin: 12px 0 0 40px;
-
+ > #site-slogan {
- > img {
+ display: none;
- display: block;
- height: 48px;
- margin: 0 auto;
+ }
}
@@ -109,7 +93,7 @@
background-color: #fff;
#font > .sans-serif(normal, 14px, 1);
- width: 525px;
+ width: 480px;
padding: 6px 9px;
color: @gray;
border: 1px solid @grayLight;
@@ -230,7 +214,7 @@
display: block;
float: none;
- padding: 10px 10px 11px;
+ padding: 5px 10px 6px;
line-height: 19px;
text-decoration: none;
color: @grayLight;
@@ -301,7 +285,7 @@
display: none;
position: absolute;
z-index: 1;
- top: 40px;
+ top: 30px;
min-width: 160px;
max-width: 220px;
margin-left: 0px;
Modified: trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less Fri Sep 9
15:19:29 2011 (r9693)
+++ trunk/plugins/qtTrilliumPlugin/css/less/_scaffolding.less Fri Sep 9
15:55:07 2011 (r9694)
@@ -1,6 +1,6 @@
#page-wrapper {
- margin-top: 113px;
+ margin-top: 103px;
#page {
Modified: trunk/plugins/qtTrilliumPlugin/templates/_header.php
==============================================================================
--- trunk/plugins/qtTrilliumPlugin/templates/_header.php Fri Sep 9
15:19:29 2011 (r9693)
+++ trunk/plugins/qtTrilliumPlugin/templates/_header.php Fri Sep 9
15:55:07 2011 (r9694)
@@ -6,24 +6,6 @@
<div>
- <?php if (sfConfig::get('app_toggleTitle') ||
sfConfig::get('app_toggleDescription')): ?>
- <div id="name-and-slogan">
-
- <?php if (sfConfig::get('app_toggleTitle')): ?>
- <h1 id="site-name">
- <?php echo
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
- </h1>
- <?php endif; ?>
-
- <?php if (sfConfig::get('app_toggleDescription')): ?>
- <div id="site-slogan">
- <?php echo sfConfig::get('app_siteDescription') ?>
- </div>
- <?php endif; ?>
-
- </div>
- <?php endif; ?>
-
<?php if ($sf_user->isAuthenticated()): ?>
<ul>
<?php echo get_component('menu', 'mainMenu', array('sf_cache_key'
=> 'settings')) ?>
@@ -67,9 +49,31 @@
<div id="second-level">
<div>
- <?php if (sfConfig::get('app_toggleLogo')): ?>
- <?php echo link_to(image_tag('logo', array('alt' => __('Home'))),
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
- <?php endif; ?>
+ <div id="logo-name-and-slogan">
+
+ <?php if (sfConfig::get('app_toggleLogo')): ?>
+ <?php echo link_to(image_tag('logo', array('alt' => __('Home'))),
'@homepage', array('id' => 'logo', 'rel' => 'home', 'title' => __('Home'))) ?>
+ <?php endif; ?>
+
+ <?php if (sfConfig::get('app_toggleTitle') ||
sfConfig::get('app_toggleDescription')): ?>
+ <div id="name-and-slogan">
+
+ <?php if (sfConfig::get('app_toggleTitle')): ?>
+ <h1 id="site-name">
+ <?php echo
link_to('<span>'.sfConfig::get('app_siteTitle').'</span>', '@homepage',
array('rel' => 'home', 'title' => __('Home'))) ?>
+ </h1>
+ <?php endif; ?>
+
+ <?php if (sfConfig::get('app_toggleDescription')): ?>
+ <div id="site-slogan">
+ <?php echo sfConfig::get('app_siteDescription') ?>
+ </div>
+ <?php endif; ?>
+
+ </div>
+ <?php endif; ?>
+
+ </div>
<?php echo get_component('search', 'box') ?>
--
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.
