You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/04/15 23:26:33 UTC
[10/42] isis git commit: ISIS-1133: adding font-awesome webfonts and
other resources; updating pom comments re: imagesdir;
adding other missing resources
http://git-wip-us.apache.org/repos/asf/isis/blob/c913b2fc/adocs/pom.xml
----------------------------------------------------------------------
diff --git a/adocs/pom.xml b/adocs/pom.xml
index 8921122..ff52d94 100644
--- a/adocs/pom.xml
+++ b/adocs/pom.xml
@@ -83,13 +83,15 @@
<sourceHighlighter>coderay</sourceHighlighter>
<backend>html5</backend>
<templateDir>../template</templateDir>
- <imagesDir>.</imagesDir>
- <!--
- <relativeBaseDir>true</relativeBaseDir>
- -->
<eruby>erb</eruby>
<preserveDirectories>true</preserveDirectories>
<attributes>
+ <!--
+ in essence unsets the imagesdir attribute (the mojo hardcodes it to "images").
+ Has unfortunate side-effect of preventing docs from overriding with own value
+ (but any other value seems to be incompatible with github's built-in rendering anyway)
+ -->
+ <imagesdir/>
<icons>font</icons>
<latestStable>${version.isis.latest.stable}</latestStable>
<latestSnapshot>${version.isis.latest.snapshot}</latestSnapshot>
http://git-wip-us.apache.org/repos/asf/isis/blob/c913b2fc/adocs/template/document.html.erb
----------------------------------------------------------------------
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index d47dc14..dc528fe 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -35,10 +35,13 @@
<link rel="shortcut icon" href="<%= (attr :sitebasedir) %>/images/favicon.ico">
+<!-- selected portions of the default asciidoctor-default CSS -->
+<link href="<%= (attr :_basedir) %>css/asciidoctor/font-icon-styles.css" rel="stylesheet">
+
<script type="text/javascript" src="<%= (attr :_basedir) %>js/jquery/2.1.3/jquery.min.js"></script>
<link href="<%= (attr :_basedir) %>css/bootstrap/3.3.4/bootstrap.min.css" rel="stylesheet">
<script src="<%= (attr :_basedir) %>js/bootstrap/3.3.4/bootstrap.min.js"></script>
-<link href="<%= (attr :_basedir) %>css/font-awesome/4.3.0/font-awesome.min.css" rel="stylesheet">
+<link href="<%= (attr :_basedir) %>css/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
<style type="text/css">
@@ -116,6 +119,11 @@ div#toc li {
list-style-type: none;
}
+div#toc li.active-region:before {
+ content: "\00BB \0020";
+ margin-left: -12px;
+}
+
div#toc li a.active {
color: red;
}
@@ -136,9 +144,10 @@ div#toc {
position: fixed;
top: 20px;
height: 2000px;
- background-color: #eee;
padding-top: 120px;
padding-right: 10px;
+ border-left-color: #eee;
+ border-left-style: solid;
}
h4 {