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 2017/05/08 23:09:57 UTC
[48/79] isis git commit: ISIS-1579: comment out the datanucleus theme,
header-links, documentation table
ISIS-1579: comment out the datanucleus theme, header-links, documentation table
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f8968445
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f8968445
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f8968445
Branch: refs/heads/master
Commit: f89684452364adf6e2137bec8d673988b33ccfc3
Parents: c9e1890
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 7 12:41:43 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 7 12:41:56 2017 +0100
----------------------------------------------------------------------
.../src/main/asciidoc/css/datanucleus_theme.css | 3 ++
.../src/main/asciidoc/documentation.adoc | 6 ++--
.../src/main/asciidoc/downloads.adoc | 3 +-
adocs/template/document.html.erb | 32 +++++++++++++++++---
4 files changed, 34 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f8968445/adocs/documentation/src/main/asciidoc/css/datanucleus_theme.css
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/css/datanucleus_theme.css b/adocs/documentation/src/main/asciidoc/css/datanucleus_theme.css
index 99c2597..7b8007f 100644
--- a/adocs/documentation/src/main/asciidoc/css/datanucleus_theme.css
+++ b/adocs/documentation/src/main/asciidoc/css/datanucleus_theme.css
@@ -1,5 +1,8 @@
/** DataNucleus theming of Bootstrap-based site */
+
+// have kept for reference...
+
// Tables
table { border-collapse: collapse; border-spacing: 0; }
table { background: white; margin-bottom: 1.25em; border: solid 1px #d8d8ce; }
http://git-wip-us.apache.org/repos/asf/isis/blob/f8968445/adocs/documentation/src/main/asciidoc/documentation.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/documentation.adoc b/adocs/documentation/src/main/asciidoc/documentation.adoc
index 9370208..ef0ca8c 100644
--- a/adocs/documentation/src/main/asciidoc/documentation.adoc
+++ b/adocs/documentation/src/main/asciidoc/documentation.adoc
@@ -20,7 +20,7 @@ pass:[<br/>]
[.documentation-page]
--
-[cols="1a,1a,1a",frame="none"]
+[cols="1a,1a,1a",frame="none", grid="none"]
|===
| *What is Apache Isis?*
@@ -53,7 +53,7 @@ pass:[<br/>]
|===
-[cols="1a,1a,1a"]
+[cols="1a,1a,1a",frame="none", grid="none"]
|===
|*User Guides:*
@@ -95,7 +95,7 @@ pass:[<br/>]
-[cols="1a,1a,1a",frame="none"]
+[cols="1a,1a,1a",frame="none", grid="none"]
|===
|*Releases:*
http://git-wip-us.apache.org/repos/asf/isis/blob/f8968445/adocs/documentation/src/main/asciidoc/downloads.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/downloads.adoc b/adocs/documentation/src/main/asciidoc/downloads.adoc
index 66e5d12..dd066e6 100644
--- a/adocs/documentation/src/main/asciidoc/downloads.adoc
+++ b/adocs/documentation/src/main/asciidoc/downloads.adoc
@@ -15,8 +15,7 @@ Use for prototyping or production.
== Getting Started
-If you just want to get going quickly, we suggest using our Maven archetype.
-For more information, see xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[SimpleApp archetype][here].
+If you just want to get going quickly, we suggest using our xref:guides/ugfun.adoc#_ugfun_getting-started_simpleapp-archetype[Maven archetype].
http://git-wip-us.apache.org/repos/asf/isis/blob/f8968445/adocs/template/document.html.erb
----------------------------------------------------------------------
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index 0bde8dd..e44596d 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -43,7 +43,6 @@
for the table of contents.
* jQuery (necessary for Bootstrap's JavaScript plugins)
* Font-Awesome for some icons used by Asciidoctor
- NOTE: tried using Font-Awesome CSS locally but then fails to work!
Also:
* Bootswatch "flatly" theme for Bootstrap (https://bootswatch.com/flatly).
@@ -51,14 +50,13 @@
* add a link to all headers (home-grown, adapted from blog posts)
* integration of elasticlunr.js (home-grown, adapted from blog posts)
-->
- <!--
- <link href="<%= (attr :_basedir) %>css/bootswatch/3.3.7/bootstrap-cosmo.css" rel="stylesheet"/>
- -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootswatch/3.3.7/flatly/bootstrap.min.css" rel="stylesheet">
<link href="<%= (attr :_basedir) %>css/bootstrap-toc/0.4.1/bootstrap-toc.min.css" rel="stylesheet"/>
<link href="<%= (attr :_basedir) %>css/asciidoctor/foundation.css" rel="stylesheet"/>
+ <!--
<link href="<%= (attr :_basedir) %>css/datanucleus_theme.css" rel="stylesheet"/>
+ -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet">
@@ -68,7 +66,6 @@
end
%>
-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="<%= (attr :_basedir) %>js/bootstrap/3.3.7/bootstrap.min.js"></script>
<script src="<%= (attr :_basedir) %>js/bootstrap-toc/0.4.1/bootstrap-toc.min.js"></script>
@@ -103,6 +100,31 @@
</style>
<style>
+
+ /* from http://ben.balter.com/2014/03/13/pages-anchor-links/ */
+ .header-link {
+ position: absolute;
+ left: -0.5em;
+ opacity: 0;
+
+ /*
+ -webkit-transition: opacity 0.2s ease-in-out 0.1s;
+ -moz-transition: opacity 0.2s ease-in-out 0.1s;
+ -ms-transition: opacity 0.2s ease-in-out 0.1s;
+ */
+ }
+
+ h2:hover .header-link,
+ h3:hover .header-link,
+ h4:hover .header-link,
+ h5:hover .header-link,
+ h6:hover .header-link {
+ opacity: 1;
+ }
+
+ </style>
+
+ <style>
body > div.container {
margin-top: 80px;
}