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/19 11:36:18 UTC
[isis-antora] branch master updated: sorts out menu spacing
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 b55ec06 sorts out menu spacing
b55ec06 is described below
commit b55ec06c9c519ec5ddbc9cf42dc33d4259adcd22
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Dec 19 11:35:55 2019 +0000
sorts out menu spacing
---
build/ui-bundle.zip | Bin 313508 -> 314752 bytes
preview-src/about.adoc | 4 ++--
src/css/header.css | 15 +++++++++++++++
src/css/menu-styling.css | 4 ++--
src/css/nav.css | 1 -
src/css/toolbar.css | 2 +-
src/img/home.png | Bin 0 -> 1173 bytes
src/partials/header-content.hbs | 13 +++++++++----
src/partials/toolbar.hbs | 2 +-
9 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/build/ui-bundle.zip b/build/ui-bundle.zip
index 86617cf..dc1f635 100644
Binary files a/build/ui-bundle.zip and b/build/ui-bundle.zip differ
diff --git a/preview-src/about.adoc b/preview-src/about.adoc
index 9ec78ee..807f84c 100644
--- a/preview-src/about.adoc
+++ b/preview-src/about.adoc
@@ -22,8 +22,8 @@
[discrete]
== Starter Apps
-* xref:starters:helloworld:about.adoc[Hello World]
-* xref:starters:simpleapp:about.adoc[SimpleApp]
+* link:https://github.com/apache/isis-app-helloworld[Hello World]
+* link:https://github.com/apache/isis-app-simpleapp[SimpleApp]
|
[discrete]
diff --git a/src/css/header.css b/src/css/header.css
index 95a436e..4d140b0 100644
--- a/src/css/header.css
+++ b/src/css/header.css
@@ -141,6 +141,21 @@ body {
display: block;
}
+.navbar-brand .navbar-item .icon img {
+ width: 2rem;
+ height: 2rem;
+}
+
+.navbar-brand .navbar-item .icon {
+ margin-left: 0;
+ margin-right: 1.2rem;
+}
+
+.navbar-item .icon img {
+ width: 1.1rem;
+ height: 1.1rem;
+}
+
.navbar-link {
padding-right: 2.5em;
}
diff --git a/src/css/menu-styling.css b/src/css/menu-styling.css
index edf9e68..cb8145a 100644
--- a/src/css/menu-styling.css
+++ b/src/css/menu-styling.css
@@ -13,10 +13,10 @@ span.navbar-item {
}
a.navbar-item > span.icon {
- width: 60px;
+ margin-left: 40px;
+ margin-right: 10px;
}
a.navbar-item > span.icon > img {
margin-top: -13px;
- margin-left: 23px;
}
diff --git a/src/css/nav.css b/src/css/nav.css
index 8f67206..d7774c4 100644
--- a/src/css/nav.css
+++ b/src/css/nav.css
@@ -1,7 +1,6 @@
.nav-container {
position: fixed;
top: var(--navbar-height);
- 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 55b307a..df02c27 100644
--- a/src/css/toolbar.css
+++ b/src/css/toolbar.css
@@ -55,7 +55,7 @@
.edit-this-page {
display: none;
- padding-right: 0.5rem;
+ padding-right: 1.2rem;
}
.edit-this-page a {
diff --git a/src/img/home.png b/src/img/home.png
new file mode 100644
index 0000000..5b76a2d
Binary files /dev/null and b/src/img/home.png differ
diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs
index 010caa0..23cdc08 100644
--- a/src/partials/header-content.hbs
+++ b/src/partials/header-content.hbs
@@ -1,7 +1,12 @@
<header class="header">
<nav class="navbar">
<div class="navbar-brand">
- <a class="navbar-item" href="{{or site.url (or siteRootUrl siteRootPath)}}">{{site.title}}</a>
+ <a class="navbar-item" href="{{or site.url (or siteRootUrl siteRootPath)}}">
+ <span class="icon">
+ <img src="{{siteRootPath}}/_/img/isis-logo-48x48.png"></img>
+ </span>
+ <span>{{site.title}}</span>
+ </a>
<button class="navbar-burger" data-target="topbar-nav">
<span></span>
<span></span>
@@ -9,7 +14,7 @@
</button>
</div>
<div id="topbar-nav" class="navbar-menu">
- <div class="navbar-end">
+ <a class="navbar-end">
<div class="navbar-item has-dropdown is-hoverable">
<a class="navbar-link" href="#">Quick Start</a>
<div class="navbar-dropdown">
@@ -82,7 +87,7 @@
</div>
</div>
<div class="navbar-item has-dropdown is-hoverable">
- <a class="navbar-link" href="#">@ASF</a>
+ <a class="navbar-link" href="#">ASF</a>
<div class="navbar-dropdown">
<a class="navbar-item" href="http://www.apache.org/">Apache Homepage</a>
<a class="navbar-item" href="https://www.apache.org/events/current-event">Events</a>
@@ -96,7 +101,7 @@
</div>
<a class="navbar-item" href="{{siteRootPath}}/toc/about.html">
<span class="icon">
- <img src="{{siteRootPath}}/_/img/isis-logo-48x48.png"></img>
+ <img src="{{siteRootPath}}/_/img/home.png"></img>
</span>
</a>
</div>
diff --git a/src/partials/toolbar.hbs b/src/partials/toolbar.hbs
index 7741c72..698721a 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</a></div>
+ <div class="edit-this-page"><a href="{{page.editUrl}}">Edit</a></div>
{{/if}}
</div>