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

Feature/sc 27825/add to sheet2 #2179

Open
wants to merge 54 commits into
base: feature/sc-27328/options-popover-component2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
6f72e5d
chore: pass nodeRef to SheetContent
stevekaplan123 Sep 10, 2024
ddff3c9
chore: refactor getSources
stevekaplan123 Sep 10, 2024
1c9fc27
chore: start AddToSheetButton
stevekaplan123 Sep 10, 2024
62980a1
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 10, 2024
d1d9699
chore: add to sheet button works but isnt stylized
stevekaplan123 Sep 10, 2024
9eb3ab8
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 10, 2024
32e6a65
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 10, 2024
2c55233
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 10, 2024
f3d7ed5
chore: Add To Sheet button rendered as part of Sheet Source
stevekaplan123 Sep 11, 2024
08353ae
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 11, 2024
8c1c078
Revert "chore: Add To Sheet button rendered as part of Sheet Source"
stevekaplan123 Sep 11, 2024
4bdda69
chore: dont set dialog modal to have fixed width and height
stevekaplan123 Sep 11, 2024
e4989b3
chore: addToSheetButton needs to be rendered by all the sheet segment…
stevekaplan123 Sep 11, 2024
624a381
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 11, 2024
fdd051e
chore: minor fix to SheetSource
stevekaplan123 Sep 11, 2024
3ba5ba7
chore: restore AddToSourceSheetModal that got lost in bad merge
stevekaplan123 Sep 11, 2024
6cfe7ea
chore: remove highlight from css and js for sheetContent
stevekaplan123 Sep 11, 2024
289b41a
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 19, 2024
c355191
Merge branch 'feature/sc-27331/new-sidebar-component' into feature/sc…
stevekaplan123 Sep 19, 2024
adb9cb9
chore: break up sheet content segments into their own file
stevekaplan123 Sep 19, 2024
ebbf0fd
chore: fix import
stevekaplan123 Sep 19, 2024
5d4be8f
chore: a circular + sign for add to sheet button
stevekaplan123 Sep 19, 2024
df02863
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 19, 2024
60f1224
chore: fix imports
stevekaplan123 Sep 19, 2024
8105f3a
chore: add to sheet text should have mouse pointer as the cursor
stevekaplan123 Sep 19, 2024
33968cc
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 22, 2024
f3f0508
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 23, 2024
a5fa6e8
chore: center add to sheet button
stevekaplan123 Sep 23, 2024
21c658e
chore: add to sheet position for multiple types of sheet segments
stevekaplan123 Sep 23, 2024
db07560
chore: center plus sign in add to sheet button
stevekaplan123 Sep 23, 2024
6f46167
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Sep 24, 2024
48e5776
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 1, 2024
a19ad8d
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 9, 2024
307db39
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 10, 2024
f63dcd1
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 10, 2024
b9a3fb5
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 10, 2024
ea643b4
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 13, 2024
8a29e95
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 13, 2024
6f4f9ad
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 14, 2024
2156d5f
chore: add to sheet button when logged out should trigger sign up modal
stevekaplan123 Oct 14, 2024
9a089d0
chore: can add images to sheets
stevekaplan123 Oct 14, 2024
68aa951
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 14, 2024
4faae69
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 15, 2024
e91b39e
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Oct 15, 2024
af62b67
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Nov 10, 2024
ea901a8
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Nov 12, 2024
54b09c9
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Nov 28, 2024
b43a86b
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Nov 28, 2024
22242b1
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Nov 28, 2024
d03da25
chore: URL 1.2 loads to 2nd segment
stevekaplan123 Nov 28, 2024
3cb406e
Merge branch 'feature/sc-27328/options-popover-component' into featur…
stevekaplan123 Dec 4, 2024
4aa8b8c
Merge branch 'feature/sc-27328/options-popover-component2' into featu…
stevekaplan123 Dec 10, 2024
8956559
Merge branch 'feature/sc-27328/options-popover-component2' into featu…
stevekaplan123 Dec 11, 2024
09f647e
Merge branch 'feature/sc-27328/options-popover-component2' into featu…
stevekaplan123 Dec 12, 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
73 changes: 35 additions & 38 deletions static/css/s2.css
Original file line number Diff line number Diff line change
Expand Up @@ -1055,8 +1055,6 @@ div.interfaceLinks-row a {
background-color: rgba(1, 1, 1, 0.7);
}
.dialogModal {
width: 400px;
height: 388px;
top: 129px;
border: none;
background: transparent;
Expand Down Expand Up @@ -5701,7 +5699,6 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
cursor: pointer;
display: block;
background-color: inherit;
margin-bottom: 14px;
}
.continuous .segment {
display: inline;
Expand Down Expand Up @@ -5884,50 +5881,28 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
background-color: #444;
}
.basetext .segment.highlight,
.sheetContent .segment.highlight .en,
.sheetContent .segment.highlight .he,
.sheetContent .textPreviewSegment.highlight,
.editTextInfo .textPreviewSegment.highlight,
.readerPanel.bilingual.heLeft .sheetContent .segment.highlight,
.readerPanel.bilingual.heRight .sheetContent .segment.highlight,
.editorContent .sheetItem.highlight,
.editorContent .sheetItem.highlight .SheetSource .en,
.editorContent .sheetItem.highlight .SheetSource::after
{
background-color: #F0F7FF;
}
.sheetContent .segment.highlight .linkCount .en,
.sheetContent .segment.highlight .linkCount .he,
.sheetContent .segment.highlight .segmentNumber .en,
.sheetContent .segment.highlight .segmentNumber .he {
background-color: transparent;
}
.sheetContent .segment.highlight .en div,
.sheetContent .segment.highlight .he div {
background-color: inherit;
}
.sheetContent .segment a {
color: #4B71B7;
cursor: pointer;
}
.sheetContent .segment .sourceContentText a {
text-decoration: underline;
}
.readerPanel.bilingual.stacked .sheetContent .segment.highlight .he {
padding-bottom: 1px;
}
.basetext .segment.highlight .segmentNumber,
.basetext .segment.highlight .linkCount,
.sheetContent .segment.highlight .linkCount,
.sheetContent .segment.highlight .segmentNumber {
.basetext .segment.highlight .linkCount {
background-color: transparent;
}
.sepia .basetext .segment.highlight,
.sepia .sheetContent .segment.highlight {
.sepia .basetext .segment.highlight {
background-color: #E3E3E1;
}
.dark .basetext .segment.highlight,
.dark .sheetContent .segment.highlight {
.dark .basetext .segment.highlight {
background-color: #444;
}
.textRange {
Expand Down Expand Up @@ -10268,6 +10243,38 @@ span.purim-emoji img{
padding: 130px 0;
}
}
.sheetContent .addToSheetPlus {
display: inline-flex;
justify-content: center;
align-items: flex-end;
width: 25px;
height: 25px;
background-color: green;
border-radius: 50%;
color: white;
font-size: 30px;
line-height: 1;
cursor: pointer;
}
.SheetOutsideBiText .addToSheetButton, .SheetSource .addToSheetButton {
margin-inline-start: 15px;
padding-block-start: 10px;
padding-block-end: 10px;
}
.SheetComment .addToSheetButton, .SheetOutsideText .addToSheetButton {
margin-block-start: -10px;
margin-block-end: 30px;
}
.sheetContent .addToSheetText {
--english-font: var(--english-sans-serif-font-family);
--hebrew-font: var(--hebrew-sans-serif-font-family);
font-size: 16px;
font-weight: 400;
line-height: 18.75px;
color: var(--dark-grey);
margin-inline-start: 10px;
cursor: pointer;
}
@media screen and (min-width: 900px) {
.contentInner .table {
display: flex;
Expand Down Expand Up @@ -10908,21 +10915,11 @@ section.SheetOutsideBiText {
.interface-hebrew section.SheetOutsideBiText .sheetItem > .en {
padding: 15px 16px 15px 20px;
}
.readerPanel.bilingual.stacked .sheetContent section.SheetSource .segment.highlight .he,
.readerPanel.bilingual.stacked .sheetContent section.SheetOutsideBiText .segment.highlight .he {
padding-bottom: 15px;
}
section.SheetSource.highlight,
section.SheetOutsideBiText.highlight {
background-color: #E9E9E7;
}
section.SheetSource .segmentNumber,
section.SheetSource .SheetOutsideBiText {
display: none;
}
.sheetContent section.SheetSource.highlight .sheetItem.segment.highlight .sourceContentText,
.sheetContent section.SheetSource .sheetItem.segment .sourceContentText,
.sheetContent section.SheetOutsideBiText.highlight .sheetItem.segment.highlight .sourceContentText,
.sheetContent section.SheetOutsideBiText .sheetItem.segment .sourceContentText {
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion static/js/AddToSourceSheet.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ class AddToSourceSheetBox extends Component {
<span className="int-en noselect">Add to Sheet</span>
<span className="int-he noselect">הוספה לדף המקורות</span>
</div>
<GDocAdvertBox/>
{!this.props.hideGDocAdvert && <GDocAdvertBox/>}
</div>);
}
}
Expand Down
1 change: 1 addition & 0 deletions static/js/ReaderPanel.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ class ReaderPanel extends Component {
key={"sheet-"+this.state.sheetID}
multiPanel={this.props.multiPanel}
highlightedNode={this.state.highlightedNode}
highlightedRefs={this.state.highlightedRefs}
highlightedRefsInSheet={this.state.highlightedRefsInSheet}
scrollToHighlighted={this.state.scrollToHighlighted}
onRefClick={this.handleCitationClick}
Expand Down
3 changes: 2 additions & 1 deletion static/js/sheets/Sheet.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@ class Sheet extends Component {
onRefClick={this.props.onRefClick}
handleClick={this.handleClick}
sheetSourceClick={this.props.onSegmentClick}
highlightedNode={this.props.highlightedNode}
highlightedNode={this.props.highlightedNode} // for example, "3" -- the third node in the sheet
highlightedRefs={this.props.highlightedRefs} // for example, ["Genesis 1:1"] or ["Sheet 4:3"] -- the actual source
highlightedRefsInSheet={this.props.highlightedRefsInSheet}
scrollToHighlighted={this.props.scrollToHighlighted}
editable={editable}
Expand Down
Loading
Loading