From 2e0a2845abe87f709b9f797eef615c6be1e272f5 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Wed, 11 Oct 2017 07:40:25 -0400
Subject: [PATCH] Top-level main.css for all asciidoctor styles

Properly separate tocbot from asciidoctor styles and use main.css to
include both.
---
 gradle/docs.gradle                            |  4 ++--
 .../{spring.css => asciidoctor-spring.css}    | 17 --------------
 src/docs/asciidoc/stylesheets/main.css        | 23 +++++++++++++++++++
 3 files changed, 25 insertions(+), 19 deletions(-)
 rename src/docs/asciidoc/stylesheets/{spring.css => asciidoctor-spring.css} (98%)
 create mode 100644 src/docs/asciidoc/stylesheets/main.css

diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 303ddff42d..be68b7f0ff 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -85,7 +85,7 @@ asciidoctor {
 	}
 	resources {
 		from(sourceDir) {
-			include 'images/**', 'tocbot-3.0.2/**'
+			include 'images/*', 'stylesheets/*', 'tocbot-3.0.2/*'
 		}
 	}
 	logDocuments = true
@@ -104,7 +104,7 @@ asciidoctor {
 			sectnums: '',
 			'source-highlighter': 'coderay@', // TODO switch to 'rouge' once supported by the html5 backend
 			stylesdir: 'stylesheets/',
-			stylesheet: 'spring.css',
+			stylesheet: 'main.css',
 			'spring-version': project.version
 
 }
diff --git a/src/docs/asciidoc/stylesheets/spring.css b/src/docs/asciidoc/stylesheets/asciidoctor-spring.css
similarity index 98%
rename from src/docs/asciidoc/stylesheets/spring.css
rename to src/docs/asciidoc/stylesheets/asciidoctor-spring.css
index 7344557070..ef230432fd 100644
--- a/src/docs/asciidoc/stylesheets/spring.css
+++ b/src/docs/asciidoc/stylesheets/asciidoctor-spring.css
@@ -1,21 +1,4 @@
 @import url(https://fonts.googleapis.com/css?family=Varela+Round|Montserrat:400,700);
-@import url('../tocbot-3.0.2/tocbot.css');
-
-/* See https://github.com/asciidoctor/asciidoctor/issues/699#issuecomment-321066006 */
-/* ================================================================================ */
-#tocbot a.toc-link.node-name--H1{ font-style: italic }
-@media screen{
-#tocbot > ul.toc-list{ margin-bottom: 0.5em; margin-left: 0.125em }
-#tocbot ul.sectlevel0, #tocbot a.toc-link.node-name--H1 + ul{
-  padding-left: 0 }
-#tocbot a.toc-link{ height:100% }
-.is-collapsible{ max-height:3000px; overflow:hidden; }
-.is-collapsed{ max-height:0 }
-.is-active-link{ font-weight:700 }
-}
-@media print{
-#tocbot a.toc-link.node-name--H4{ display:none }
-}
 /* ================================================================================ */
 
 /*! normalize.css v2.1.2 | MIT License | git.io/normalize */
diff --git a/src/docs/asciidoc/stylesheets/main.css b/src/docs/asciidoc/stylesheets/main.css
new file mode 100644
index 0000000000..bea3e21885
--- /dev/null
+++ b/src/docs/asciidoc/stylesheets/main.css
@@ -0,0 +1,23 @@
+/* https://github.com/bclozel/asciidoctor-stylesheet-factory/tree/spring */
+/* ===================================================================== */
+
+@import url('stylesheets/asciidoctor-spring.css');
+
+/* https://github.com/asciidoctor/asciidoctor/issues/699#issuecomment-321066006 */
+/* ============================================================================ */
+
+@import url('tocbot-3.0.2/tocbot.css');
+
+#tocbot a.toc-link.node-name--H1{ font-style: italic }
+@media screen{
+#tocbot > ul.toc-list{ margin-bottom: 0.5em; margin-left: 0.125em }
+#tocbot ul.sectlevel0, #tocbot a.toc-link.node-name--H1 + ul{
+  padding-left: 0 }
+#tocbot a.toc-link{ height:100% }
+.is-collapsible{ max-height:3000px; overflow:hidden; }
+.is-collapsed{ max-height:0 }
+.is-active-link{ font-weight:700 }
+}
+@media print{
+#tocbot a.toc-link.node-name--H4{ display:none }
+}