You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/12/25 19:35:30 UTC
svn commit: r1647913 [1/3] - in /maven/skins/trunk/maven-fluido-skin: ./
src/main/resources/META-INF/maven/ src/main/resources/css/
src/main/resources/js/
Author: michaelo
Date: Thu Dec 25 18:35:30 2014
New Revision: 1647913
URL: http://svn.apache.org/r1647913
Log:
[MSKINS-96] Downgrade to Bootstrap 2.3.x
Added:
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/bootstrap-2.3.2.css
maven/skins/trunk/maven-fluido-skin/src/main/resources/js/bootstrap-2.3.2.js
Removed:
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/bootstrap-2.2.2.css
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/bootstrap-3.0.2.css
maven/skins/trunk/maven-fluido-skin/src/main/resources/js/bootstrap-2.2.2.js
maven/skins/trunk/maven-fluido-skin/src/main/resources/js/bootstrap-3.0.2.js
Modified:
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/META-INF/maven/site.vm
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1647913&r1=1647912&r2=1647913&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Thu Dec 25 18:35:30 2014
@@ -93,7 +93,7 @@ under the License.
</contributors>
<properties>
- <bootstrap.version>3.0.2</bootstrap.version>
+ <bootstrap.version>2.3.2</bootstrap.version>
<jquery.version>1.10.2</jquery.version>
</properties>
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=1647913&r1=1647912&r2=1647913&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 Thu Dec 25 18:35:30 2014
@@ -269,17 +269,17 @@
##
#if ( $item && $item.items && $item.items.size() > 0 )
#if ( $item.collapse == false )
- #set ( $collapseClass = "glyphicon glyphicon-chevron-down" )
+ #set ( $collapseClass = "icon-chevron-down" )
#else
## By default collapsed
- #set ( $collapseClass = "glyphicon glyphicon-chevron-right" )
+ #set ( $collapseClass = "icon-chevron-right" )
#end
##
#set ( $display = false )
#displayTree( $display $item )
##
#if ( $alignedFileName == $currentItemHref || $display )
- #set ( $collapseClass = "glyphicon glyphicon-chevron-down" )
+ #set ( $collapseClass = "icon-chevron-down" )
#end
#end
@@ -311,7 +311,7 @@
#end
#end
#if ( $item && $item.items && $item.items.size() > 0 )
- #if ( $collapseClass == "glyphicon glyphicon-chevron-down" )
+ #if ( $collapseClass == "icon-chevron-down" )
<ul class="nav nav-list">
#foreach( $subitem in $item.items )
#menuItem( $subitem )
@@ -964,21 +964,21 @@
#end
- <div id="topbar" class="navbar navbar-default $navBarStyle" role="navigation">
+ <div id="topbar" class="navbar navbar-fixed-top $navBarStyle">
<div class="navbar-inner">
#if ( $sideBarEnabled )
- <div class="container">
- <a data-target=".navbar-collapse" data-toggle="collapse" class="btn navbar-btn">
- <span class="glyphicon glyphicon-bar"></span>
- <span class="glyphicon glyphicon-bar"></span>
- <span class="glyphicon glyphicon-bar"></span>
- </a>
+ <div class="container-fluid">
+ <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </a>
#else
#if ( $decoration.custom.getChild('fluidoSkin')
&& $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ) )
- <div class="container" style="$decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ).getValue()"><div class="navbar-collapse">
+ <div class="container" style="$decoration.custom.getChild( 'fluidoSkin' ).getChild( 'topBarContainerStyle' ).getValue()"><div class="nav-collapse">
#else
- <div class="container"><div class="navbar-collapse">
+ <div class="container"><div class="nav-collapse">
#end
#end
@@ -997,7 +997,7 @@
#set ( $hrf = './' )
#end
#end
- <a class="navbar-brand" href="$hrf" #if( $topBarIcon.getChild( 'alt' ) ) title="$topBarIcon.getChild( 'alt' ).getValue()"#end>
+ <a class="brand" href="$hrf" #if( $topBarIcon.getChild( 'alt' ) ) title="$topBarIcon.getChild( 'alt' ).getValue()"#end>
#if( $topBarIcon.getChild( 'name' ) )
#set ( $topBarIconName = $topBarIcon.getChild( 'name' ).getValue() )
@@ -1029,7 +1029,7 @@
## MSKINS-31
#if( $decoration.body && $decoration.body.menus )
- <ul class="nav navbar-nav">
+ <ul class="nav">
#topMenu( $decoration.body.menus )
</ul>
#end
@@ -1049,7 +1049,7 @@
#if( $decoration.body
&& $decoration.body.links
&& $decoration.body.links.size() > 0 )
- <ul class="nav navbar-nav">
+ <ul class="nav pull-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">External Links <b class="caret"></b></a>
<ul class="dropdown-menu">
@@ -1068,8 +1068,11 @@
</div>
#end
+ #if ( $sideBarEnabled )
+ <div class="container-fluid">
+ #else
<div class="container">
-
+ #end
<div id="banner">
<div class="pull-left">
#if( $decoration.bannerLeft )
@@ -1105,13 +1108,13 @@
</div>
#if ( $sideBarEnabled )
- #set ($leftColumnClass="col-md-3")
+ #set ($leftColumnClass="span3")
#if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
&& $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'leftColumnClass' ) )
#set ( $leftColumnClass = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'leftColumnClass' ).getValue() )
#end
- <div class="row">
+ <div class="row-fluid">
<div id="leftColumn" class="$leftColumnClass">
<div class="well sidebar-nav">
#publishDate( "navigation-top" $decoration.publishDate $decoration.version )
@@ -1138,7 +1141,7 @@
</div>
#end
- #set ($bodyColumnClass="col-md-9")
+ #set ($bodyColumnClass="span9")
#if ( $decoration.custom && $decoration.custom.getChild('fluidoSkin')
&& $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'bodyColumnClass' ) )
#set ( $bodyColumnClass = $decoration.custom.getChild( 'fluidoSkin' ).getChild( 'bodyColumnClass' ).getValue() )
@@ -1167,9 +1170,16 @@
<hr/>
<footer>
-
+ #if ( $sideBarEnabled )
+ <div class="container-fluid">
+ #else
<div class="container">
+ #end
+ #if ( $sideBarEnabled )
+ <div class="row-fluid">
+ #else
<div class="row">
+ #end
#if ( $decoration.custom.getChild( 'fluidoSkin' ) && $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass') )
#set ( $copyrightClass = 'class="' + $decoration.custom.getChild( 'fluidoSkin' ).getChild('copyrightClass').getValue() + '"' )
#end