[cc-commits] [CC SVN] r11106 - in ccwordpress/branches/production: . www/wp-content/themes/cclearn

webmaster at creativecommons.org webmaster at creativecommons.org
Tue Nov 4 13:45:46 EST 2008


Author: bse
Date: 2008-11-04 18:45:46 +0000 (Tue, 04 Nov 2008)
New Revision: 11106

Modified:
   ccwordpress/branches/production/
   ccwordpress/branches/production/www/wp-content/themes/cclearn/events-map.css
   ccwordpress/branches/production/www/wp-content/themes/cclearn/footer.php
   ccwordpress/branches/production/www/wp-content/themes/cclearn/header.php
   ccwordpress/branches/production/www/wp-content/themes/cclearn/index.php
   ccwordpress/branches/production/www/wp-content/themes/cclearn/nav.php
   ccwordpress/branches/production/www/wp-content/themes/cclearn/page.php
   ccwordpress/branches/production/www/wp-content/themes/cclearn/style.css
Log:
Merged revisions 11104-11105 via svnmerge from 
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk

........
  r11104 | bse | 2008-11-04 18:14:48 +0000 (Tue, 04 Nov 2008) | 2 lines
  
  Vote Yes on Proposition Redesign.
........
  r11105 | bse | 2008-11-04 18:38:22 +0000 (Tue, 04 Nov 2008) | 2 lines
  
  Fixed sidebar image border; Hide project blurbs popup text so we don't get any uglyness on page load, or when JS is disabled.
........



Property changes on: ccwordpress/branches/production
___________________________________________________________________
Name: svnmerge-integrated
   - /ccwordpress/trunk:1-8278,8280-8284,8286,8288-8296,8298-8311,8313-8435,8437-8453,8455-8471,8473-8499,8501-8502,8504-8509,8511-8514,8516-8518,8520-8576,8578-8601,8604-8655,8657-8663,8665-8671,8673-8694,8696-9095,9097-9115,9117,9119-9122,9125-9132,9134-9465,9467-9612,9615-9627,9629-9643,9645-9659,9661-9687,9689-9712,9733,9769,9771,9775,9809-9810,9813,9820,9832-9838,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10539,10541,10545-10582,10584-10600,10602-10638,10640-10734,10736,10784,10787,10822,10842,10868,10895,10913,10927,10940-10963,10965-10996,10998-11077,11092,11099
   + /ccwordpress/trunk:1-8278,8280-8284,8286,8288-8296,8298-8311,8313-8435,8437-8453,8455-8471,8473-8499,8501-8502,8504-8509,8511-8514,8516-8518,8520-8576,8578-8601,8604-8655,8657-8663,8665-8671,8673-8694,8696-9095,9097-9115,9117,9119-9122,9125-9132,9134-9465,9467-9612,9615-9627,9629-9643,9645-9659,9661-9687,9689-9712,9733,9769,9771,9775,9809-9810,9813,9820,9832-9838,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10539,10541,10545-10582,10584-10600,10602-10638,10640-10734,10736,10784,10787,10822,10842,10868,10895,10913,10927,10940-10963,10965-10996,10998-11077,11092,11099,11104-11105

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/events-map.css
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/events-map.css	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/events-map.css	2008-11-04 18:45:46 UTC (rev 11106)
@@ -1,10 +1,12 @@
 #events_map {
+	width: 62%;
+	margin: 0 ;
 	margin-bottom: 25px;
 }
 
 #events_map iframe {
 	width: 100%;
-	height: 220px;
+	height: 180px;
 	border: 1px solid #ccc;
 }
 
@@ -13,6 +15,11 @@
 	width: 100%;
 	border: 1px solid #ccc;
 	padding-bottom: 2px;
+
+	-moz-border-radius-bottomleft: 5px;
+	-moz-border-radius-bottomright: 5px;
+	-webkit-border-radius-bottom-left: 5px;
+	-webkit-border-radius-bottom-right: 5px;
 }
 
 #events_map_legend ul {
@@ -31,6 +38,11 @@
 	font-size: 0.9em;
 }
 
