Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing Highlighter branch "use mark for highlights" #2242

Closed
wants to merge 86 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
b91db7d
Add start-selected messages
RoyEJohnson Apr 23, 2024
e94ee04
Use .focus for current highlight
RoyEJohnson May 17, 2024
0e8e2ae
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 13, 2024
4ccaf24
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 14, 2024
fb9690c
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 14, 2024
b8cb8e7
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 17, 2024
38fa593
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 26, 2024
ec88838
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 27, 2024
ed6d552
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 27, 2024
6180862
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 27, 2024
51ac3e8
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jun 28, 2024
535b5ac
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 2, 2024
afd68af
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 8, 2024
040aed3
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 10, 2024
8ea9314
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 10, 2024
5f60976
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 10, 2024
d3a018d
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 16, 2024
961a033
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 16, 2024
40ebcc4
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 18, 2024
69d1e0a
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 18, 2024
be2b333
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 18, 2024
09d2deb
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 25, 2024
84dd116
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 26, 2024
684baa0
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 26, 2024
8c475eb
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
72192a3
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
115c9b5
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
98a7193
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
60a5362
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
e4707ea
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
093bf08
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
2a45768
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
fbe7eb9
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
bba7980
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
ce103c4
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
fa6ae92
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
8059287
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
407e6af
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
53aefdc
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
0fb5c33
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
9141deb
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
fbef351
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
b2429f0
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
b1a19a1
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
9e6c852
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
3bc4df6
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
a025bf3
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
8a05938
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
852e081
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
d247c9b
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
08333a7
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
eba80cb
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
2c67440
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
b1b47ab
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
945ab99
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
704c57b
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
ed49179
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
90478db
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
18a7cf1
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
a9b4b61
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
94cecf9
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
31e5b23
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
2ac9b07
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
3c48fe3
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
941f8a6
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
5099bcc
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
7594711
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
bda67c0
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
4497c84
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Jul 31, 2024
53b74a2
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 8, 2024
86b2e44
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 8, 2024
fd6f5eb
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 8, 2024
57286d3
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 9, 2024
c74f93d
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 9, 2024
3d60541
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 13, 2024
947abae
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 13, 2024
720090f
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 16, 2024
7e13b16
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 21, 2024
4189b80
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Aug 22, 2024
5727df6
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
8b7f1f3
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
e85891c
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
b1390d6
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
54f39a0
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
04e4867
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
03c4db7
Merge branch 'main' into use-mark-tag-for-highlights
staxly[bot] Sep 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"@craco/craco": "<7",
"@formatjs/intl-pluralrules": "^5.2.3",
"@openstax/event-capture-client": "^2.0.2",
"@openstax/highlighter": "https://github.com/openstax/highlighter#v1.14.2",
"@openstax/highlighter": "https://github.com/openstax/highlighter#use-mark-dist-branch",
"@openstax/open-search-client": "0.1.0-build.7",
"@openstax/ts-utils": "1.6.0",
"@openstax/ui-components": "https://github.com/openstax/ui-components#1.3.4-post2",
Expand Down
4 changes: 2 additions & 2 deletions src/app/content/components/Page/PageContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export default styled(MainContent)`
}

@media screen {
&[aria-current] {
&.focus {
background-color: ${style.focused};
border-bottom: 0.2rem solid ${style.focusBorder};
padding: 0.2rem 0 0;
Expand Down Expand Up @@ -138,7 +138,7 @@ export default styled(MainContent)`
background-color: #ffea00;
}

&[aria-current] {
&.focus {
${SELF_AND_CHILD_MATH_SELECTOR} {
background-color: #ff9e4b;
padding: 0.2rem 0;
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5133,9 +5133,9 @@
dependencies:
uuid "^8.3.2"

"@openstax/highlighter@https://github.com/openstax/highlighter#v1.14.2":
version "1.14.1"
resolved "https://github.com/openstax/highlighter#fcd259e1642e243de6ed95771d0b97249ff2d162"
"@openstax/highlighter@https://github.com/openstax/highlighter#use-mark-dist-branch":
version "1.14.0"
resolved "https://github.com/openstax/highlighter#0ef7228f54270372f7c67da80e716df58fbfc643"
dependencies:
"@openstax/highlights-client" "0.2.3"
change-case "^4.0.0"
Expand Down
Loading