updating icons and toc display
diff --git a/src/main/org/freemarker/docgen/less/lib/components/breadcrumb.less b/src/main/org/freemarker/docgen/less/lib/components/breadcrumb.less
index 944f76b..66d7d32 100644
--- a/src/main/org/freemarker/docgen/less/lib/components/breadcrumb.less
+++ b/src/main/org/freemarker/docgen/less/lib/components/breadcrumb.less
@@ -7,8 +7,6 @@
@media (min-width: @screen-sm-min) {
font-size: 13px;
- padding-top: 9px;
- height: 28px;
}
li {
diff --git a/src/main/org/freemarker/docgen/less/lib/components/notices.less b/src/main/org/freemarker/docgen/less/lib/components/notices.less
index 59182fc..2c93c9f 100644
--- a/src/main/org/freemarker/docgen/less/lib/components/notices.less
+++ b/src/main/org/freemarker/docgen/less/lib/components/notices.less
@@ -18,7 +18,7 @@
height: 10px;
display: inline-block;
padding-right: 5px;
- font-size: 10px;
+ font-size: 12px;
}
&:hover {
diff --git a/src/main/org/freemarker/docgen/less/lib/components/search-form.less b/src/main/org/freemarker/docgen/less/lib/components/search-form.less
index 26b0e32..ce673dc 100644
--- a/src/main/org/freemarker/docgen/less/lib/components/search-form.less
+++ b/src/main/org/freemarker/docgen/less/lib/components/search-form.less
@@ -1,17 +1,17 @@
.search-form {
- @input-height: 30px;
+ @input-height: 28px;
height: @input-height;
width: 100%;
display: inline-block;
- margin-top: 3px;
+ margin-bottom: 3px;
&.offline {
display: none;
}
@media (min-width: @screen-md-min) {
- margin-top: 9px;
+ margin-bottom: 6px;
max-width: 300px;
}
@@ -19,8 +19,7 @@
height: @input-height;
}
-
- .gsc-search-button,
+// .gsc-search-button,
.search-btn {
color: @brand-color;
line-height: 1;
diff --git a/src/main/org/freemarker/docgen/less/lib/components/table-of-contents.less b/src/main/org/freemarker/docgen/less/lib/components/table-of-contents.less
index 4a2bb54..61f6daf 100644
--- a/src/main/org/freemarker/docgen/less/lib/components/table-of-contents.less
+++ b/src/main/org/freemarker/docgen/less/lib/components/table-of-contents.less
@@ -7,6 +7,18 @@
@media (min-width: @screen-sm-min) {
font-size: 13px;
}
+
+ .current {
+ &::before {
+ color: @link-hover;
+ }
+
+ > a {
+ &:first-child {
+ color: @link-hover;
+ }
+ }
+ }
}
@section-spacing: 24px;
@@ -56,11 +68,12 @@
list-style-type: none;
li {
- padding-left: 16px;
+ padding-left: 14px;
position: relative;
&::before {
.icon();
+ .icon-dot-single();
width: 14px;
height: 14px;
display: block;
@@ -72,13 +85,15 @@
&.has-children {
&::before {
- .icon-chevron-small-right();
+ .icon-plus();
+ font-size: 13px;
cursor: pointer;
}
&.open {
&::before {
- .icon-chevron-small-down();
+ .icon-minus();
+ font-size: 13px;
}
}
@@ -108,18 +123,6 @@
font-size: 13px;
}
-.current {
- &::before {
- color: @link-hover;
- }
-
- > a {
- &:first-child {
- color: @link-hover;
- }
- }
-}
-
.closed {
ul {
display: none;
diff --git a/src/main/org/freemarker/docgen/less/lib/icons.less b/src/main/org/freemarker/docgen/less/lib/icons.less
index 2edf6ac..9319a17 100644
--- a/src/main/org/freemarker/docgen/less/lib/icons.less
+++ b/src/main/org/freemarker/docgen/less/lib/icons.less
@@ -25,7 +25,7 @@
}
.icon-book() {
- content: "\e603";
+ content: "\e604";
}
.icon-search() {
@@ -33,7 +33,7 @@
}
.icon-heart-o() {
- content: "\f08a";
+ content: "\e609";
}
.icon-twitter() {
@@ -69,9 +69,21 @@
}
.icon-bookmark() {
- content: "\e604";
+ content: "\e607";
}
.icon-star-outlined() {
content: "\e605";
}
+
+.icon-plus() {
+ content: "\e605";
+}
+
+.icon-minus() {
+ content: "\e606";
+}
+
+.icon-code() {
+ content: "\e608";
+}
diff --git a/src/main/org/freemarker/docgen/less/lib/layout/header.less b/src/main/org/freemarker/docgen/less/lib/layout/header.less
index a123eb1..392f9e6 100644
--- a/src/main/org/freemarker/docgen/less/lib/layout/header.less
+++ b/src/main/org/freemarker/docgen/less/lib/layout/header.less
@@ -50,7 +50,8 @@
line-height: 1;
@media (min-width: @screen-sm-min) {
- font-size: 24px;
+ font-size: 27px;
+ margin-bottom: 3px;
}
}
diff --git a/src/main/org/freemarker/docgen/statics/fonts/icomoon.eot b/src/main/org/freemarker/docgen/statics/fonts/icomoon.eot
index 68613ed..6e9b2a9 100644
--- a/src/main/org/freemarker/docgen/statics/fonts/icomoon.eot
+++ b/src/main/org/freemarker/docgen/statics/fonts/icomoon.eot
Binary files differ
diff --git a/src/main/org/freemarker/docgen/statics/fonts/icomoon.svg b/src/main/org/freemarker/docgen/statics/fonts/icomoon.svg
index 5272cc2..b10eb54 100644
--- a/src/main/org/freemarker/docgen/statics/fonts/icomoon.svg
+++ b/src/main/org/freemarker/docgen/statics/fonts/icomoon.svg
@@ -10,11 +10,14 @@
<glyph unicode="" d="M687.002 570.419c13.875 13.722 36.301 13.722 50.074 0 13.824-13.722 13.926-35.891 0-49.613l-200.090-196.096c-13.824-13.722-36.198-13.722-50.125 0l-200.090 196.096c-13.824 13.67-13.824 35.891 0 49.613 13.875 13.722 36.301 13.722 50.074 0l175.155-160.819 175.002 160.819z" />
<glyph unicode="" d="M563.2 460.8l-160.819 175.104c-13.722 13.824-13.722 36.198 0 50.074 13.722 13.824 35.891 13.824 49.613 0l196.096-200.090c13.722-13.875 13.722-36.301 0-50.125l-196.096-200.090c-13.67-13.926-35.891-13.824-49.613 0-13.722 13.773-13.722 36.198 0 50.074l160.819 175.053z" />
<glyph unicode="" d="M399.36 460.8c0-62.208 50.483-112.64 112.691-112.64s112.589 50.483 112.589 112.64c0 62.208-50.381 112.589-112.589 112.589s-112.691-50.381-112.691-112.589z" />
-<glyph unicode="" d="M896 832v-832h-672c-53.026 0-96 42.98-96 96s42.974 96 96 96h608v768h-640c-70.398 0-128-57.6-128-128v-768c0-70.4 57.602-128 128-128h768v896h-64zM224.056 128v0c-0.018-0.002-0.038 0-0.056 0-17.672 0-32-14.326-32-32s14.328-32 32-32c0.018 0 0.038 0.002 0.056 0.002v-0.002h607.89v64h-607.89z" />
-<glyph unicode="" d="M716.8 870.4v-870.4l-204.8 204.8-204.8-204.8v870.4c0 28.314 29.952 52.224 51.2 51.2h307.2c35.277 1.024 51.2-22.886 51.2-51.2z" />
-<glyph unicode="" d="M962.56 562.074h-328.346l-122.214 344.166-122.317-344.166h-328.294l267.878-202.086-95.795-354.765 278.528 212.685 278.426-212.685-95.693 354.765 267.827 202.086zM512 318.31l-154.317-128 63.642 182.374-145.971 117.76 180.326-5.171 56.32 206.848 56.269-206.848 180.275 5.171-145.971-117.76 63.642-182.374-154.214 128z" />
+<glyph unicode="" d="M298.667 512l213.333-213.333 213.333 213.333z" />
+<glyph unicode="" d="M1024 832h-128v128h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768v640h128l-128 128 128 128zM768 64h-512v768h512v-768zM384 704h256v-128h-256z" />
+<glyph unicode="" d="M810.667 384h-256v-256h-85.333v256h-256v85.333h256v256h85.333v-256h256v-85.333z" />
+<glyph unicode="" d="M810.667 384h-597.333v85.333h597.333v-85.333z" />
+<glyph unicode="" d="M768 972.8h-204.8c-28.314 0-51.2-22.886-51.2-51.2l1.178-11.366c56.422 0 102.4-45.926 102.4-102.4v-581.581l50.022 60.467 153.6-184.32v819.2c0 28.314-22.886 51.2-51.2 51.2zM461.978 819.2h-205.978c-28.314 0-51.2-22.886-51.2-51.2v-819.2l153.6 184.32 153.6-184.32v819.2c0 28.314-21.709 51.2-50.022 51.2z" />
+<glyph unicode="" d="M292.813 217.6c-12.083 0-24.269 4.25-33.997 12.902l-259.072 230.298 273.459 243.098c21.094 18.688 53.453 16.896 72.243-4.25s16.896-53.504-4.25-72.294l-187.341-166.554 172.954-153.702c21.146-18.79 23.040-51.149 4.25-72.294-10.086-11.418-24.166-17.203-38.246-17.203zM750.797 217.702l273.459 243.098-259.072 230.298c-21.146 18.79-53.504 16.896-72.243-4.25-18.79-21.146-16.896-53.504 4.25-72.294l172.954-153.754-187.341-166.502c-21.146-18.79-23.040-51.149-4.25-72.294 10.086-11.418 24.166-17.203 38.246-17.203 12.083 0 24.269 4.25 33.997 12.902zM511.283 145.152l102.4 614.4c4.659 27.904-14.182 54.272-42.086 58.931-28.006 4.71-54.323-14.182-58.88-42.086l-102.4-614.4c-4.659-27.904 14.182-54.272 42.086-58.931 2.867-0.461 5.632-0.666 8.448-0.666 24.576 0 46.285 17.766 50.432 42.752z" />
+<glyph unicode="" d="M880.128 760.013c-85.606 78.592-224.41 78.592-310.016 0l-58.112-53.299-58.163 53.299c-85.606 78.592-224.358 78.592-309.965 0-96.307-88.371-96.307-231.373 0-319.744l368.128-337.869 368.128 337.869c96.256 88.371 96.256 231.424 0 319.744zM825.549 492.8l-313.549-292.608-313.6 292.608c-31.59 29.030-43.827 66.918-43.827 107.213s7.066 73.37 38.707 102.349c27.904 25.651 65.434 39.782 105.626 39.782 40.141 0 77.67-24.371 105.574-50.074l107.52-93.44 107.469 93.491c27.955 25.702 65.434 50.074 105.626 50.074s77.722-14.131 105.626-39.782c31.642-28.979 38.656-62.054 38.656-102.349s-12.186-78.234-43.827-107.264z" />
<glyph unicode="" d="M658.286 475.428q0 105.714-75.143 180.857t-180.857 75.143-180.857-75.143-75.143-180.857 75.143-180.857 180.857-75.143 180.857 75.143 75.143 180.857zM950.857 0q0-29.714-21.714-51.429t-51.429-21.714q-30.857 0-51.429 21.714l-196 195.429q-102.286-70.857-228-70.857-81.714 0-156.286 31.714t-128.571 85.714-85.714 128.571-31.714 156.286 31.714 156.286 85.714 128.571 128.571 85.714 156.286 31.714 156.286-31.714 128.571-85.714 85.714-128.571 31.714-156.286q0-125.714-70.857-228l196-196q21.143-21.143 21.143-51.429z" horiz-adv-x="951" />
-<glyph unicode="" d="M950.857 610.286q0 46.286-12.286 81.714t-31.429 56.286-46.571 34-53.714 17.714-56 4.571-64-14.571-63.143-36.571-49.429-41.143-34.286-35.143q-10.286-12.571-28-12.571t-28 12.571q-13.714 16-34.286 35.143t-49.429 41.143-63.143 36.571-64 14.571-56-4.571-53.714-17.714-46.571-34-31.429-56.286-12.286-81.714q0-96 106.857-202.857l332-320 331.429 319.429q107.429 107.429 107.429 203.429zM1024 610.286q0-126.286-130.857-257.143l-356-342.857q-10.286-10.286-25.143-10.286t-25.143 10.286l-356.571 344q-5.714 4.571-15.714 14.857t-31.714 37.429-38.857 55.714-30.571 69.143-13.429 78.857q0 125.714 72.571 196.571t200.571 70.857q35.429 0 72.286-12.286t68.571-33.143 54.571-39.143 43.429-38.857q20.571 20.571 43.429 38.857t54.571 39.143 68.571 33.143 72.286 12.286q128 0 200.571-70.857t72.571-196.571z" />
<glyph unicode="" d="M925.714 717.714q-38.286-56-92.571-95.429 0.571-8 0.571-24 0-74.286-21.714-148.286t-66-142-105.429-120.286-147.429-83.429-184.571-31.143q-154.857 0-283.429 82.857 20-2.286 44.571-2.286 128.571 0 229.143 78.857-60 1.143-107.429 36.857t-65.143 91.143q18.857-2.857 34.857-2.857 24.571 0 48.571 6.286-64 13.143-106 63.714t-42 117.429v2.286q38.857-21.714 83.429-23.429-37.714 25.143-60 65.714t-22.286 88q0 50.286 25.143 93.143 69.143-85.143 168.286-136.286t212.286-56.857q-4.571 21.714-4.571 42.286 0 76.571 54 130.571t130.571 54q80 0 134.857-58.286 62.286 12 117.143 44.571-21.143-65.714-81.143-101.714 53.143 5.714 106.286 28.571z" horiz-adv-x="951" />
<glyph unicode="" d="M877.714 438.857q0-143.429-83.714-258t-216.286-158.571q-15.429-2.857-22.571 4t-7.143 17.143v120.571q0 55.429-29.714 81.143 32.571 3.429 58.571 10.286t53.714 22.286 46.286 38 30.286 60 11.714 86q0 69.143-45.143 117.714 21.143 52-4.571 116.571-16 5.143-46.286-6.286t-52.571-25.143l-21.714-13.714q-53.143 14.857-109.714 14.857t-109.714-14.857q-9.143 6.286-24.286 15.429t-47.714 22-49.143 7.714q-25.143-64.571-4-116.571-45.143-48.571-45.143-117.714 0-48.571 11.714-85.714t30-60 46-38.286 53.714-22.286 58.571-10.286q-22.857-20.571-28-58.857-12-5.714-25.714-8.571t-32.571-2.857-37.429 12.286-31.714 35.714q-10.857 18.286-27.714 29.714t-28.286 13.714l-11.429 1.714q-12 0-16.571-2.571t-2.857-6.571 5.143-8 7.429-6.857l4-2.857q12.571-5.714 24.857-21.714t18-29.143l5.714-13.143q7.429-21.714 25.143-35.143t38.286-17.143 39.714-4 31.714 2l13.143 2.286q0-21.714 0.286-50.857t0.286-30.857q0-10.286-7.429-17.143t-22.857-4q-132.571 44-216.286 158.571t-83.714 258q0 119.429 58.857 220.286t159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
<glyph unicode="" d="M530.286 150.286v-86.286l-404-0.571v86.286zM668 348v-400.571l-0.571-20v-0.571l-667.429 0.571v420.571h69.143v-353.143h530.286v353.143h68.571zM137.714 297.714l402.286-37.143-7.429-85.714-402.857 37.143zM176.571 478.286l390.286-104.571-22.286-83.429-390.286 104.571zM269.714 677.714l348-205.714-44-74.286-348 205.714zM475.429 866.857l227.429-334.286-70.857-48.571-228 333.714zM734.286 950.857l69.143-398.286-85.143-14.857-69.143 398.286z" horiz-adv-x="805" />
diff --git a/src/main/org/freemarker/docgen/statics/fonts/icomoon.ttf b/src/main/org/freemarker/docgen/statics/fonts/icomoon.ttf
index 064aaf2..64ff10d 100644
--- a/src/main/org/freemarker/docgen/statics/fonts/icomoon.ttf
+++ b/src/main/org/freemarker/docgen/statics/fonts/icomoon.ttf
Binary files differ
diff --git a/src/main/org/freemarker/docgen/statics/fonts/icomoon.woff b/src/main/org/freemarker/docgen/statics/fonts/icomoon.woff
index 6fb4650..65eec8a 100644
--- a/src/main/org/freemarker/docgen/statics/fonts/icomoon.woff
+++ b/src/main/org/freemarker/docgen/statics/fonts/icomoon.woff
Binary files differ
diff --git a/src/main/org/freemarker/docgen/statics/main.js b/src/main/org/freemarker/docgen/statics/main.js
index fd18cae..200f322 100644
--- a/src/main/org/freemarker/docgen/statics/main.js
+++ b/src/main/org/freemarker/docgen/statics/main.js
@@ -27,6 +27,7 @@
var node = children[x];
var li = document.createElement('li');
+ var isLast = checkIfLast(node);
if (LEVEL === 0) {
li.classList.add('section');
@@ -44,7 +45,10 @@
li.appendChild(menuLink(node));
if (node.title === breadcrumb[depth + 1] && onPath) {
- li.classList.add('current');
+
+ if (depth + 2 === breadcrumb.length) {
+ li.classList.add('current');
+ }
// 'section' is always open
if (LEVEL !== 0) {
@@ -58,7 +62,7 @@
} else {
}
- var isLast = checkIfLast(node);
+
if (isLast) {
diff --git a/src/main/org/freemarker/docgen/templates/header.ftl b/src/main/org/freemarker/docgen/templates/header.ftl
index 4117d17..734fc16 100644
--- a/src/main/org/freemarker/docgen/templates/header.ftl
+++ b/src/main/org/freemarker/docgen/templates/header.ftl
@@ -30,8 +30,8 @@
<@nav.breadcrumb /><#t>
</div>
<div class="header-right">
- <@nav.bookmarks /><#t>
<@searchForm /><#t>
+ <@nav.bookmarks /><#t>
</div>
</div>
</div>