+#events_map_legend img {
+	border: none; 
+	margin-right: 0;
+}
+
 #events_map_legend ul li.hint {
 	font-size: 0.9em;
 	padding-left: 2em;
@@ -40,15 +52,17 @@
 	float: right;
 	padding-right: 0;
 	font-size: 0.75em;
+	opacity: 0.5;
 }
 
 .events_button {
-	padding: 5px;
+	padding: 3px 6px;
 	margin-top: 4px;
 	margin-right: 10px;
 	background-color: #ddd;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
 	float: left;
 }
 

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/footer.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/footer.php	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/footer.php	2008-11-04 18:45:46 UTC (rev 11106)
@@ -14,8 +14,7 @@
 <ul>
   <li><a href="http://creativecommons.org/">Creative Commons</a></li>
   <li><a href="http://sciencecommons.org/">Science Commons</a></li>
-  <li><a href="http://labs.creativecommons.org/">ccLabs</a></li>
-  <li><a href="http://ccmixter.org/">ccMixter</a></li>
+  <li><a href="https://creativecommons.net">CC Network</a></li>
   <li><a href="http://creativecommons.org/worldwide/">ccInternational</a></li>
   <li>
     <select name="sortby" onchange="orderby(this)">

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/header.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/header.php	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/header.php	2008-11-04 18:45:46 UTC (rev 11106)
@@ -29,9 +29,16 @@
 
   <?php /* wp_get_archives('type=monthly&format=link'); */ ?>
   <script src="/includes/icommons.js" type="text/javascript"></script>
+
+  <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/container/assets/skins/sam/container.css" /> 
+  <script type="text/javascript" src="http://yui.yahooapis.com/2.5.2/build/yahoo-dom-event/yahoo-dom-event.js"></script> 
+  <script type="text/javascript" src="http://yui.yahooapis.com/2.5.2/build/animation/animation-min.js"></script> 
+  <script type="text/javascript" src="http://yui.yahooapis.com/2.5.2/build/container/container-min.js"></script> 
+  
+  <script src="<?php bloginfo('stylesheet_directory'); ?>/info.js" type="text/javascript"></script>
   <?php wp_head(); ?>
  </head>
- <body onload="">
+ <body class="yui-skin-sam">
   <a name="top"></a>
     <div id="header-wrapper">
       <div id="header-main" class="box">
@@ -64,12 +71,16 @@
       -->
       </div>
         <span class="logo"><a href="<?php echo get_option('home'); ?>"><span><img src="<?php bloginfo('stylesheet_directory'); ?>/images/ccl-title-e.png" alt="cclearn" id="cc-title" border="0"/></span></a></span>
-        
+
+		
+  		<?php if (is_home()) { ?>
+		<?php } ?>
+
 <?/*        <div id="strap">Share, Remix, Reuse &mdash; Legally</div> */?>
+
+    <?php include_once( TEMPLATEPATH . "/nav.php" ); ?>
       </div>
     </div>
