Author: brett
Date: Thu Nov  2 20:28:53 2006
New Revision: 470661

URL: http://svn.apache.org/viewvc?view=rev&rev=470661
Log:
rolling back site style changes for now - too many complaints.

These should be rolled back in through the following method:
- site.vm changes for javascript based menu expansion should be implemented in 
Doxia Site Renderer template (including Javascript)
- CSS changes should be implemented in the stylus skin, but more carefully 
tested and reviewed before being applied


Removed:
    maven/site/trunk/src/site/main-site.vm
Modified:
    maven/site/trunk/pom.xml
    maven/site/trunk/src/site/resources/css/site.css
    maven/site/trunk/src/site/site.xml

Modified: maven/site/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?view=diff&rev=470661&r1=470660&r2=470661
==============================================================================
--- maven/site/trunk/pom.xml (original)
+++ maven/site/trunk/pom.xml Thu Nov  2 20:28:53 2006
@@ -10,18 +10,6 @@
   <artifactId>maven-site</artifactId>
   <packaging>pom</packaging>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-5</version>
-        <configuration>
-          <templateFile>src/site/main-site.vm</templateFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <reporting>
     <excludeDefaults>true</excludeDefaults>
     <plugins>

Modified: maven/site/trunk/src/site/resources/css/site.css
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/resources/css/site.css?view=diff&rev=470661&r1=470660&r2=470661
==============================================================================
--- maven/site/trunk/src/site/resources/css/site.css (original)
+++ maven/site/trunk/src/site/resources/css/site.css Thu Nov  2 20:28:53 2006
@@ -1,508 +1,3 @@
-/** maven-base **/
-body {
-  margin: 0px;
-  padding: 0px;
-}
-img {
-  border:none;
-}
-table {
-  padding:0px;
-  width: 100%;
-  margin-left: -2px;
-  margin-right: -2px;
-}
-acronym {
-  cursor: help;
-  border-bottom: 1px dotted #feb;
-}
-table.bodyTable th, table.bodyTable td {
-  padding: 2px 4px 2px 4px;
-  vertical-align: top;
-}
-div.clear{
-  clear:both;
-  visibility: hidden;
-}
-div.clear hr{
-  display: none;
-}
-#bannerLeft, #bannerRight {
-  font-size: xx-large;
-  font-weight: bold;
-}
-#bannerLeft img, #bannerRight img {
-  margin: 0px;
-}
-.xleft, #bannerLeft img {
-  float:left;
-  text-shadow: #7CFC00;
-}
-.xright, #bannerRight img {
-  float:right;
-  text-shadow: #7CFC00;
-}
-#banner {
-  padding: 0px;
-}
-#banner img {
-  border: none;
-}
-#breadcrumbs {
-  padding: 3px 10px 3px 10px;
-}
-#leftColumn {
- width: 170px;
- float:left;
- overflow: auto;
-}
-#bodyColumn {
-  margin-right: 1.5em;
-  margin-left: 197px;
-}
-#legend {
-  padding: 8px 0 8px 0;
-}
-#navcolumn {
-  padding: 8px 4px 0 8px;
-}
-#navcolumn h5 {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn ul {
-  margin: 0;
-  padding: 0;
-  font-size: small;
-}
-#navcolumn li {
-  list-style-type: none;
-  background-image: none;
-  background-repeat: no-repeat;
-  background-position: 0 0.4em;
-  padding-left: 16px;
-  list-style-position: outside;
-  line-height: 1.2em;
-  font-size: smaller;
-}
-#navcolumn li.expanded {
-  background-image: url(../images/expanded.gif);
-}
-#navcolumn li.collapsed {
-  background-image: url(../images/collapsed.gif);
-}
-#poweredBy {
-  text-align: center;
-}
-#navcolumn img {
-  margin-top: 10px;
-  margin-bottom: 3px;
-}
-#poweredBy img {
-  display:block;
-  margin: 20px 0 20px 17px;
-  border: 1px solid black;
-  width: 90px;
-  height: 30px;
-}
-#search img {
-    margin: 0px;
-    display: block;
-}
-#search #q, #search #btnG {
-    border: 1px solid #999;
-    margin-bottom:10px;
-}
-#search form {
-    margin: 0px;
-}
-#lastPublished {
-  font-size: x-small;
-}
-.navSection {
-  margin-bottom: 2px;
-  padding: 8px;
-}
-.navSectionHead {
-  font-weight: bold;
-  font-size: x-small;
-}
-#footer {
-  padding: 3px 10px 3px 10px;
-  font-size: x-small;
-}
-#breadcrumbs {
-  font-size: x-small;
-  margin: 0pt;
-}
-.source {
-  padding: 12px;
-  margin: 1em 7px 1em 7px;
-}
-.source pre {
-  margin: 0px;
-  padding: 0px;
-}
-
-/** maven-theme **/
-body {
-        background-color: #fff;
-       font-family: Verdana, Helvetica, Arial, sans-serif;
-       margin-left: auto;
-       margin-right: auto;
-       background-repeat: repeat-y;
-       font-size: 13px;
-       padding: 0px;
-}
-td, select, input, li{
-       font-family: Verdana, Helvetica, Arial, sans-serif;
-       font-size: 12px;
-       color:#333333;
-}
-code{
-  font-size: 12px;
-}
-a {
-  text-decoration: none;
-}
-a:link {
-  color:#47a;
-}
-a:visited  {
-  color:#666666;
-}
-a:active, a:hover {
-  color:#990000;
-}
-#legend li.externalLink {
-  background: url(../images/external.png) left top no-repeat;
-  padding-left: 18px;
-}
-a.externalLink, a.externalLink:link, a.externalLink:visited, 
a.externalLink:active, a.externalLink:hover {
-  background: url(../images/external.png) right center no-repeat;
-  padding-right: 18px;
-}
-#legend li.newWindow {
-  background: url(../images/newwindow.png) left top no-repeat;
-  padding-left: 18px;
-}
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, 
a.newWindow:hover {
-  background: url(../images/newwindow.png) right center no-repeat;
-  padding-right: 18px;
-}
-h2 {
-       font-size: 17px;
-       color: #333333;  
-}
-h3 {
-       padding: 4px 4px 4px 24px;
-       color: #666;
-       background-color: #ccc;
-       font-weight: bold;
-       font-size: 14px;
-       background-image: url(../images/h3.jpg);
-       background-repeat: no-repeat;
-       background-position: left bottom;
-}
-p {
-  line-height: 1.3em;
-  font-size: 12px;
-  color: #000;
-}
-#breadcrumbs {
-       height: 13px;
-       background-image: url(../images/breadcrumbs.jpg);
-       padding: 5px 10px 14px 20px;
-}
-* html #breadcrumbs {
-       padding-bottom: 8px;
-}
-#leftColumn {
-       margin: 10px 0 10px 0;
-       border-top-color: #ccc;
-       border-top-style: solid;
-       border-top-width: 1px;
-       border-right-color: #ccc;
-       border-right-style: solid;
-       border-right-width: 1px;
-       border-bottom-color: #ccc;
-       border-bottom-style: solid;
-       border-bottom-width: 1px;
-       padding-right: 5px;
-       padding-left: 5px;
-}
-#navcolumn h5 {
-       font-size: smaller;
-       border-bottom: 1px solid #aaaaaa;
-       padding-top: 2px;
-       padding-left: 9px;
-       color: #49635a;
-       background-image: url(../images/h5.jpg);
-       background-repeat: no-repeat;
-       background-position: left bottom;
-}
-
-table.bodyTable th {
-  color: white;
-  background-color: #bbb;
-  text-align: left;
-  font-weight: bold;
-}
-
-table.bodyTable th, table.bodyTable td {
-  font-size: 11px;
-}
-
-table.bodyTable tr.a {
-  background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-  background-color: #eee;
-}
-
-.source {
-  border: 1px solid #999;
-  overflow:auto
-}
-dt {
-       padding: 4px 4px 4px 24px;
-       color: #333333;
-       background-color: #ccc;
-       font-weight: bold;
-       font-size: 14px;
-       background-image: url(../images/h3.jpg);
-       background-repeat: no-repeat;
-       background-position: left bottom;
-}
-.subsectionTitle {
-       font-size: 13px;
-       font-weight: bold;
-       color: #666;
-
-}
-
-table {
-       font-size: 10px;
-}
-.xright a:link, .xright a:visited, .xright a:active {
-  color: #666;
-}
-.xright a:hover {
-  color: #003300;
-}
-#banner {
-       height: 93px;
-       background: url(../images/banner.jpg);
-}
-#navcolumn ul {
-       margin: 5px 0 15px -0em;
-}
-#navcolumn ul a {
-       color: #333333;
-}
-#navcolumn ul a:hover {
-       color: red;
-}
-#intro {
-       border: solid #ccc 1px;
-       margin: 6px 0px 0px 0px;
-       padding: 10px 40px 10px 40px;
-}
-.subsection {
-       margin-left: 3px;
-       color: #333333;
-}
-
-.subsection p {
-       font-size: 12px;
-}
-#footer {
-  padding: 10px;
-  margin: 20px 0px 20px 0px;
-  border-top: solid #ccc 1px; 
-  color: #333333;
-}
-
-.errormark, .warningmark, .donemark, .infomark {
-  background: url(../images/icon_error_sml.gif) no-repeat;
-}
-
-.warningmark {
-  background-image: url(../images/icon_warning_sml.gif);
-}
-
-.donemark {
-  background-image: url(../images/icon_success_sml.gif);
-}
-
-.infomark {
-  background-image: url(../images/icon_info_sml.gif);
-}
-
-/** site **/
-body {
-  font-size: 0.8em;
-}
-table {
-  padding:0em;
-  width: 100%;
-  margin-left: -0.25em;
-  margin-right: -0.25em;
-}
-acronym {
-  cursor: help;
-  border-bottom: 0.25em dotted #feb;
-}
-table.bodyTable th, table.bodyTable td {
-  padding: 0.25em 0.5em 0.25em 0.5em;
-  vertical-align: top;
-}
-#breadcrumbs {
-  padding: 0.25em 0.5em 0.25em 0.5em;
-}
-#leftColumn {
- width: 12em;
- float:left;
- overflow: none;
-}
-#bodyColumn {
-  margin-right: 1.5em;
-  margin-left: 13em;
-}
-#legend {
-  padding: 0.5em 0 0.5em 0;
-}
-#navcolumn {
-  padding: 0.5em 0.25em 0.5em 0.5em;
-}
-#navcolumn li {
-  list-style-type: none;
-  background-image: none;
-  background-repeat: no-repeat;
-  background-position: 0 0.4em;
-  padding-left: 1em;
-  list-style-position: outside;
-  line-height: 1.2em;
-  font-size: smaller;
-}
-#search #q, #search #btnG {
-    border: 0.25em solid #999;
-    margin-bottom: 1em;
-}
-#search form {
-    margin: 0em;
-}
-.navSection {
-  margin-bottom: 0.25em;
-  padding: 1em;
-}
-.navSectionHead {
-  font-weight: bold;
-  font-size: x-small;
-}
-#footer {
-  padding: 0.25em 1em 0.25em 1em;
-  font-size: x-small;
-}
-#breadcrumbs {
-  font-size: x-small;
-  margin: 0pt;
-}
-.source {
-  padding: 1em;
-  margin: 1em 0.5em 1em 0.5em;
-}
-code {
-  font-size: small;
-}
-a {
-  text-decoration: none;
-}
-a:link {
-  color:#47a;
-}
-a:visited  {
-  color:#666666;
-}
-a:active, a:hover {
-  color:#990000;
-}
-#legend li.externalLink {
-  background: url(../images/external.png) left top no-repeat;
-  padding-left: 1em;
-}
-a.externalLink, a.externalLink:link, a.externalLink:visited, 
a.externalLink:active, a.externalLink:hover {
-  background: url(../images/external.png) right center no-repeat;
-  padding-right: 1em;
-}
-#legend li.newWindow {
-  background: url(../images/newwindow.png) left top no-repeat;
-  padding-left: 1em;
-}
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, 
a.newWindow:hover {
-  background: url(../images/newwindow.png) right center no-repeat;
-  padding-right: 1em;
-}
-h3 {
-       padding: 0.25em 0.25em 0.25em 2em;
-       color: #666;
-       background-color: #ccc;
-       font-weight: bold;
-       font-size: 1.2em;
-       background-image: url(../images/h3.jpg);
-       background-repeat: no-repeat;
-       background-position: left center;
-}
-p {
-  line-height: 1.3em;
-  color: #000;
-}
-#breadcrumbs {
-       height: 1px;
-       background-image: url(../images/breadcrumbs.jpg);
-       padding: 5px 10px 14px 20px;
-  font-size: smaller;
-  margin: 0px;
-}
-* html #breadcrumbs {
-       padding-bottom: 8px;
-}
-#leftColumn {
-       margin: 0.5em 0 0.5em 0;
-       border-top-color: #ccc;
-       border-top-style: solid;
-       border-top-width: 1px;
-       border-right-color: #ccc;
-       border-right-style: solid;
-       border-right-width: 1px;
-       border-bottom-color: #ccc;
-       border-bottom-style: solid;
-       border-bottom-width: 1px;
-       padding-right: 5px;
-       padding-left: 5px;
-}
-#navcolumn h5 {
-       font-size: smaller;
-       border-bottom: 1px solid #aaaaaa;
-       padding-top: 2px;
-       padding-left: 9px;
-       color: #49635a;
-       background-image: url(../images/h5.jpg);
-       background-repeat: no-repeat;
-       background-position: left bottom;
-       background-color: #F2F2F9;
-    cursor:pointer;
-}
-#navcolumn ul {
-       margin: 0.25em 0em 0.5em -0em;
-}
-.subsection {
-       margin-left: 0.25em;
-       color: #333333;
-}
-
 a.externalLink, a.externalLink:link, a.externalLink:visited, 
