You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/07/03 21:19:34 UTC
svn commit: r1356876 - in /maven/skins/trunk/maven-fluido-skin: ./
src/it/mskins-28/ src/it/mskins-28/src/ src/it/mskins-28/src/site/
src/it/mskins-28/src/site/apt/ src/main/resources/css/
Author: rfscholte
Date: Tue Jul 3 19:19:33 2012
New Revision: 1356876
URL: http://svn.apache.org/viewvc?rev=1356876&view=rev
Log:
Fix MSKINS-28: Make it possible to center "powered by" logos in sidebar
Added:
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/pom.xml
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/apt/
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/apt/index.apt.vm
maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/site.xml
Modified:
maven/skins/trunk/maven-fluido-skin/pom.xml
maven/skins/trunk/maven-fluido-skin/src/main/resources/css/maven-theme.css
Modified: maven/skins/trunk/maven-fluido-skin/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/pom.xml?rev=1356876&r1=1356875&r2=1356876&view=diff
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/pom.xml (original)
+++ maven/skins/trunk/maven-fluido-skin/pom.xml Tue Jul 3 19:19:33 2012
@@ -450,6 +450,21 @@
</configuration>
</execution>
<execution>
+ <id>copy-mskins-28</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-28/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-28/</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-mskins-31</id>
<phase>site</phase>
<goals>
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/pom.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/pom.xml?rev=1356876&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/pom.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/pom.xml Tue Jul 3 19:19:33 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.skins.its</groupId>
+ <artifactId>mskins-28</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <description>
+ Multiple logo's in the leftside bar
+ </description>
+
+ <properties>
+ <skinName>@project.name@</skinName>
+ <skinDescription>@project.description@</skinDescription>
+ <skinGroupId>@project.groupId@</skinGroupId>
+ <skinArtifactId>@project.artifactId@</skinArtifactId>
+ <skinVersion>@project.version@</skinVersion>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/apt/index.apt.vm?rev=1356876&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/apt/index.apt.vm (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/apt/index.apt.vm Tue Jul 3 19:19:33 2012
@@ -0,0 +1,16 @@
+ ------
+ ${project.name}
+ ------
+ Andreas Sewe
+ ------
+ 2012-12-26
+ ------
+
+${project.name}
+
+ This is a test for ${skinName} with multiple "powered by" logos.
+ ${skinDescription}
+
+* Actual configuration
+
+%{snippet|id=skin-custom-config|file=${project.basedir}/src/site/site.xml}
Added: maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/site.xml?rev=1356876&view=auto
==============================================================================
--- maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/site.xml (added)
+++ maven/skins/trunk/maven-fluido-skin/src/it/mskins-28/src/site/site.xml Tue Jul 3 19:19:33 2012
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ -->
+
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
+ name="${skinName}">
+
+ <skin>
+ <groupId>${skinGroupId}</groupId>
+ <artifactId>${skinArtifactId}</artifactId>
+ <version>${skinVersion}</version>
+ </skin>
+
+ <body>
+ <menu name="Overview">
+ <item name="Introduction" href="index.html"/>
+ </menu>
+ </body>
+
+ <!-- START SNIPPET: skin-custom-config -->
+ <poweredBy>
+ <logo name="First Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+ <!-- Second logo is wider than the sidebar -->
+ <logo name="Second Logo" width="500px" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+ <!-- Third and forth logo fit next to eachother in the sidebar -->
+ <logo name="Third Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+ <logo name="Fourth Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+ <logo name="Fifth Logo" img="./images/logos/maven-feather.png" href="http://maven.apache.org/"/>
+ </poweredBy>
+ <!-- END SNIPPET: skin-custom-config -->
+
+</project>
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=1356876&r1=1356875&r2=1356876&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 Tue Jul 3 19:19:33 2012
@@ -47,8 +47,8 @@ li.collapsed{list-style-image: url('../i
body.topBarEnabled{padding-top: 60px;}
body.topBarDisabled{padding-top: 20px;}
-#poweredBy{text-align: center;}
-.poweredBy{margin-top: 10px;}
+.poweredBy{display: block;}
+img.poweredBy{margin: 10px auto;}
/* Tweaks to the bootstrap theme
--------------------------------- */