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 2022/05/12 20:33:39 UTC
[maven-fluido-skin] branch MSKINS-187 created (now 1471e4c)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MSKINS-187
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
at 1471e4c [MSKINS-187] Wrong left margin for externalLink decoration in sidebar
This branch includes the following new commits:
new 1471e4c [MSKINS-187] Wrong left margin for externalLink decoration in sidebar
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-fluido-skin] 01/01: [MSKINS-187] Wrong left margin for externalLink decoration in sidebar
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MSKINS-187
in repository https://gitbox.apache.org/repos/asf/maven-fluido-skin.git
commit 1471e4ca86e842f096d1a4c479d2b4bb7cdc8bd8
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu May 12 22:30:29 2022 +0200
[MSKINS-187] Wrong left margin for externalLink decoration in sidebar
This closes #29
---
pom.xml | 15 +++++
src/it/mskins-177-matomo-no-options/pom.xml | 1 +
.../pom.xml | 3 +-
src/it/mskins-187/src/site/site.xml | 78 ++++++++++++++++++++++
src/main/resources/css/maven-theme.css | 44 ++++++++----
src/site/apt/ITs.apt | 2 +
6 files changed, 129 insertions(+), 14 deletions(-)
diff --git a/pom.xml b/pom.xml
index d71cba9..55abdaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -801,6 +801,21 @@ under the License.
<outputDirectory>${project.build.directory}/site/mskins-177-apache-analytics/</outputDirectory>
</configuration>
</execution>
+ <execution>
+ <id>copy-mskins-187</id>
+ <phase>site</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <resources>
+ <resource>
+ <directory>${project.build.directory}/it/mskins-187/target/site/</directory>
+ </resource>
+ </resources>
+ <outputDirectory>${project.build.directory}/site/mskins-187/</outputDirectory>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/src/it/mskins-177-matomo-no-options/pom.xml b/src/it/mskins-177-matomo-no-options/pom.xml
index c19399f..47ddab0 100644
--- a/src/it/mskins-177-matomo-no-options/pom.xml
+++ b/src/it/mskins-177-matomo-no-options/pom.xml
@@ -51,6 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
</configuration>
diff --git a/src/it/mskins-177-matomo-no-options/pom.xml b/src/it/mskins-187/pom.xml
similarity index 95%
copy from src/it/mskins-177-matomo-no-options/pom.xml
copy to src/it/mskins-187/pom.xml
index c19399f..49c9641 100644
--- a/src/it/mskins-177-matomo-no-options/pom.xml
+++ b/src/it/mskins-187/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>org.apache.maven.skins.its</groupId>
- <artifactId>mskins-177_matomo-no-options</artifactId>
+ <artifactId>mskins-187</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
@@ -51,6 +51,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>@projectInfoReportsPluginVersion@</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
</configuration>
diff --git a/src/it/mskins-187/src/site/site.xml b/src/it/mskins-187/src/site/site.xml
new file mode 100644
index 0000000..1f4c063
--- /dev/null
+++ b/src/it/mskins-187/src/site/site.xml
@@ -0,0 +1,78 @@
+<?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 ref="parent"/>
+
+ <menu name="External Links">
+ <item name="https://" href="https://example.com"/>
+ <item name="http://" href="http://example.com"/>
+ <item name="ftp://" href="ftp://example.com"/>
+ <item name="file://" href="file://example.com"/>
+ <item name="mailto:" href="mailto:info@example.com"/>
+ <item name=".asc" href="http://example.com/file.asc"/>
+ <item name=".jpg" href="http://example.com/file.jpg"/>
+ <item name=".jpeg" href="http://example.com/file.jpeg"/>
+ <item name=".gif" href="http://example.com/file.gif"/>
+ <item name=".png" href="http://example.com/file.png"/>
+ <item name=".tar.gz" href="http://example.com/file.tar.gz"/>
+ <item name=".zip" href="http://example.com/file.zip"/>
+ <item name=".md5" href="http://example.com/file.md5"/>
+ <item name=".sha1" href="http://example.com/file.sha1"/>
+ <item name="collape https://" collapse="true" href="https://example.com">
+ <item name="https://" href="https://example.com"/>
+ <item name="http://" href="http://example.com"/>
+ <item name="ftp://" href="ftp://example.com"/>
+ <item name="file://" href="file://example.com"/>
+ <item name=".asc" href="http://example.com/file.asc"/>
+ <item name=".jpg" href="http://example.com/file.jpg"/>
+ <item name=".jpeg" href="http://example.com/file.jpeg"/>
+ <item name=".gif" href="http://example.com/file.gif"/>
+ <item name=".png" href="http://example.com/file.png"/>
+ <item name=".tar.gz" href="http://example.com/file.tar.gz"/>
+ <item name=".zip" href="http://example.com/file.zip"/>
+ <item name=".md5" href="http://example.com/file.md5"/>
+ <item name=".sha1" href="http://example.com/file.sha1"/>
+ </item>
+ <item name="non-collapse .jpeg" collapse="false" href="http://example.com/file.jpeg">
+ <item name=".jpg" href="http://example.com/file.jpg"/>
+ <item name=".jpeg" href="http://example.com/file.jpeg"/>
+ </item>
+ </menu>
+
+ <menu ref="reports"/>
+
+ </body>
+
+</project>
diff --git a/src/main/resources/css/maven-theme.css b/src/main/resources/css/maven-theme.css
index 8538489..9437d91 100644
--- a/src/main/resources/css/maven-theme.css
+++ b/src/main/resources/css/maven-theme.css
@@ -25,9 +25,21 @@ a.newWindow {
background: url('../images/window-new.png') right center no-repeat;padding-right: 18px;
}
-a.externalLink[href^=http] {
+a.externalLink[href^="http://"] {
background: url('../images/internet-web-browser.png') right center no-repeat;padding-right: 18px;
}
+a.externalLink[href^="https://"] {
+ background: url('../images/application-certificate.png') right center no-repeat;padding-right: 18px;
+}
+a.externalLink[href^="file://"] {
+ background: url('../images/drive-harddisk.png') right center no-repeat;padding-right: 18px;
+}
+a.externalLink[href^="ftp://"] {
+ background: url('../images/network-server.png') right center no-repeat;padding-right: 18px;
+}
+a.externalLink[href^="mailto:"] {
+ background: url('../images/contact-new.png') right center no-repeat;padding-right: 18px;
+}
a.externalLink[href$=".asc"] {
background: url('../images/accessories-text-editor.png') right center no-repeat;padding-right: 18px;
}
@@ -45,18 +57,6 @@ a.externalLink[href$=".md5"],
a.externalLink[href$=".sha1"] {
background: url('../images/document-properties.png') right center no-repeat;padding-right: 18px;
}
-a.externalLink[href^=https] {
- background: url('../images/application-certificate.png') right center no-repeat;padding-right: 18px;
-}
-a.externalLink[href^=file] {
- background: url('../images/drive-harddisk.png') right center no-repeat;padding-right: 18px;
-}
-a.externalLink[href^=ftp] {
- background: url('../images/network-server.png') right center no-repeat;padding-right: 18px;
-}
-a.externalLink[href^=mailto] {
- background: url('../images/contact-new.png') right center no-repeat;padding-right: 18px;
-}
li.none {
list-style: none;
@@ -129,6 +129,24 @@ table.zebra-striped {
float: right;
opacity: 0.25;
}
+.sidebar-nav a.externalLink[href^="http://"],
+.sidebar-nav a.externalLink[href^="https://"],
+.sidebar-nav a.externalLink[href^="file://"],
+.sidebar-nav a.externalLink[href^="ftp://"],
+.sidebar-nav a.externalLink[href^="mailto:"],
+.sidebar-nav a.externalLink[href$=".asc"],
+.sidebar-nav a.externalLink[href$=".jpg"],
+.sidebar-nav a.externalLink[href$=".jpeg"],
+.sidebar-nav a.externalLink[href$=".gif"],
+.sidebar-nav a.externalLink[href$=".png"],
+.sidebar-nav a.externalLink[href$=".tar.gz"],
+.sidebar-nav a.externalLink[href$=".zip"],
+.sidebar-nav a.externalLink[href$=".md5"],
+.sidebar-nav a.externalLink[href$=".sha1"]
+{
+ margin-right: -6px;
+ padding-right: 22px;
+}
/* MSKINS-79: pull-right compresses list items */
li.pull-right {
diff --git a/src/site/apt/ITs.apt b/src/site/apt/ITs.apt
index ac13f3d..05f2823 100644
--- a/src/site/apt/ITs.apt
+++ b/src/site/apt/ITs.apt
@@ -92,4 +92,6 @@ Maven Fuido Skin ITs
* {{{./mskins-143_true/index.html}MSKINS-143 (using explicit true)}}
+ * {{{./mskins-187/index.html}MSKINS-187 (all sidebar icons)}}
+
[]