You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2011/10/27 09:18:07 UTC

svn commit: r1189641 - in /maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources: META-INF/maven/site.vm css/maven-base.css css/maven-theme.css

Author: simonetripodi
Date: Thu Oct 27 07:18:06 2011
New Revision: 1189641

URL: http://svn.apache.org/viewvc?rev=1189641&view=rev
Log:
top bar excluded by default but can be enabled by setting custom.fluidoSkin.topBarEnabled=true in site.xml - Contributed by Ivan Habunek

Modified:
    maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
    maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css
    maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css

Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1189641&r1=1189640&r2=1189641&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Thu Oct 27 07:18:06 2011
@@ -495,6 +495,14 @@
     <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
     <title>$title</title>
     <link rel="stylesheet" href="$relativePath/css/bootstrap-1.3.0.min.css" />
+    #if ( $decoration.custom.getChild( 'fluidoSkin' )
+              && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarEnabled' )
+              && $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarEnabled' ).getValue() )
+        #set( $topBarEnabled = true )
+    <style>body{padding-top: 60px;}</style>
+    #else
+    <style>body{padding-top: 20px;}</style>
+    #end
     <link rel="stylesheet" href="$relativePath/css/maven-base.css" />
     <link rel="stylesheet" href="$relativePath/css/maven-theme.css" />
 
@@ -568,6 +576,7 @@
     #googleAnalytics( $decoration.googleAnalyticsAccountId )
   </head>
   <body>
+    #if ( $topBarEnabled )
     <div id="topbar" class="topbar" data-dropdown="dropdown">
       <div class="topbar-inner">
         <div class="container-fluid">
@@ -587,6 +596,7 @@
         </div>
       </div>
     </div>
+    #end
 
     <div class="container-fluid">
       #if ( ($decoration.bannerLeft.name && $decoration.bannerLeft.name != $project.name || $decoration.bannerLeft.src || $decoration.bannerLeft.href ) || $decoration.bannerRight )

Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css?rev=1189641&r1=1189640&r2=1189641&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-base.css Thu Oct 27 07:18:06 2011
@@ -19,4 +19,6 @@
 
 /* $Id$ */
 
-body{padding-top: 60px;}
+.clear{clear:both;visibility: hidden;}
+.clear hr{display: none;}
+.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left: 7px;}

Modified: maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css?rev=1189641&r1=1189640&r2=1189641&view=diff
==============================================================================
--- maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css (original)
+++ maven/sandbox/trunk/skin/maven-fluido-skin/src/main/resources/css/maven-theme.css Thu Oct 27 07:18:06 2011
@@ -19,10 +19,6 @@
 
 /* $Id$ */
 
-.clear{clear:both;visibility: hidden;}
-.clear hr{display: none;}
-.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left: 7px;}
-
 /*IE6/7 don't support selectors*/
 a.externalLink{background: url('../images/external.png') right center no-repeat;padding-right: 18px;}
 a.newWindow{background: url('../images/newwindow.png') right center no-repeat;padding-right: 18px;}