Author: david
Date: 2008-11-21 16:48:07 -0800 (Fri, 21 Nov 2008)
New Revision: 1616
Modified:
branches/ica-atom/apps/qubit/templates/layout.php
branches/ica-atom/web/css/graphic.css
branches/ica-atom/web/css/layout.css
Log:
Update css and page template for ica-atom to get site title and description to
display in a way that doesn't break the page layout.
Modified: branches/ica-atom/apps/qubit/templates/layout.php
===================================================================
--- branches/ica-atom/apps/qubit/templates/layout.php 2008-11-21 20:41:25 UTC
(rev 1615)
+++ branches/ica-atom/apps/qubit/templates/layout.php 2008-11-22 00:48:07 UTC
(rev 1616)
@@ -36,19 +36,18 @@
</div> <!--close header-top -->
<div id="header-middle">
+
+<div id="logo"><?php echo link_to(image_tag('logo',
+ array('alt' => sfConfig::get('app_name', 'ICA-AtoM'))), array('module' =>
'staticpage', 'action' => 'static', 'permalink' => 'homepage')) ?></div>
+
<?php if (strlen(sfConfig::get('app_site_information_site_title'))): ?>
-<div id="website-name">
- <?php echo link_to(__(sfConfig::get('app_site_information_site_title')),
'/homepage/') ?>
-</div>
+<h1 id="website-name"><?php echo
link_to(__(sfConfig::get('app_site_information_site_title')), '/homepage/')
?></h1>
<?php endif; ?>
<?php if (strlen(sfConfig::get('app_site_information_site_description'))): ?>
-<div id="website-description">
- <?php echo __(sfConfig::get('app_site_information_site_description')); ?>
-</div>
+<h2 id="website-description"><?php echo
__(sfConfig::get('app_site_information_site_description')); ?></h2>
<?php endif; ?>
-<div id="logo"><?php echo link_to(image_tag('logo', array('alt' =>
sfConfig::get('app_name', 'ICA-AtoM'))), array('module' => 'staticpage',
'action' => 'static', 'permalink' => 'homepage')) ?></div>
</div> <!-- close header-middle -->
<div id="header-bottom">
Modified: branches/ica-atom/web/css/graphic.css
===================================================================
--- branches/ica-atom/web/css/graphic.css 2008-11-21 20:41:25 UTC (rev
1615)
+++ branches/ica-atom/web/css/graphic.css 2008-11-22 00:48:07 UTC (rev
1616)
@@ -10,45 +10,51 @@
/*********************************************************
WEBSITE NAME & LOGO
**********************************************************/
+
+
#website-name {
- font: bold 64px/ 78px verdana, georgia, garamond, serif;
+ font: bold 64px/78px verdana, georgia, garamond, serif;
letter-spacing: -0.1ex;
color: #FC6E3C;
- border: 0;
- margin-bottom: 3px;
- text-align: left;
- float: left;
+ background-color: white;
+ border: none;
+ margin: 0px;
}
-#website-name a:hover,#website-name a:link,#website-name
a:visited,#website-name a:active
- {
+#website-name a:hover,
+#website-name a:link,
+#website-name a:visited,
+#website-name a:active
+{
text-decoration: none;
- border: 0;
color: #FC6E3C;
- background-color: transparent;
}
#website-description {
color: #04025C;
font: bold 15px/ 16px georgia, garamond, serif;
- margin: 75px 0 0 0;
- padding: 0;
+ margin-top: 0px;
+ margin-bottom: 3px;
+ clear: both;
+ padding: 0px 3px;
text-align: left;
- float: right;
}
-#logo a:hover,#logo a:link,#logo a:visited,#logo a:active {
+#logo,
+#logo a:hover,
+#logo a:link,
+#logo a:visited,
+#logo a:active {
border: 0;
color: #ffffff;
background-color: transparent;
text-decoration: none;
padding: 0;
margin: 0;
-float: right;
+ float: right;
}
#logo img {
- margin: 0 0 0 20px;
}
/*********************************************************
Modified: branches/ica-atom/web/css/layout.css
===================================================================
--- branches/ica-atom/web/css/layout.css 2008-11-21 20:41:25 UTC (rev
1615)
+++ branches/ica-atom/web/css/layout.css 2008-11-22 00:48:07 UTC (rev
1616)
@@ -121,14 +121,13 @@
padding: 0;
margin: 0;
padding: 0;
-border-bottom: 1px solid #999999;
-height: 110px;
}
#header-bottom {
clear: both;
background-color: #ffffff;
border: 0;
+border-top: 1px solid #999999;
padding: 0;
margin: 0;
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
