You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2012/08/24 19:01:49 UTC
svn commit: r1376991 - in
/maven/skins/trunk/maven-fluido-skin/src/main/resources:
META-INF/maven/site.vm css/maven-base.css css/maven-theme.css
Author: olamy
Date: Fri Aug 24 17:01:48 2012
New Revision: 1376991
URL: http://svn.apache.org/viewvc?rev=1376991&view=rev
Log:
[MSKINS-63] Improve the sidebar layout
Robert patch modified.
Modified:
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm?rev=1376991&r1=1376990&r2=1376991&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm Fri Aug 24 17:01:48 2012
@@ -249,31 +249,37 @@
#set ( $collapse = "expanded" )
#end
#end
- <li class="$collapse">
+
+ #if ( $alignedFileName == $currentItemHref )
+ <li class="$collapse active">
+ #else
+ <li class="$collapse">
+ #end
+
#if ( $item.img )
#if ( $item.position == "left" )
#if ( $alignedFileName == $currentItemHref )
- <strong>#image($item.img $item.alt $item.border $item.width $item.height) $item.name</strong>
+ <a href="#">#image($item.img $item.alt $item.border $item.width $item.height) $item.name</a>
#else
#link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
#end
#else
#if ( $alignedFileName == $currentItemHref )
- <strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height)</strong>
+ <a href="#">$item.name #image($item.img $item.alt $item.border $item.width $item.height)</a>
#else
#link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height)
#end
#end
#else
#if ( $alignedFileName == $currentItemHref )
- <strong>$item.name</strong>
+ <a href="#">$item.name</a>
#else
#link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height )
#end
#end
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $collapse == "expanded" )
- <ul>
+ <ul class="nav nav-list">
#foreach( $subitem in $item.items )
#menuItem( $subitem )
#end
@@ -284,6 +290,7 @@
#end
##
#macro ( mainMenu $menus )
+<ul class="nav nav-list">
#foreach( $menu in $menus )
#if ( $menu.name )
#if ( $menu.img )
@@ -329,22 +336,21 @@
#set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + "/>" )
##
#if ( $position == "left" )
- <h3>$img $menu.name</h3>
+ <li class="nav-header">$img $menu.name</li>
#else
- <h3>$menu.name $img</h3>
+ <li class="nav-header">$menu.name $img</li>
#end
#else
- <h3>$menu.name</h3>
+ <li class="nav-header">$menu.name</li>
#end
#end
#if ( $menu.items && $menu.items.size() > 0 )
- <ul>
#foreach( $item in $menu.items )
#menuItem( $item )
#end
- </ul>
#end
#end
+</ul>
#end
##
#macro ( copyright )
@@ -978,8 +984,8 @@
#if ( $sideBarEnabled )
<div class="row-fluid">
- <div id="leftColumn" class="span2">
- <div class="well nav nav-list">
+ <div id="leftColumn" class="span3">
+ <div class="well sidebar-nav">
#publishDate( "navigation-top" $decoration.publishDate $decoration.version )
#mainMenu( $decoration.body.menus )
#publishDate( "navigation-bottom" $decoration.publishDate $decoration.version )
@@ -1002,7 +1008,7 @@
</div>
#end
- <div id="bodyColumn" #if ( $sideBarEnabled ) class="span10" #end>
+ <div id="bodyColumn" #if ( $sideBarEnabled ) class="span9" #end>
#if ( $title && $title.endsWith( "Project License" ) )
$bodyContent
#else
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css?rev=1376991&r1=1376990&r2=1376991&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-base.css Fri Aug 24 17:01:48 2012
@@ -22,5 +22,4 @@
.clear{clear:both;visibility: hidden;}
.clear hr{display: none;}
.section p,.section p,.section dt,.section dt{margin-right: 7px;margin-left: 7px;}
-#leftColumn li.none {text-indent: -1em;margin-left: 1em;}
#ohloh {margin-bottom: 10px;}
Modified: maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css?rev=1376991&r1=1376990&r2=1376991&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css (original)
+++ maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css Fri Aug 24 17:01:48 2012
@@ -39,7 +39,7 @@ a.externalLink[href^=ftp]{background: ur
a.externalLink[href^=mailto]{background: url('../images/contact-new.png') right center no-repeat;padding-right: 18px;}
li.none{list-style: none;}
-li.expanded{list-style-image: url('../images/expanded.png');}
+li.expanded{list-style-image: url('../images/expanded.png')}
li.collapsed{list-style-image: url('../images/collapsed.png');}
.search-query{background-image: url(http://www.google.com/cse/intl/en/images/google_custom_search_watermark.gif); background-attachment: initial; background-origin: initial; background-clip: initial; background-color: rgb(255, 255, 255); background-position: 0% 50%; background-repeat: no-repeat no-repeat; width:95% }
@@ -66,4 +66,8 @@ li{color:#404040;}
table.zebra-striped{background-color:#FFF}
/* avoid transparent footer */
-.footer{background-color:#EEE}
\ No newline at end of file
+.footer{background-color:#EEE}
+
+.sidebar-nav {
+ padding-left: 12px;
+}