-
-    <?php include_once( TEMPLATEPATH . "/nav.php" ); ?>
 <? /*
 	 <div id="campaign">
 	  <div class="box">

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/index.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/index.php	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/index.php	2008-11-04 18:45:46 UTC (rev 11106)
@@ -7,34 +7,22 @@
 
       <div id="content">
      	  <div class="clear">&nbsp;</div>
-        <div id="splash">
-          <div class="callout">
-            <?php echo cc_current_feature(); ?>
-          </div>
-        
-          <div class="block noclear" id="title">
-            <div id="blurb">
-              <img src="<?php bloginfo('stylesheet_directory'); ?>/images/book.png" align="left" border="0" style="border:none;" />
-              <?php echo cc_intro_blurb(); ?>
-            </div>
-          </div>
-          <div class="clear"></div>
-        </div>
-        <div id="events_map">
-	  <iframe frameborder="0" src="/events-map/mvs.html?data=textfile.txt&amp;zoom=1&amp;center=30,0" ></iframe>
-	  <div id="events_map_legend">
-	   <ul>
-	    <li><img src="http://labs.creativecommons.org/~paulproteus/pins/pin_purple_h=20.png" alt="Purple Pin" title="Purple Pin" /> <span>Open Education Event</span></li>
-	    <li><img src="http://labs.creativecommons.org/~paulproteus/pins/pin_green_h=20.png" alt="Green Pin" title="Green Pin" /> <span>Open Education Event, CC attending</span></li>
-	    <li class="hint">Click a pin for more details on the event</li>
-	    <li class="attribution">Pushpin icon by <a href="http://pedrogordo.com">Pedro Gordo</a>, <a href="http://creativ
-      ecommons.org/licenses/by/3.0/">CC BY 3.0</a></li>
-	  </div>
-	  <div class="events_button"><a href="http://wiki.creativecommons.org/Open_Education_Events">View list of all events</a></div>
-	  <div class="events_button"><a href="http://wiki.creativecommons.org/Form:Event">Add event</a></div><br clear="all"/> 
-	</div>
-	<div class="cc_box">
-          <h4>Projects</h4>
+       <!-- <div id="splash">
+		-->	<?php /*echo cc_current_feature(); */?>
+		
+		<?php include "events-map.php" ?>
+
+		<div id="head-info">
+			<div id="mission">
+				<p>ccLearn is a division of Creative Commons dedicated to realizing the full potential of the internet to support open learning and open educational resources.</p><p>Our mission is to minimize legal, technical, and social barriers to sharing and reuse of educational materials.</p>
+			</div>
+			<div id="current">
+				<?php echo cc_current_feature(); ?>
+			</div>
+		</div>
+        <!--/div -->
+	<div id="projects_box" class="cc_box">
+         <!--  <h4>Projects</h4> -->
 <?php /* Select all projects and loop through them, displaying their excerpts and images 
        * Projects must be children of the "Projects" page; 
        * must have a 90px wide attached logo; 
@@ -44,7 +32,8 @@
       'post_type' => 'page',
       'post_parent' => cc_id_from_page_name("Projects"),
       'orderby' => 'ID',
-      'order' => 'asc'
+	  'order' => 'asc',
+	  'limit' => '6'
       );
   $projects = get_posts($projects_query);
   
@@ -53,28 +42,39 @@
     
     // grab logo attachment
     $image = cc_get_attachment ($post->ID);
-    
+	$title = str_replace(" ", "_", strtolower($post->post_title));
     ?>
-          <div class="floater w30 alt">
-            <a href="<? the_permalink() ?>"><img src="<?= $image->uri ?>" alt="<?= $image->descr ?>" align="left" border="0"/></a>
-            <p style="margin-left: 100px;">
-              <a href="<? the_permalink() ?>"><strong><? the_title() ?></strong></a><br/>
-              <?= get_post_meta($post->ID, "excerpt", true) ?>
-            </p>
-          </div>
+			<div class="floater w20 alt helpLink" id="project_<?php echo $title ?>">
+				<h3>
+					<a href="<? the_permalink() ?>"><strong><? the_title() ?></strong></a>
+				</h3>
+				<a href="<? the_permalink() ?>"><img src="<?= $image->uri ?>" alt="<?= $image->descr ?>" align="left" border="0"/></a>
+				<!-- <p><?=  get_post_meta($post->ID, "excerpt", true) ?></p> -->
+			</div>
+			<div class="popup" id="help_project_<?php echo $title ?>">
+				<div class="bd"><?=  get_post_meta($post->ID, "excerpt", true) ?></div>
+			</div>
     <?php
   }
-   
+
 ?>
-          <br clear="both"/>
         </div>
         <div id="alpha" class="content-box">
-          <?php cc_build_external_feed("ccLearn Features");?>
+		  <h4>Latest News</h4>
+		  <?php cc_build_external_feed("ccLearn Weblog"); /*Features");*/?>
         </div>
-  	    <div id="beta" class="content-box">
-	        <h4>Latest News</h4>
+  	    <div id="beta" class="content-box-right">
+	        <h4>Feature</h4>
 	    
