Skip to content

Commit 222d409

Browse files
committed
[B] Wrap annotations in blockquotes, include cite tag
1 parent b6d5abe commit 222d409

File tree

4 files changed

+53
-47
lines changed

4 files changed

+53
-47
lines changed

client/src/global/components/Annotation/Annotation/HighlightAnnotation/index.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,25 @@ class HighlightDetail extends PureComponent {
4646
return (
4747
<div className={wrapperClasses}>
4848
<div className="annotation-selection__container">
49-
<IconComposer
50-
icon="interactHighlight32"
51-
size="default"
52-
className="annotation-selection__icon"
53-
/>
54-
<FromNodes
55-
annotation={annotation}
56-
selection={annotation.attributes.subject}
57-
overlayLight
58-
/>
59-
<SourceSummary
60-
includeDate
61-
includeCreator
62-
annotation={annotation}
63-
onClick={visitHandler}
64-
onHover={this.hoverHandler}
65-
/>
49+
<blockquote>
50+
<IconComposer
51+
icon="interactHighlight32"
52+
size="default"
53+
className="annotation-selection__icon"
54+
/>
55+
<FromNodes
56+
annotation={annotation}
57+
selection={annotation.attributes.subject}
58+
overlayLight
59+
/>
60+
<SourceSummary
61+
includeDate
62+
includeCreator
63+
annotation={annotation}
64+
onClick={visitHandler}
65+
onHover={this.hoverHandler}
66+
/>
67+
</blockquote>
6668
<Authorize entity={annotation} ability={"delete"}>
6769
<div className="annotation-selection__action-buttons">
6870
<Utility.ConfirmableButton

client/src/global/components/Annotation/Annotation/ResourceAnnotation/index.js

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,25 @@ export default function ResourceAnnotation({
3131
return (
3232
<div className={wrapperClasses}>
3333
<div className="annotation-selection__container">
34-
<IconComposer
35-
icon="bookmark32"
36-
size="default"
37-
className="annotation-selection__icon"
38-
/>
39-
<FromNodes
40-
annotation={annotation}
41-
selection={annotation.attributes.subject}
42-
expandable={false}
43-
/>
44-
<SourceSummary
45-
includeDate
46-
includeCreator
47-
annotation={annotation}
48-
onClick={visitHandler}
49-
onHover={setHovering}
50-
/>
34+
<blockquote>
35+
<IconComposer
36+
icon="bookmark32"
37+
size="default"
38+
className="annotation-selection__icon"
39+
/>
40+
<FromNodes
41+
annotation={annotation}
42+
selection={annotation.attributes.subject}
43+
expandable={false}
44+
/>
45+
<SourceSummary
46+
includeDate
47+
includeCreator
48+
annotation={annotation}
49+
onClick={visitHandler}
50+
onHover={setHovering}
51+
/>
52+
</blockquote>
5153
<Authorize entity={annotation} ability={"delete"}>
5254
<div className="annotation-selection__action-buttons">
5355
<Utility.ConfirmableButton

client/src/global/components/Annotation/Annotation/SourceSummary/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class SourceSummary extends React.PureComponent {
8484

8585
/* eslint-disable jsx-a11y/anchor-is-valid */
8686
return (
87-
<div className="annotation-selection__source-summary">
87+
<cite className="annotation-selection__source-summary">
8888
<a
8989
href="#"
9090
onClick={onClick}
@@ -113,7 +113,7 @@ class SourceSummary extends React.PureComponent {
113113
/>
114114
)}
115115
</a>
116-
</div>
116+
</cite>
117117
);
118118
/* eslint-enable jsx-a11y/anchor-is-valid */
119119
}

client/src/global/components/Annotation/Annotation/TextContent/index.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,19 @@ class AnnotationSelectionWrapper extends PureComponent {
5757
return (
5858
<div className={wrapperClasses}>
5959
<div className="annotation-selection__container">
60-
<IconComposer
61-
icon="socialCite32"
62-
size="default"
63-
className="annotation-selection__icon annotation-selection__icon--flipped"
64-
/>
65-
<FromNodes annotation={annotation} selection={selection} />
66-
<SourceSummary
67-
annotation={annotation}
68-
onClick={this.props.visitHandler}
69-
onHover={this.hoverHandler}
70-
/>
60+
<blockquote>
61+
<IconComposer
62+
icon="socialCite32"
63+
size="default"
64+
className="annotation-selection__icon annotation-selection__icon--flipped"
65+
/>
66+
<FromNodes annotation={annotation} selection={selection} />
67+
<SourceSummary
68+
annotation={annotation}
69+
onClick={this.props.visitHandler}
70+
onHover={this.hoverHandler}
71+
/>
72+
</blockquote>
7173
</div>
7274
{this.annotatable && (
7375
<>

0 commit comments

Comments
 (0)