ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r802976 - in /websites/production/ace: ./ content/css/style.css content/index.html content/sitemap.html
Date Fri, 20 Jan 2012 19:56:54 GMT
Author: marrs
Date: Fri Jan 20 19:56:53 2012
New Revision: 802976

Log:
Publishing merge to ace site by marrs

Modified:
    websites/production/ace/   (props changed)
    websites/production/ace/content/css/style.css
    websites/production/ace/content/index.html
    websites/production/ace/content/sitemap.html

Propchange: websites/production/ace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 20 19:56:53 2012
@@ -1 +1 @@
-/websites/staging/ace/trunk:801772-802969
+/websites/staging/ace/trunk:801772-802975

Modified: websites/production/ace/content/css/style.css
==============================================================================
--- websites/production/ace/content/css/style.css (original)
+++ websites/production/ace/content/css/style.css Fri Jan 20 19:56:53 2012
@@ -1,3 +1,5 @@
+/* @override http://ace.staging.apache.org/css/style.css */
+
 @import url('reset.css');
 @import url('text.css');
 @import url('960.css');
@@ -6,7 +8,7 @@
 
 a { color: #3E4F90;}
 a:hover { text-decoration:underline;}
-body {background: #ddd; min-width: 1063px;}
+body {background: #ccc; min-width: 1063px;}
 
 .container_16 {background: #fff; border-bottom: 2px solid #bbb; border-top: 1px solid #ccc;}
 #header h1 {margin-bottom: 30px; margin-top: 25px; margin-left: 0px; font-size: 18px;}
@@ -16,6 +18,7 @@ body {background: #ddd; min-width: 1063p
 #nav ul li {display:inline; float:left; margin: 5px 0px;}
 #nav ul li a {padding: 10px; background: #303284; color: #fff;}
 #nav ul li a:hover {background: #3E4F90 url(../images/overlay.png) repeat-y; text-decoration:none;}
+#nav ul li ul li { position: absolute; display: none; }
 #nav p { float: left; width: 100%; margin-left; 100px; }
 #intro, #featured_intro { margin-top: 40px;}
 #intro div { padding-bottom: 20px; padding-right: 10px; }
@@ -52,8 +55,9 @@ body {background: #ddd; min-width: 1063p
 #footer .links { padding: 10px;}
 #footer ul li { font-size: 14px;}
 #footer ul li#more {list-style:none;}
-#copyright {background: transparent; margin-top: 20px; font-size: 15px;}
+#copyright {background: transparent; margin-top: 20px; font-size: 13px; color: #666;}
 #copyright { border-bottom: 0px; border-top: 0px;}
+#copyright a { color: #626b90;}
 #impact { padding-bottom: 20px;}
 #impact h4 { margin-bottom: 15px;}
 #impact div {padding-right: 30px;}
@@ -62,5 +66,5 @@ body {background: #ddd; min-width: 1063p
 .bug { background: transparent url('../images/bug.jpg') no-repeat left; padding-left: 20px;}
 .svn { background: transparent url('../images/svn.jpg') no-repeat left; padding-left: 20px;}
 #search {float:right;}
-#search input[type=text] { font-size: 13px; width: 300px; color: #aaa;}
+#search input[type=text] { font-size: 13px; width: 200px; color: #aaa;}
 #project_menu ul li { font-size: 14px;}

Modified: websites/production/ace/content/index.html
==============================================================================
--- websites/production/ace/content/index.html (original)
+++ websites/production/ace/content/index.html Fri Jan 20 19:56:53 2012
@@ -6,8 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
 
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="/css/style.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="/css/code.css">
 
     </style>
 
@@ -26,14 +26,48 @@
       </div>
       <div id="nav" class="grid_8">
         <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li>
-->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get
Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support
Apache">Support Apache</a></li>
-        </ul>
+<li><a href="/index.html">Home</a><ul>
+<li><a href="/news.html">News</a></li>
+<li><a href="/ontheweb.html">On the web</a></li>
+</ul>
+</li>
+<li><a href="/downloads.html">Downloads</a></li>
+<li><a href="/user-doc.html">User Documentation</a><ul>
+<li><a href="/user-doc/introduction.html">Introduction</a></li>
+<li><a href="/user-doc/getting-started.html">Getting Started</a></li>
+<li><a href="/user-doc/features.html">Features</a></li>
+<li><a href="/user-doc/faq.html">FAQ</a></li>
+<li><a href="/user-doc/support.html">Support</a></li>
+</ul>
+</li>
+<li><a href="/dev-doc.html">Developer Documentation</a><ul>
+<li><a href="/dev-doc/architecture.html">Architecture</a></li>
+<li><a href="/dev-doc/analysis.html">Analysis</a></li>
+<li><a href="/dev-doc/design.html">Design</a></li>
+<li><a href="/dev-doc/coding-standards.html">Coding Standards</a></li>
+</ul>
+</li>
+<li><a href="/get-involved.html">Get Involved</a><ul>
+<li><a href="/get-involved/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/get-involved/issue-tracking.html">Issue Tracking</a></li>
+<li><a href="/get-involved/source-code.html">Source Code</a></li>
+<li><a href="/get-involved/project-team.html">Project Team</a></li>
+</ul>
+</li>
+<li><a href="/wiki.html">Wiki</a><ul>
+<li><a href="/wiki/board-reports.html">Board Reports</a></li>
+<li><a href="/wiki/drafts.html">Drafts</a></li>
+</ul>
+</li>
+<li><a href="/apache.html">Apache</a><ul>
+<li><a href="/apache/about.html">About</a></li>
+<li><a href="/apache/license.html">License</a></li>
+<li><a href="/apache/security.html">Security</a></li>
+<li><a href="/apache/sponsorship.html">Sponsorship</a></li>
+<li><a href="/apache/thanks.html">Thanks</a></li>
+</ul>
+</li>
+</ul>
         <p><a href="/">Home</a></p>
         <form name="search" id="search" action="http://www.google.com/search" method="get">
           <input value="*.apache.org" name="sitesearch" type="hidden"/>
@@ -53,7 +87,7 @@
     </div>
 
     <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache
and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache
and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
     </div>
   </body>
 </html>

Modified: websites/production/ace/content/sitemap.html
==============================================================================
--- websites/production/ace/content/sitemap.html (original)
+++ websites/production/ace/content/sitemap.html Fri Jan 20 19:56:53 2012
@@ -6,8 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
 
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="http://www.apache.org/css/code.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="/css/style.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="/css/code.css">
 
     </style>
 
@@ -26,14 +26,48 @@
       </div>
       <div id="nav" class="grid_8">
         <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li>
-->
-          <li><a href="http://www.apache.org/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="http://www.apache.org/foundation/getinvolved.html" title="Get
Involved">Get Involved</a></li>
-          <li><a href="http://www.apache.org/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="http://www.apache.org/foundation/sponsorship.html" title="Support
Apache">Support Apache</a></li>
-        </ul>
+<li><a href="/index.html">Home</a><ul>
+<li><a href="/news.html">News</a></li>
+<li><a href="/ontheweb.html">On the web</a></li>
+</ul>
+</li>
+<li><a href="/downloads.html">Downloads</a></li>
+<li><a href="/user-doc.html">User Documentation</a><ul>
+<li><a href="/user-doc/introduction.html">Introduction</a></li>
+<li><a href="/user-doc/getting-started.html">Getting Started</a></li>
+<li><a href="/user-doc/features.html">Features</a></li>
+<li><a href="/user-doc/faq.html">FAQ</a></li>
+<li><a href="/user-doc/support.html">Support</a></li>
+</ul>
+</li>
+<li><a href="/dev-doc.html">Developer Documentation</a><ul>
+<li><a href="/dev-doc/architecture.html">Architecture</a></li>
+<li><a href="/dev-doc/analysis.html">Analysis</a></li>
+<li><a href="/dev-doc/design.html">Design</a></li>
+<li><a href="/dev-doc/coding-standards.html">Coding Standards</a></li>
+</ul>
+</li>
+<li><a href="/get-involved.html">Get Involved</a><ul>
+<li><a href="/get-involved/mailing-lists.html">Mailing Lists</a></li>
+<li><a href="/get-involved/issue-tracking.html">Issue Tracking</a></li>
+<li><a href="/get-involved/source-code.html">Source Code</a></li>
+<li><a href="/get-involved/project-team.html">Project Team</a></li>
+</ul>
+</li>
+<li><a href="/wiki.html">Wiki</a><ul>
+<li><a href="/wiki/board-reports.html">Board Reports</a></li>
+<li><a href="/wiki/drafts.html">Drafts</a></li>
+</ul>
+</li>
+<li><a href="/apache.html">Apache</a><ul>
+<li><a href="/apache/about.html">About</a></li>
+<li><a href="/apache/license.html">License</a></li>
+<li><a href="/apache/security.html">Security</a></li>
+<li><a href="/apache/sponsorship.html">Sponsorship</a></li>
+<li><a href="/apache/thanks.html">Thanks</a></li>
+</ul>
+</li>
+</ul>
         <p><a href="/">Home</a></p>
         <form name="search" id="search" action="http://www.google.com/search" method="get">
           <input value="*.apache.org" name="sitesearch" type="hidden"/>
@@ -49,7 +83,7 @@
     </div>
 
     <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2011 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache
and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+      <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the
<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache
and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
     </div>
   </body>
 </html>



Mime
View raw message