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 2019/11/13 08:27:05 UTC
[isis-antora] branch master updated: adding some colors
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis-antora.git
The following commit(s) were added to refs/heads/master by this push:
new e6173c3 adding some colors
e6173c3 is described below
commit e6173c35a27df6ccc7b5741fe37f948c7538ac71
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Nov 13 08:26:53 2019 +0000
adding some colors
---
src/css/extensions/colors.css | 9 +++++++++
src/css/extensions/margins.css | 20 ++++++++++++++++++++
src/css/extensions/toc.css | 42 ++++++++++++++++++++++++++++++++++-------
src/css/nav.css | 4 ++--
src/css/site.css | 2 ++
src/css/vars.css | 14 +++++++++-----
src/partials/body.hbs | 2 +-
src/partials/footer-content.hbs | 4 +++-
src/partials/toc.hbs | 4 +---
9 files changed, 82 insertions(+), 19 deletions(-)
diff --git a/src/css/extensions/colors.css b/src/css/extensions/colors.css
new file mode 100644
index 0000000..e31b8d4
--- /dev/null
+++ b/src/css/extensions/colors.css
@@ -0,0 +1,9 @@
+div.body aside.nav,
+
+.nav-menu a {
+ color: var(--color-isis-green);
+}
+
+
+
+
diff --git a/src/css/extensions/margins.css b/src/css/extensions/margins.css
new file mode 100644
index 0000000..427175e
--- /dev/null
+++ b/src/css/extensions/margins.css
@@ -0,0 +1,20 @@
+header .navbar-brand {
+ margin-left: 4rem;
+}
+header #topbar-nav {
+ margin-right: 4rem;
+}
+
+div.nav-container aside.nav .panels {
+ padding-top: 3rem;
+}
+
+div.body {
+ margin-left: 4rem;
+ margin-right: 4rem;
+}
+
+footer .content {
+ margin-left: 4rem;
+ margin-right: 4rem;
+}
diff --git a/src/css/extensions/toc.css b/src/css/extensions/toc.css
index 6a3680f..2134094 100644
--- a/src/css/extensions/toc.css
+++ b/src/css/extensions/toc.css
@@ -3,12 +3,15 @@
.article-aside {
display: block;
position: fixed;
- top: 150px;
+ top: 130px;
right: 0;
font-size: 0.9em;
border-left: dotted 1px #e1e1e1;
- padding-left: 1rem;
- width: 22rem;
+ width: 26rem;
+ }
+
+ .article-toc {
+ padding-left: 0rem;
}
.article-aside.hidden {
@@ -40,10 +43,6 @@ li.tocify-item.ui-state-default > a {
font-weight: bolder;
}
-#article-toc {
- padding-left: 10px;
-}
-
.tocify-subheader {
padding-left: 10px;
}
@@ -57,3 +56,32 @@ li.tocify-item.ui-state-default > a {
padding-left: 30px;
display: none;
}
+
+.-toc aside.toc {
+ display: none;
+}
+
+@media screen and (min-width: 1025px) {
+ .-toc .doc {
+ width: 100%;
+ }
+}
+
+.-toc .doc {
+ max-width: 100%;
+}
+
+aside.toc #article-toc {
+ padding-left: 20px;
+ color: var(--color-isis-blue);
+ border: solid var(--color-isis-red);
+ border-width: 0 0 0 .25rem;
+ -o-border-image: linear-gradient(var(--color-isis-blue),var(--color-isis-red)) 0 0 0 100%;
+ border-image: -webkit-gradient(linear,left top,left bottom,from(var(--color-isis-blue))),to(var(--color-isis-red)) 0 0 0 100%;
+ border-image: linear-gradient(var(--color-isis-blue),var(--color-isis-red)) 0 0 0 100%;
+ margin-bottom: 1.5rem;
+}
+
+.toc-title {
+ color: var(--color-isis-blue);
+}
diff --git a/src/css/nav.css b/src/css/nav.css
index 8ecf7b5..ee79452 100644
--- a/src/css/nav.css
+++ b/src/css/nav.css
@@ -3,7 +3,7 @@
top: var(--navbar-height);
left: 0;
width: 100%;
- font-size: calc(17 / var(--rem-base) * 1rem);
+ font-size: calc(17 / var(--rem-base) * 1.2rem);
z-index: var(--z-index-nav);
visibility: hidden;
}
@@ -16,7 +16,7 @@
@media screen and (min-width: 1024px) {
.nav-container {
- font-size: calc(15.5 / var(--rem-base) * 1rem);
+ font-size: calc(15.5 / var(--rem-base) * 1.2rem);
flex: none;
position: static;
top: 0;
diff --git a/src/css/site.css b/src/css/site.css
index cd11c9d..9865b62 100644
--- a/src/css/site.css
+++ b/src/css/site.css
@@ -20,3 +20,5 @@
@import "menu-styling.css";
@import "admonitions.css";
@import "extensions/toc.css";
+@import "extensions/margins.css";
+@import "extensions/colors.css";
diff --git a/src/css/vars.css b/src/css/vars.css
index 0f1065c..5fd6f32 100644
--- a/src/css/vars.css
+++ b/src/css/vars.css
@@ -16,6 +16,10 @@
--color-jet-70: #222;
--color-jet-80: #191919;
--color-black: #000;
+ --color-isis-red: #AF3734;
+ --color-isis-orange: #F3882A;
+ --color-isis-green: #87A83F;
+ --color-isis-blue: #3C76BD;
/* fonts */
--rem-base: 18; /* used to compute rem value from desired pixel value (e.g., calc(18 / var(--rem-base) * 1rem) = 18px) */
--body-font-size: 1.0625em; /* 17px */
@@ -23,7 +27,7 @@
--body-font-size--print: 0.9375em; /* 15px */
--body-line-height: 1.15;
--body-font-color: var(--color-jet-70);
- --body-font-family: "Roboto", sans-serif;
+ --body-font-family: "Open Sans", "DejaVu Sans", sans-serif;
--body-font-weight-bold: 500;
--monospace-font-family: "Roboto Mono", monospace;
--monospace-font-weight-bold: 500;
@@ -43,7 +47,7 @@
--navbar-menu-font-color: var(--body-font-color);
--navbar-menu_hover-background: var(--color-smoke-50);
/* nav */
- --nav-background: var(--panel-background);
+ --nav-background: var(--color-smoke-30);
--nav-border-color: var(--color-gray-10);
--nav-line-height: 1.35;
--nav-heading-font-color: var(--color-jet-30);
@@ -75,7 +79,7 @@
--doc-line-height: 1.6;
--doc-margin: 0 auto;
--doc-margin--desktop: 0 2rem;
- --heading-font-color: var(--color-jet-80);
+ --heading-font-color: var(--color-isis-red);
--heading-font-weight: normal;
--alt-heading-font-weight: var(--body-font-weight-bold);
--section-divider-color: var(--panel-border-color);
@@ -106,8 +110,8 @@
--table-border-color: var(--panel-border-color);
/* footer */
--footer-line-height: var(--doc-line-height);
- --footer-background: var(--color-smoke-90);
- --footer-font-color: var(--color-gray-70);
+ --footer-background: var(--color-jet-80);
+ --footer-font-color: var(--color-white);
--footer-link-font-color: var(--color-jet-80);
/* dimensions */
--navbar-height: calc(63 / var(--rem-base) * 1rem);
diff --git a/src/partials/body.hbs b/src/partials/body.hbs
index 4a0ac25..5734ab4 100644
--- a/src/partials/body.hbs
+++ b/src/partials/body.hbs
@@ -1,4 +1,4 @@
-<div class="body">
+<div class="body {{#if page.attributes.role}} {{page.attributes.role}}{{/if}}">
{{> nav}}
{{> main}}
</div>
diff --git a/src/partials/footer-content.hbs b/src/partials/footer-content.hbs
index 6d8408c..99c5149 100644
--- a/src/partials/footer-content.hbs
+++ b/src/partials/footer-content.hbs
@@ -1,3 +1,5 @@
<footer class="footer">
- <p>Revision: {{env "REVISION" }}</p>
+ <div class="content">
+ <p>Revision: {{env "REVISION" }}</p>
+ </div>
</footer>
diff --git a/src/partials/toc.hbs b/src/partials/toc.hbs
index 95d5551..fd17976 100644
--- a/src/partials/toc.hbs
+++ b/src/partials/toc.hbs
@@ -1,6 +1,4 @@
-{{#if (eq page.attributes.toc '')}}
-<aside class="article-aside" role="navigation">
+<aside class="article-aside toc" role="navigation">
<h3 class="toc-title">On this page</h3>
<div id="article-toc"></div>
</aside>
-{{/if}}