Every opam2web site should use opam2web.css

Also, factored more demo-specific style into site.css.
ocaml-opam · Aug 23, 2014 · 87963e9 · 87963e9
1 parent 5398c79
commit 87963e9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/content/template.xhtml b/content/template.xhtml
@@ -15,7 +15,6 @@
     <link rel="stylesheet" href="/ext/js/google-code-prettify/prettify.css" />
     <link rel="stylesheet" href="/ext/css/site.css" />
     <t:insert name="head" />
-    <link href="/ext/css/opam2web.css" type="text/css" rel="stylesheet" />
     <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>

diff --git a/ext/css/opam2web.css b/ext/css/opam2web.css
@@ -19,7 +19,6 @@
   clear: both;
   text-align: center;
   padding-top:20px;
-  border-top: 10px #EBEBEB solid;
 } 
 
 .footer .copyright {
@@ -104,13 +103,3 @@ tr.embedded-formula > td:last-child {
   width: 100%;
   text-align: right;
 }
-
-
-h2 {
-  border-bottom: 1px solid lightgrey;
-  padding-top: 5px;
-}
-
-h2, h3, h4 {
-  margin-top: 1ex;
-}
diff --git a/ext/css/site.css b/ext/css/site.css
@@ -90,3 +90,16 @@ code {
 html, body {
   height: 100%;
 }
+
+.footer {
+  border-top: 10px #EBEBEB solid;
+}
+
+h2 {
+  border-bottom: 1px solid lightgrey;
+  padding-top: 5px;
+}
+
+h2, h3, h4 {
+  margin-top: 1ex;
+}
diff --git a/src/o2wTemplate.ml b/src/o2wTemplate.ml
@@ -38,8 +38,10 @@ let create ~title ~header ~body ~footer ~depth =
     "ext/js/search.js";
   ] in
   let prepend_root = prepend_root depth in
+  let css = "ext/css/opam2web.css" in
   let head_html =
     <:html<
+      <link href=$str: prepend_root css$ type="text/css" rel="stylesheet" />
       <meta name="generator" content=$str: "opam2web " ^ Version.string$ />
     >>
   in