Skip to content

Commit 1ddf872

Browse files
committed
Switched annotation markers to + signs in non-print contexts
1 parent 16939c1 commit 1ddf872

File tree

14 files changed

+67
-42
lines changed

14 files changed

+67
-42
lines changed

material/assets/javascripts/bundle.a5f8ea78.min.js renamed to material/assets/javascripts/bundle.17f42bbf.min.js

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/javascripts/bundle.17f42bbf.min.js.map

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/javascripts/bundle.a5f8ea78.min.js.map

-8
This file was deleted.

material/assets/stylesheets/main.52c8dc4b.min.css renamed to material/assets/stylesheets/main.2d264350.min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.2d264350.min.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.52c8dc4b.min.css.map

-1
This file was deleted.

material/base.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
{% endif %}
3535
{% endblock %}
3636
{% block styles %}
37-
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.52c8dc4b.min.css' | url }}">
37+
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.2d264350.min.css' | url }}">
3838
{% if config.theme.palette %}
3939
{% set palette = config.theme.palette %}
4040
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.9204c3b2.min.css' | url }}">
@@ -213,7 +213,7 @@
213213
</script>
214214
{% endblock %}
215215
{% block scripts %}
216-
<script src="{{ 'assets/javascripts/bundle.a5f8ea78.min.js' | url }}"></script>
216+
<script src="{{ 'assets/javascripts/bundle.17f42bbf.min.js' | url }}"></script>
217217
{% for path in config["extra_javascript"] %}
218218
<script src="{{ path | url }}"></script>
219219
{% endfor %}

material/overrides/assets/javascripts/bundle.05395296.min.js

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/overrides/assets/javascripts/bundle.ab1cf86a.min.js.map renamed to material/overrides/assets/javascripts/bundle.05395296.min.js.map

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/overrides/assets/javascripts/bundle.ab1cf86a.min.js

-18
This file was deleted.

material/overrides/main.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
{% endblock %}
1717
{% block scripts %}
1818
{{ super() }}
19-
<script src="{{ 'overrides/assets/javascripts/bundle.ab1cf86a.min.js' | url }}"></script>
19+
<script src="{{ 'overrides/assets/javascripts/bundle.05395296.min.js' | url }}"></script>
2020
{% endblock %}

src/assets/javascripts/browser/element/focus/index.ts

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import {
2424
Observable,
25+
debounceTime,
2526
distinctUntilChanged,
2627
fromEvent,
2728
map,
@@ -43,6 +44,9 @@ import { getActiveElement } from "../_"
4344
* within the elements itself. A better solutions are `focusin` and `focusout`
4445
* events, which bubble up the tree and allow for more fine-grained control.
4546
*
47+
* `debounceTime` is necessary, because when a focus change happens inside an
48+
* element, the observable would first emit `false` and then `true` again.
49+
*
4650
* @param el - Element
4751
*
4852
* @returns Element focus observable
@@ -55,6 +59,7 @@ export function watchElementFocus(
5559
fromEvent(document.body, "focusout")
5660
)
5761
.pipe(
62+
debounceTime(1),
5863
map(() => {
5964
const active = getActiveElement()
6065
return typeof active !== "undefined"

src/assets/javascripts/templates/annotation/index.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ export function renderAnnotation(id: number): HTMLElement {
3939
<div class="md-annotation__inner md-tooltip">
4040
<div class="md-tooltip__inner md-typeset"></div>
4141
</div>
42-
<span class="md-annotation__index">{id}</span>
42+
<span class="md-annotation__index">
43+
<span data-md-annotation-id={id}></span>
44+
</span>
4345
</aside>
4446
)
4547
}

src/assets/stylesheets/main/layout/_tooltip.scss

+18
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,24 @@
214214
}
215215
}
216216

217+
// Annotation marker content
218+
[data-md-annotation-id]::before {
219+
display: inline-block;
220+
transition: transform 400ms cubic-bezier(0.1, 0.7, 0.1, 1);
221+
content: attr(data-md-annotation-id);
222+
223+
// [not print]: if we're not in print mode, show a `+` sign instead of
224+
// the original numbers, as context is already given by the position.
225+
@media not print {
226+
content: "+";
227+
228+
// Annotation marker content on focus
229+
:focus-within > & {
230+
transform: rotate(45deg);
231+
}
232+
}
233+
}
234+
217235
// Annotation index on focus/hover
218236
:is(:focus-within, :hover) > & {
219237
color: var(--md-accent-bg-color);

0 commit comments

Comments
 (0)