-<?php cc_build_external_feed("ccLearn Weblog"); ?>
-
+<?php while(have_posts()) {
+		the_post();
+		$the_url = get_post_meta($post->ID, "url", true);
+?>
+		<div class="post">
+			<h2><a href="<?php echo $the_url ?>"><?php the_title() ?></a></h2>
+<?php the_content(); ?>
+			<p><a href="<?php echo $the_url?>">Read More</a></p>
+		</div>
+<?php } ?>
 <?php get_footer(); ?>
 

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/nav.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/nav.php	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/nav.php	2008-11-04 18:45:46 UTC (rev 11106)
@@ -1,8 +1,9 @@
 <?php
 /* construct nav menu */
 $nav = array (
-  array("name" => "Home",           "path" => "/"),
+//  array("name" => "Home",           "path" => "/"),
   array("name" => "About",          "path" => "/about/"),
+  array("name" => "FAQ",			"path" => "/resources/faq/"),
   array("name" => "Projects",       "path" => "/projects/"),
   array("name" => "Resources",      "path" => "/resources/"),
   array("name" => "Search",    	    "path" => "/search/"),
@@ -11,26 +12,32 @@
 
 ?>
   <div id="mainmenu">
-    <ul id="navbar" class="box">
-       <?php foreach($nav as $i => $item) { 
+    <ul id="navbar" >
+       <?php 
+	   $activated = false;
+	   foreach($nav as $i => $item) { 
           $klass = "inactive";
           
-	  // dead easy to figure out where we are.
-          if (is_home() and $item["name"] == "Home") $klass = "active";
-          if (is_page($item["name"])) $klass = "active";
-	  if ($post->post_name == strtolower($item["name"])) $klass = "active";
+		  if (!$activated) {
+	  		
+			// dead easy to figure out where we are.
+          	if (is_home() and $item["name"] == "Home") $klass = "active";
+          	if (is_page($item["name"])) $klass = "active";
+	  		if ($post->post_name == strtolower($item["name"])) $klass = "active";
 	  
-	  if ($post) {
-            // check if we're a child page, highlight parent tab if applicable         
-            if(get_the_title($post->post_parent) == $item["name"]) $klass = "active"; 
+	  		if ($post) {
+            	// check if we're a child page, highlight parent tab if applicable         
+            	if(get_the_title($post->post_parent) == $item["name"]) $klass = "active"; 
           
-            // check if we're in the ccInternational area
-            if (in_category(21) and $item["name"] == "International") $klass = "active";
+            	// check if we're in the ccInternational area
+            	if (in_category(21) and $item["name"] == "International") $klass = "active";
             
             // blog [post] detection
   //          if ((is_category(1) or (in_category(1) and is_single())) and $item["name"] == "Blog" and !is_home() and !is_page()) $klass = "active";
+          	}
+			if ("active" == $klass) $activated = true;
           }
-          
+
           print '      <li class="'.$klass.'"><a href="'. get_option('home') . $item["path"] .'" title="'.$item["name"].'"><span>'.$item["name"].'</span></a></li>';
         } 
         

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/page.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/page.php	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/page.php	2008-11-04 18:45:46 UTC (rev 11106)
@@ -8,26 +8,24 @@
   
     <div id="body">
       <div id="content">
-        <div id="main-content">
           <div class="block page" id="title">
 <? if ($post->post_parent) { $parent = cc_page_parent ($post); ?> 
-			      <h4 class="category" style="margin-left: 106px;"><a href="./../"><?= $parent->post_title ?></a></h4>
+			      <h4 class="category"><a href="./../"><?= $parent->post_title ?></a></h4>
 <? }
-  
+/*  
 if ($parent->post_title == "Projects") {  $image = cc_get_attachment ($post->ID); ?>
 			      <img src="<?= $image->uri ?>" alt="<?= $image->descr ?>" align="left" border="0" style="border:none !important; margin-top:5px;"/>
 			      <div style="margin-left:110px;">
-<? } ?>
+<? }*/ ?>
 			           
 			        <h2><?php the_title(); ?></h2>
 <?php if ($parent->post_title == "Projects") { ?>
 			        <h5><?= get_post_meta($post->ID, "excerpt", true) ?></h5>
-			      </div>
+			      <!-- /div -->
 <? } ?>
           </div>
           <div class="block page" id="post-<?php the_ID(); ?>">
             <?php the_content("Read More..."); ?>
           </div>
 <?php } }?>
-        </div>  
 <?php get_footer(); ?>

Modified: ccwordpress/branches/production/www/wp-content/themes/cclearn/style.css
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cclearn/style.css	2008-11-04 18:38:22 UTC (rev 11105)
+++ ccwordpress/branches/production/www/wp-content/themes/cclearn/style.css	2008-11-04 18:45:46 UTC (rev 11106)
@@ -1,5 +1,5 @@
 /*
-Theme Name: ccLearn
+Theme Name: ccLearn II
 Theme URI: http://learn.creativecommons.org
 Description: ccLearn - based on CC4.0
 Author: Alex Roberts <alex at creativecommons.org>
@@ -42,6 +42,42 @@
     display: none;
   }
 
+#head-info {
+	position: absolute;
+	top: 0px;
+	right: 0px;
+	width: 34%;
+
+}
+
+#mission {
+	font-size: 130%;
+	font-family: Georgia;
+	font-style: oblique;
+	line-height: 1.3em;
+	color: #120;
+	/*background-color: #e8f2c8;*/
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 3px;
+
+	padding: 0 0 5px 0;
+}
+
+#current {
+	margin-top: 1em;
+	/*background-color: #eee;
+	background: url(images/yellowbg.png) top left repeat-x;
+	*/padding: 1.5em 0 0 0;
+	border-top: 3px double #fbeac3;
+	-moz-border-radius: 3px;
+}
+
+#current ul {
+	margin-left: 1.5em;
+	margin-bottom: 1em;
+}
+
 #search-box {
   position: absolute;
   right: 20px;
