Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
cybozu-neco committed Apr 4, 2024
1 parent d87fef3 commit f77afa5
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 25 deletions.
4 changes: 3 additions & 1 deletion 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@
<div class="sidebar-scrollbox">
<ol class="chapter"><li class="chapter-item expanded affix "><a href="index.html">Template</a></li><li class="chapter-item expanded affix "><li class="part-title">User manual</li><li class="chapter-item expanded affix "><li class="part-title">Developer documents</li><li class="chapter-item expanded "><a href="release.html"><strong aria-hidden="true">1.</strong> Release procedure</a></li></ol>
</div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle">
<div class="sidebar-resize-indicator"></div>
</div>
</nav>

<!-- Track and set sidebar scroll position -->
Expand Down
35 changes: 27 additions & 8 deletions css/chrome.css
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,14 @@ pre > .buttons button {
/* On mobile, make it easier to tap buttons. */
padding: 0.3rem 1rem;
}

.sidebar-resize-indicator {
/* Hide resize indicator on devices with limited accuracy */
display: none;
}
}
pre > code {
display: block;
padding: 1rem;
}

Expand Down Expand Up @@ -422,22 +428,35 @@ ul#searchresults span.teaser em {
position: absolute;
cursor: col-resize;
width: 0;
right: 0;
right: calc(var(--sidebar-resize-indicator-width) * -1);
top: 0;
bottom: 0;
display: flex;
align-items: center;
}

.sidebar-resize-handle .sidebar-resize-indicator {
width: 100%;
height: 12px;
background-color: var(--icons);
margin-inline-start: var(--sidebar-resize-indicator-space);
}

[dir=rtl] .sidebar .sidebar-resize-handle {
left: calc(var(--sidebar-resize-indicator-width) * -1);
right: unset;
}
[dir=rtl] .sidebar .sidebar-resize-handle { right: unset; left: 0; }
.js .sidebar .sidebar-resize-handle {
cursor: col-resize;
width: 5px;
width: calc(var(--sidebar-resize-indicator-width) - var(--sidebar-resize-indicator-space));
}
/* sidebar-hidden */
#sidebar-toggle-anchor:not(:checked) ~ .sidebar {
transform: translateX(calc(0px - var(--sidebar-width)));
transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
z-index: -1;
}
[dir=rtl] #sidebar-toggle-anchor:not(:checked) ~ .sidebar {
transform: translateX(var(--sidebar-width));
transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
}
.sidebar::-webkit-scrollbar {
background: var(--sidebar-bg);
Expand All @@ -448,15 +467,15 @@ ul#searchresults span.teaser em {

/* sidebar-visible */
#sidebar-toggle-anchor:checked ~ .page-wrapper {
transform: translateX(var(--sidebar-width));
transform: translateX(calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width)));
}
[dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
transform: translateX(calc(0px - var(--sidebar-width)));
transform: translateX(calc(0px - var(--sidebar-width) - var(--sidebar-resize-indicator-width)));
}
@media only screen and (min-width: 620px) {
#sidebar-toggle-anchor:checked ~ .page-wrapper {
transform: none;
margin-inline-start: var(--sidebar-width);
margin-inline-start: calc(var(--sidebar-width) + var(--sidebar-resize-indicator-width));
}
[dir=rtl] #sidebar-toggle-anchor:checked ~ .page-wrapper {
transform: none;
Expand Down
2 changes: 1 addition & 1 deletion css/print.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

#page-wrapper.page-wrapper {
transform: none;
transform: none !important;
margin-inline-start: 0px;
overflow-y: initial;
}
Expand Down
2 changes: 2 additions & 0 deletions css/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

