You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/07/30 20:20:09 UTC
[freemarker-docgen] branch master updated: Improved page header:
logo click area shouldn't extend beyond the logo image. Some overall
cleanup in header layout.
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/freemarker-docgen.git
The following commit(s) were added to refs/heads/master by this push:
new aa3c920 Improved page header: logo click area shouldn't extend beyond the logo image. Some overall cleanup in header layout.
aa3c920 is described below
commit aa3c9206841dae9ac3edc783dbcc3d8aa952acdc
Author: ddekany <dd...@apache.org>
AuthorDate: Thu Jul 30 22:20:02 2020 +0200
Improved page header: logo click area shouldn't extend beyond the logo image. Some overall cleanup in header layout.
---
.../docgen/core/less/lib/components/logo.less | 17 +++++++++++++----
.../docgen/core/less/lib/components/secondary-tabs.less | 1 -
.../freemarker/docgen/core/less/lib/layout/header.less | 14 +++++++++++---
.../org/freemarker/docgen/core/templates/header.ftlh | 8 +++++---
4 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/logo.less b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/logo.less
index aed244a..575411b 100644
--- a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/logo.less
+++ b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/logo.less
@@ -17,13 +17,22 @@
* under the License.
*/
.logo {
- padding: 6px 0 0;
- display: block;
+ text-align: center;
+ // We have a line of text under us, whose bottom looks further away from the header edge
+ padding: 3px 0 0 0;
+
+ @media (min-width: @screen-xs-min) {
+ flex: 0 0 auto;
+ padding: 0;
+ }
+
+ a {
+ display: inline-block;
+ }
img {
+ display: inline-block;
// @todo: externalize width and height
- display: block;
- margin: 0 auto;
width: 204px;
height: 19px;
}
diff --git a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/secondary-tabs.less b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/secondary-tabs.less
index 1f90562..e5ab27f 100644
--- a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/secondary-tabs.less
+++ b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/components/secondary-tabs.less
@@ -19,7 +19,6 @@
.secondary-tabs {
margin: 0;
list-style-type: none;
- padding: 6px 0 0;
display: none;
text-align: center;
diff --git a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/layout/header.less b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/layout/header.less
index 265def0..6bfc89c 100644
--- a/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/layout/header.less
+++ b/freemarker-docgen-core/src/main/resources-gulp/org/freemarker/docgen/core/less/lib/layout/header.less
@@ -31,14 +31,22 @@
.header-top {
text-align: center;
- padding: 12px 0;
+ padding-top: 13px;
+ padding-bottom: 13px;
@media (min-width: @screen-xs-min) {
- padding-bottom: 18px;
+ padding-top: 15px;
+ padding-bottom: 15px;
+
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
- align-items: flex-end;
+ align-items: center;
+ }
+
+ @media (min-width: @screen-sm-min) {
+ padding-top: 18px;
+ padding-bottom: 18px;
}
}
diff --git a/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/header.ftlh b/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/header.ftlh
index 6dde134..1e8993b 100644
--- a/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/header.ftlh
+++ b/freemarker-docgen-core/src/main/resources/org/freemarker/docgen/core/templates/header.ftlh
@@ -27,9 +27,11 @@
<div class="site-width header-top"><#t>
<div id="hamburger-menu" role="button"></div><#t>
<#if logo??>
- <a class="logo" href="${logo.href}" role="banner"><#t>
- <img itemprop="image" src="${logo.src}" alt="${logo.alt}"><#t>
- </a><#t>
+ <div class="logo">
+ <a href="${logo.href}" role="banner"><#t>
+ <img itemprop="image" src="${logo.src}" alt="${logo.alt}"><#t>
+ </a><#t>
+ </div>
</#if>
<@nav.tabs /><#t>
<#if secondaryTabs??>