@@ -53,18 +89,18 @@
 #search-box h4 { color: #fff; }
 
 #body { margin: 4px 0 0 0; /* border-top: 1px solid #ddd;*/ }
-#splash {  border-bottom: 1px solid #ddd; margin-bottom: 25px;}
-#content { padding: 5px 0; margin-bottom: 20px; }
+#splash {  position: relative; border-bottom: 1px solid #ddd; overflow:auto; }
+#content { position: relative; padding: 5px 0; margin-bottom: 20px; }
 #main-content { margin: 0 auto; width: 83%; padding-bottom: 35px; }
-  #alpha { width: 60%;} /* + .content-box */  
-  #beta { background-color: #f6f6f6; width: 29%; margin-left: 6.5%; padding-left: 1%; padding-right:1%; } /* + .content-box */
+  #alpha { width: 64%;} /* + .content-box */  
+  #beta { background-color: #f6f6f6; width: 32%; padding-left: 1%; padding-right:1%; } /* + .content-box */
 
 
 #sidebar { font-size: 0.85em; width: 15%; margin-left: 1%; margin-right: 0 !important; padding-left: 5px; padding-bottom: 30px; background-color: #f9faf9; } /* + .content-box */
 #footer { background-color: #f2f4f2; clear: both; margin-top: 40px; padding: 10px 0; color: #555; font-size: 90%; }
 #sub-footer { } /* + .box */
 
-h1, h2, h3 { line-height: 120%; font-family: Georgia, serif; }
+h1, h2, h3 { line-height: 120%; font-family: Helvetica, Arial, sans-serif; }
 h1 { font-size: 180%; }
 h2 { margin-top: 25px; line-height: 140%; margin-bottom: 12px; font-size: 175% !important; }
 h3 { font-size: 150% !important; margin-top: 18px; }
@@ -118,13 +154,12 @@
 
 #main-content .blogged img { margin: 0 5px; }
 #main-content .feature { border-bottom:  1px solid #ddd; padding-bottom:  30px; margin-bottom: 25px; }
-#main-content h4 { padding-left: 1%; }
 
 .block { clear: both; margin-bottom: 35px; padding-left: 1%; padding-right: 10%; }
 .noclear { clear: none !important;}
 
 #blog .block, #alpha .block { margin-bottom: 33px; }
-#features .block, #beta .block, #beta h4 { padding: 0 5px; }
+#features .block, #beta .block{ padding: 0 5px; }
 
 #title { border-top: 1px solid #ddd; /*border-bottom: 1px solid #e6e6e6;*/ margin-right: 29%; margin-top: 15px; padding-top: 15px; padding-right: 1% !important; }
 #title.page { border-top: none; }