:root {
--sidebar-width: 300px;
--sidebar-resize-indicator-width: 8px;
--sidebar-resize-indicator-space: 2px;
--page-padding: 15px;
--content-max-width: 750px;
--menu-bar-height: 50px;
Expand Down
49 changes: 48 additions & 1 deletion highlight.js

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@
<div class="sidebar-scrollbox">
<ol class="chapter"><li class="chapter-item expanded affix "><a href="index.html" class="active">Template</a></li><li class="chapter-item expanded affix "><li class="part-title">User manual</li><li class="chapter-item expanded affix "><li class="part-title">Developer documents</li><li class="chapter-item expanded "><a href="release.html"><strong aria-hidden="true">1.</strong> Release procedure</a></li></ol>
</div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle">
<div class="sidebar-resize-indicator"></div>
</div>
</nav>

<!-- Track and set sidebar scroll position -->
Expand Down
14 changes: 8 additions & 6 deletions print.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@
<div class="sidebar-scrollbox">
<ol class="chapter"><li class="chapter-item expanded affix "><a href="index.html">Template</a></li><li class="chapter-item expanded affix "><li class="part-title">User manual</li><li class="chapter-item expanded affix "><li class="part-title">Developer documents</li><li class="chapter-item expanded "><a href="release.html"><strong aria-hidden="true">1.</strong> Release procedure</a></li></ol>
</div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle">
<div class="sidebar-resize-indicator"></div>
</div>
</nav>

<!-- Track and set sidebar scroll position -->
Expand Down Expand Up @@ -201,22 +203,22 @@ <h2 id="bump-version"><a class="header" href="#bump-version">Bump version</a></h
<ol>
<li>
<p>Determine a new version number. Then set <code>VERSION</code> variable.</p>
<pre><code class="language-console"># Set VERSION and confirm it. It should not have &quot;v&quot; prefix.
<pre><code class="language-console"># Set VERSION and confirm it. It should not have "v" prefix.
$ VERSION=x.y.z
$ echo $VERSION
</code></pre>
</li>
<li>
<p>Make a branch to release</p>
<pre><code class="language-console">$ git neco dev &quot;bump-$VERSION&quot;
<pre><code class="language-console">$ git neco dev "bump-$VERSION"
</code></pre>
</li>
<li>
<p>Edit <code>CHANGELOG.md</code> for the new version (<a href="https://github.com/cybozu-go/etcdpasswd/commit/77d95384ac6c97e7f48281eaf23cb94f68867f79">example</a>).</p>
</li>
<li>
<p>Commit the change and push it.</p>
<pre><code class="language-console">$ git commit -a -m &quot;Bump version to $VERSION&quot;
<pre><code class="language-console">$ git commit -a -m "Bump version to $VERSION"
$ git neco review
</code></pre>
</li>
Expand All @@ -231,12 +233,12 @@ <h2 id="bump-version"><a class="header" href="#bump-version">Bump version</a></h

$ git checkout main
$ git pull
$ git tag -a -m &quot;Release v$VERSION&quot; &quot;v$VERSION&quot;
$ git tag -a -m "Release v$VERSION" "v$VERSION"

# Make sure the release tag exists.
$ git tag -ln | grep $VERSION

$ git push origin &quot;v$VERSION&quot;
$ git push origin "v$VERSION"
</code></pre>
</li>
</ol>
Expand Down
14 changes: 8 additions & 6 deletions release.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@
<div class="sidebar-scrollbox">
<ol class="chapter"><li class="chapter-item expanded affix "><a href="index.html">Template</a></li><li class="chapter-item expanded affix "><li class="part-title">User manual</li><li class="chapter-item expanded affix "><li class="part-title">Developer documents</li><li class="chapter-item expanded "><a href="release.html" class="active"><strong aria-hidden="true">1.</strong> Release procedure</a></li></ol>
</div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
<div id="sidebar-resize-handle" class="sidebar-resize-handle">
<div class="sidebar-resize-indicator"></div>
</div>
</nav>

<!-- Track and set sidebar scroll position -->
Expand Down Expand Up @@ -202,22 +204,22 @@ <h2 id="bump-version"><a class="header" href="#bump-version">Bump version</a></h
<ol>
<li>
<p>Determine a new version number. Then set <code>VERSION</code> variable.</p>
<pre><code class="language-console"># Set VERSION and confirm it. It should not have &quot;v&quot; prefix.
<pre><code class="language-console"># Set VERSION and confirm it. It should not have "v" prefix.
$ VERSION=x.y.z
$ echo $VERSION
</code></pre>
</li>
<li>
<p>Make a branch to release</p>
<pre><code class="language-console">$ git neco dev &quot;bump-$VERSION&quot;
<pre><code class="language-console">$ git neco dev "bump-$VERSION"
</code></pre>
</li>
<li>
<p>Edit <code>CHANGELOG.md</code> for the new version (<a href="https://github.com/cybozu-go/etcdpasswd/commit/77d95384ac6c97e7f48281eaf23cb94f68867f79">example</a>).</p>
</li>
<li>
<p>Commit the change and push it.</p>
<pre><code class="language-console">$ git commit -a -m &quot;Bump version to $VERSION&quot;
<pre><code class="language-console">$ git commit -a -m "Bump version to $VERSION"
$ git neco review
</code></pre>
</li>
Expand All @@ -232,12 +234,12 @@ <h2 id="bump-version"><a class="header" href="#bump-version">Bump version</a></h

$ git checkout main
$ git pull
$ git tag -a -m &quot;Release v$VERSION&quot; &quot;v$VERSION&quot;
$ git tag -a -m "Release v$VERSION" "v$VERSION"

# Make sure the release tag exists.
$ git tag -ln | grep $VERSION

$ git push origin &quot;v$VERSION&quot;
$ git push origin "v$VERSION"
</code></pre>
</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion searcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ window.search = window.search || {};

// Eventhandler for keyevents on `document`
function globalKeyHandler(e) {
if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey || e.target.type === 'textarea' || e.target.type === 'text') { return; }
if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey || e.target.type === 'textarea' || e.target.type === 'text' || !hasFocus() && /^(?:input|select|textarea)$/i.test(e.target.nodeName)) { return; }

if (e.keyCode === ESCAPE_KEYCODE) {
e.preventDefault();
Expand Down

0 comments on commit f77afa5

Please sign in to comment.