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/12/13 15:58:21 UTC
[isis-antora] branch master updated (e2811c5 -> 7b1736e)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis-antora.git.
from e2811c5 removes mixins from menu
new f4047de switches colours
new 7b1736e changes font
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build/ui-bundle.zip | Bin 313014 -> 313018 bytes
site.yml | 1 -
src/css/extensions/colors.css | 2 +-
src/css/extensions/toc.css | 6 +++---
src/css/nav.css | 2 +-
src/css/toolbar.css | 13 +++++++++++++
src/css/vars.css | 2 +-
src/img/edit.svg | 1 +
src/partials/header-content.hbs | 4 ++--
src/partials/toc.hbs | 2 +-
src/partials/toolbar.hbs | 2 +-
11 files changed, 24 insertions(+), 11 deletions(-)
create mode 100644 src/img/edit.svg
[isis-antora] 01/02: switches colours
Posted by da...@apache.org.
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
commit f4047de00ab1102545182b81a5237ec7ccc1dc84
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 13 15:56:11 2019 +0000
switches colours
also fixes left padding of menu if min-width is narrow
also adds 'edit.svg' icon
---
build/ui-bundle.zip | Bin 313014 -> 313018 bytes
site.yml | 1 -
src/css/extensions/colors.css | 2 +-
src/css/extensions/toc.css | 6 +++---
src/css/nav.css | 2 +-
src/css/toolbar.css | 13 +++++++++++++
src/css/vars.css | 2 +-
src/img/edit.svg | 1 +
src/partials/header-content.hbs | 4 ++--
src/partials/toc.hbs | 2 +-
src/partials/toolbar.hbs | 2 +-
11 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/build/ui-bundle.zip b/build/ui-bundle.zip
index 99810f3..23cff3c 100644
Binary files a/build/ui-bundle.zip and b/build/ui-bundle.zip differ
diff --git a/site.yml b/site.yml
index 7f5c079..de53d31 100644
--- a/site.yml
+++ b/site.yml
@@ -12,7 +12,6 @@ content:
ui:
bundle:
url: build/ui-bundle.zip
- #url: \\vsins-bom-dck04\AntoraUI\build\ui-bundle.zip
snapshot: true
supplemental_files: supplemental-ui
diff --git a/src/css/extensions/colors.css b/src/css/extensions/colors.css
index c0f9b06..558a6b1 100644
--- a/src/css/extensions/colors.css
+++ b/src/css/extensions/colors.css
@@ -2,7 +2,7 @@ div.body aside.nav,
.nav-menu a,
.nav-menu span,
div.body aside.nav .nav-panel-explore {
- color: var(--color-isis-blue);
+ color: var(--color-isis-green);
}
div.body aside.nav {
diff --git a/src/css/extensions/toc.css b/src/css/extensions/toc.css
index db00b01..57803fa 100644
--- a/src/css/extensions/toc.css
+++ b/src/css/extensions/toc.css
@@ -74,9 +74,9 @@ li.tocify-item.ui-state-default > a {
aside.toc #article-toc {
padding-left: 20px;
- color: var(--color-isis-green);
- border: solid var(--color-isis-green);
- border-width: 0 0 0 0.25rem;
+ color: var(--color-isis-blue);
+ border: var(--color-isis-blue) dashed;
+ border-width: 0 0 0 0.1rem;
-o-border-image: linear-gradient(var(--color-isis-green), var(--color-isis-green)) 0 0 0 100%;
border-image: -webkit-gradient(linear, left top, left bottom, from(var(--color-isis-green))), to(var(--color-isis-green)) 0 0 0 100%;
border-image: linear-gradient(var(--color-isis-green), var(--color-isis-green)) 0 0 0 100%;
diff --git a/src/css/nav.css b/src/css/nav.css
index cfed151..8f67206 100644
--- a/src/css/nav.css
+++ b/src/css/nav.css
@@ -1,7 +1,7 @@
.nav-container {
position: fixed;
top: var(--navbar-height);
- left: 0;
+ left: 4rem;
width: 100%;
font-size: calc(17 / var(--rem-base) * 1.1rem);
z-index: var(--z-index-nav);
diff --git a/src/css/toolbar.css b/src/css/toolbar.css
index 76da9e0..55b307a 100644
--- a/src/css/toolbar.css
+++ b/src/css/toolbar.css
@@ -58,6 +58,19 @@
padding-right: 0.5rem;
}
+.edit-this-page a {
+ display: inline-block;
+ width: 100%;
+ height: 100%;
+ text-indent: 100%;
+ white-space: nowrap;
+ overflow: hidden;
+ background: url(../img/edit.svg) no-repeat 50%;
+ background-size: 50%;
+ vertical-align: top;
+ color: transparent;
+}
+
@media screen and (min-width: 1024px) {
.edit-this-page {
display: block;
diff --git a/src/css/vars.css b/src/css/vars.css
index 60f41e6..8bb1d7f 100644
--- a/src/css/vars.css
+++ b/src/css/vars.css
@@ -27,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: "Open Sans", "DejaVu Sans", sans-serif;
+ --body-font-family: "Gotham", /* "Open Sans", "DejaVu Sans", */ sans-serif;
--body-font-weight-bold: 500;
--monospace-font-family: "Roboto Mono", monospace;
--monospace-font-weight-bold: 500;
diff --git a/src/img/edit.svg b/src/img/edit.svg
new file mode 100644
index 0000000..864995f
--- /dev/null
+++ b/src/img/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 110.5 110.5" width="110.5" height="110.5"><g stroke="#666"><path d="M24.571 108.43h55.2c12.2 0 22-9.8 22-22v-15.6c0-1.2-.8-2-2-2s-2 .8-2 2v15.6c0 10-8 18-18 18h-55.2c-10 0-18-8-18-18v-55.2c0-10 8-18 18-18h15.6c1.2 0 2-.8 2-2s-.8-2-2-2h-15.6c-12.2 0-22 9.8-22 22v55.2c0 12.2 9.8 22 22 22z" fill="#666" stroke-width="4"/><path fill="none" stroke-linejoin="round" stroke-width="6" d="M29.38 80.649l4.443-17.607 13.188 13.313zM93.597 3.065l13. [...]
\ No newline at end of file
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index 26c06b9..3ae6aeb 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -14,8 +14,8 @@
<a class="navbar-link" href="#">Quick Start</a>
<div class="navbar-dropdown">
<span class="navbar-item navbar-heading">Starter Apps</span>
- <a class="navbar-item" href="{{siteRootPath}}/helloworld/about.html">Hello World</a>
- <a class="navbar-item" href="{{siteRootPath}}/simpleapp/about.html">Simple App</a>
+ <a class="navbar-item" href="{{siteRootPath}}/starters/helloworld/about.html">Hello World</a>
+ <a class="navbar-item" href="{{siteRootPath}}/starters/simpleapp/about.html">Simple App</a>
<hr class="navbar-divider"/>
<span class="navbar-item navbar-heading">Demos & Tutorials</span>
<a class="navbar-item" href="{{siteRootPath}}/demoapp/about.html">Demo App</a>
diff --git a/src/partials/toc.hbs b/src/partials/toc.hbs
index fd17976..43be6c9 100644
--- a/src/partials/toc.hbs
+++ b/src/partials/toc.hbs
@@ -1,4 +1,4 @@
<aside class="article-aside toc" role="navigation">
- <h3 class="toc-title">On this page</h3>
+ <p class="toc-title">On this page</p>
<div id="article-toc"></div>
</aside>
diff --git a/src/partials/toolbar.hbs b/src/partials/toolbar.hbs
index 251a51a..7741c72 100644
--- a/src/partials/toolbar.hbs
+++ b/src/partials/toolbar.hbs
@@ -6,6 +6,6 @@
{{> breadcrumbs}}
{{> page-versions}}
{{#if (and page.editUrl (not page.origin.private))}}
- <div class="edit-this-page"><a href="{{page.editUrl}}">Edit this Page</a></div>
+ <div class="edit-this-page"><a href="{{page.editUrl}}">edit</a></div>
{{/if}}
</div>
[isis-antora] 02/02: changes font
Posted by da...@apache.org.
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
commit 7b1736ef094c5623d1372c02f054e56ef5050cab
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 13 15:56:52 2019 +0000
changes font
---
src/css/vars.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/css/vars.css b/src/css/vars.css
index 8bb1d7f..7d21555 100644
--- a/src/css/vars.css
+++ b/src/css/vars.css
@@ -27,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: "Gotham", /* "Open Sans", "DejaVu Sans", */ sans-serif;
+ --body-font-family: "Gotham", "Open Sans", "DejaVu Sans", sans-serif;
--body-font-weight-bold: 500;
--monospace-font-family: "Roboto Mono", monospace;
--monospace-font-weight-bold: 500;