a.externalLink:active, a.externalLink:hover {
   background: none;
   padding-right: 0;
@@ -515,10 +10,9 @@
 #downloadbox {
   float: right;
   margin: 0 1em 2em 2em;
-  padding: 0.5em;
+  padding: 1em;
   border: 1px solid #999;
   background-color: #eee;
-  font-size: 1em;
 }
 
 #downloadbox h5 {
@@ -530,9 +24,8 @@
 }
 
 #downloadbox p {
-  margin-top: 0.5em;
+  margin-top: 1em;
   margin-bottom: 0;
-  font-size: 1em;
 }
 
 #downloadbox ul {
@@ -545,12 +38,3 @@
   font-size: smaller;
 }
 
-.xleft {
-  margin-bottom: -8px;
-}
-.section {
-  padding: 0.25em;
-}
-div.section ol ol {
-  padding-left: 2em;
-}

Modified: maven/site/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?view=diff&rev=470661&r1=470660&r2=470661
==============================================================================
--- maven/site/trunk/src/site/site.xml (original)
+++ maven/site/trunk/src/site/site.xml Thu Nov  2 20:28:53 2006
@@ -32,17 +32,7 @@
       <script type="text/javascript">
         _uacct = "UA-140879-1";
         urchinTracker();
-               function expand( item ) {
-                       var expandIt = document.getElementById( item );
-                       if( expandIt.style.display == "block" ) {
-                               expandIt.style.display = "none";
-                               expandIt.parentNode.className = "collapsed";
-                       } else {
-                               expandIt.style.display = "block";
-                               expandIt.parentNode.className = "expanded";
-                       }
-               }
-         </script>
+      </script>
     </head>
 
     <menu name="Get Maven">