@@ -138,7 +173,7 @@
 #title h4 { font-size: 90%; padding-top: 10px;}
 #title h5 { margin-right: 5%; }
 #title img {  border: 1px solid #666; padding: 0 !important; margin-right: 15px; }
-#title #blurb { font-size: 60%; margin-bottom: 15px; margin-right: 70px; }
+#title #blurb { font-size: 60%; margin-bottom: 15px; }
 
 .callout {
 	width: 27%;
@@ -157,7 +192,7 @@
 .block .title, #title { font-size: 175%; }
 .block .title a:link, .block .title a:visited, .rss-title a { color: #383838; }
 .block h4.meta { color: #aaa; margin-bottom: 7px; font-variant: normal; font-size: 105%; padding-left: 0 !important; }
-.block img { border: 0; }
+.block img, .post img { border: 0; }
 .block img.feature { display: block; }
 .block img.commoner { margin-right: 10px; margin-left: 0; padding: 3px; border: 1px solid #e3e3e3; }
 .block ul, .block ol { margin-left: 20px; margin-bottom: 15px; }
@@ -167,6 +202,10 @@
 .block .excerpt { margin-left:  170px; }
 .block .comments { margin: 35px 0; }
 
+#beta .post a img {
+		border: 10px solid #fff;
+}
+
 #blurb img {
   margin-left: 16px;
   margin-top: 8px;
@@ -202,12 +241,14 @@
   background-color: #f4f4f4;
 }
 .cc_box {
+  background: url(images/darkbg.png) top left repeat-x;
+  -moz-border-radius: 5px;
+  overflow: auto;
+  width: 60%;
   border: none !important;
   border-bottom: 1px solid #e6e6e6 !important;
   margin-top: 0 !important;
-  padding-top: 5px;
-  padding-bottom: 17px;
-  padding-right: 0 !important;
+  padding: 5px 10px 28px 10px;
 }
 
 .cc_box h4 {
@@ -223,14 +264,20 @@
   margin-bottom: 5px;
 }
 
+.cc_box p {
+  margin-left: 90px;
+}
+
 .cc_box .floater {
   float: left;
-  margin: 2px 8px;
-  padding-left: 1%;
+  margin: 0;
+  margin-right: 2.5%;
+  font-size: 10px;
+  line-height: 150%;
 }
 
 .w20 {
-  width: 20%;
+  width: 17.5%;
 }
 .w30 {
   width: 30%;
@@ -255,8 +302,16 @@
 .licensebox { background:#eee; border:1px solid #ccc; padding:6px; }
 
 /* nav tab-bar */
-#mainmenu {	position: relative; padding-top: 0.6em; background: url("/images/tabbar-bg.png") repeat-x bottom left #383e32 /*fafffa*/;/* height: 2.4em;*/ margin-bottom: 10px; }
-ul#navbar { list-style-type: none; }
+#mainmenu {	
+		position: absolute;
+		bottom: 0;
+		left: 230px;
+		padding-top: 0.6em; 
+		/*background: url("/images/tabbar-bg.png") repeat-x bottom left #383e32 /*fafffa*/;
+		/* height: 2.4em;*/ 
+		margin-bottom: 1px; 
+		width: 60%; }
+ul#navbar { list-style-type: none; width:100%; }
 ul#navbar li {float: left; height: 2.4em;  margin: 0.2em 2px 0 2px; background: url("http://search.creativecommons.org/images/tab-bg.png") repeat-x bottom left #f0f4f1; }
 ul#navbar li.edit { margin-left: 15px; background: url("http://search.creativecommons.org/images/tab-bg.png") repeat-x bottom left #efe2e2; }
 ul#navbar li.active { margin-top: 0; font-weight: bold; height: 2.5em; }
@@ -324,3 +379,7 @@
 #footer #license p { margin-top: 0; padding-top: 0 !important; } 
 #footer #license img { float: left; margin-right: 10px; }
 #international { width: 95%;}
+
+.popup {
+		display: none;
+	}




More information about the cc-commits mailing list