@@ -52,61 +42,61 @@
         <item name="Eclipse Plug-in" href="/eclipse-plugin.html"/>
         <item name="Netbeans Module" href="/netbeans-module.html"/>      
       </item>
-       </menu>
+    </menu>
 
     <menu name="Documentation">
       <item name="Quick Start" href="/quick.html" />
-         <item name="User Guides">
+      <item name="User Guides">
         <!-- item name="Concepts">
-                       <item name="POM" href="/concepts.html#pom" />
-                       <item name="Artifacts" href="/concepts.html#artifacts" 
/>
-                       <item name="Lifecycle" href="/concepts.html#lifecycle" 
/>
-                       <item name="Repositories" 
href="/concepts.html#repositories" />
-                       <item name="Plugins" href="/concepts.html#plugins" />
-                       <item name="Conventions" 
href="/concepts.html#conventions" />
-                       <item name="Archetypes" 
href="/concepts.html#archetypes" />
-                       <item name="Multimodule" 
href="/concepts.html#multimodule" />
-                       <item name="Sites" href="/concepts.html#sites" />
-                       <item name="Reports" href="/concepts.html#reports" />
-               </item -->
+            <item name="POM" href="/concepts.html#pom" />
+            <item name="Artifacts" href="/concepts.html#artifacts" />
+            <item name="Lifecycle" href="/concepts.html#lifecycle" />
+            <item name="Repositories" href="/concepts.html#repositories" />
+            <item name="Plugins" href="/concepts.html#plugins" />
+            <item name="Conventions" href="/concepts.html#conventions" />
+            <item name="Archetypes" href="/concepts.html#archetypes" />
+            <item name="Multimodule" href="/concepts.html#multimodule" />
+            <item name="Sites" href="/concepts.html#sites" />
+            <item name="Reports" href="/concepts.html#reports" />
+        </item -->
         <item name="Getting Started" href="/guides/getting-started/index.html" 
/>
-           <!-- item name="Build Cookbook" href="/" / -->
-           <item name="POM Reference" href="/pom.html" />
-           <item name="Profiles Reference" href="/pom.html#Profiles" />
-           <item name="Settings Reference" href="/settings.html" />
-           <item name="Wiki" href="http://docs.codehaus.org/display/MAVENUSER"; 
/> 
-         </item>
-
-         <item name="Plugin Developer Guides">
-           <item name="Your First Mojo" 
href="/guides/plugin/guide-java-plugin-development.html" />
-           <!-- item name="Plugin Cookbook" href="/" / -->
-           <item name="Mojo API" 
href="/developers/mojo-api-specification.html" />
-           <!-- item name="Maven API" href="/" / -->
-         </item>
-
-         <item name="Plugins">
-           <item name="By Category" href="/plugins/index.html" />
-           <!-- item name="By Host" href="/" / -->
-           <item name="Search" href="http://www.mvnrepository.com/"; />
-         </item>
-
-         <item name="Documentation Index">
-           <item name="By Category" href="/guides/index.html" />
-           <!-- item name="Alphabetical" href="/" / -->
-         </item>
+        <!-- item name="Build Cookbook" href="/" / -->
+        <item name="POM Reference" href="/pom.html" />
+        <item name="Profiles Reference" href="/pom.html#Profiles" />
+        <item name="Settings Reference" href="/settings.html" />
+        <item name="Wiki" href="http://docs.codehaus.org/display/MAVENUSER"; /> 
+      </item>
+
+      <item name="Plugin Developer Guides">
+        <item name="Your First Mojo" 
href="/guides/plugin/guide-java-plugin-development.html" />
+        <!-- item name="Plugin Cookbook" href="/" / -->
+        <item name="Mojo API" href="/developers/mojo-api-specification.html" />
+        <!-- item name="Maven API" href="/" / -->
+      </item>
+
+      <item name="Plugins">
+        <item name="By Category" href="/plugins/index.html" />
+        <!-- item name="By Host" href="/" / -->
+        <item name="Search" href="http://www.mvnrepository.com/"; />
+      </item>
+
+      <item name="Documentation Index">
+        <item name="By Category" href="/guides/index.html" />
+        <!-- item name="Alphabetical" href="/" / -->
+      </item>
 
-         <item name="Books and Articles" href="/articles.html" />
-       </menu>
+      <item name="Books and Articles" href="/articles.html" />
+    </menu>
 
-       <menu name="Community">
-         <item name="Community Overview" href="/community.html"/>
+    <menu name="Community">
+      <item name="Community Overview" href="/community.html"/>
       <item name="How to Contribute" 
href="/guides/development/guide-helping.html"/>
       <item name="Maven Repository">
-               <item name="How to Help" 
href="/guides/mini/guide-maven-evangelism.html" />
+        <item name="How to Help" 
href="/guides/mini/guide-maven-evangelism.html" />
         <item name="Central Repo" href="http://repo1.maven.org/maven2/"; />
         <item name="Codehaus Repo" href="http://repository.codehaus.org/"; />
       </item>
-         <item name="Getting Support" href="/mail-lists.html" />
+      <item name="Getting Support" href="/mail-lists.html" />
     </menu>
 
     <menu name="About">


Reply via email to