Skip to content

Commit

Permalink
Merge branch 'main' into 881--checks-result-list
Browse files Browse the repository at this point in the history
# Conflicts:
#	package-lock.json
  • Loading branch information
tombogle committed Jul 22, 2024
2 parents f99f886 + aa5d472 commit c596d4d
Show file tree
Hide file tree
Showing 10 changed files with 1,410 additions and 388 deletions.
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"hopkinson",
"iframes",
"iife",
"interprocess",
"iusfm",
"iusj",
"iusx",
Expand Down
2 changes: 1 addition & 1 deletion extensions/src/platform-scripture-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"platform-bible-utils": "file:../../../lib/platform-bible-utils"
},
"devDependencies": {
"@biblionexus-foundation/platform-editor": "^0.3.3",
"@biblionexus-foundation/platform-editor": "^0.4.1",
"@biblionexus-foundation/scripture-utilities": "^0.0.3",
"@swc/core": "^1.4.11",
"@types/node": "^20.12.2",
Expand Down
12 changes: 4 additions & 8 deletions extensions/src/platform-scripture-editor/src/_commenting.scss
Original file line number Diff line number Diff line change
Expand Up @@ -320,15 +320,14 @@ i.comments {
}

.CommentPlugin_CommentsPanel_Heading {
padding-left: 15px;
padding-top: 10px;
padding: 16px;
margin: 0;
height: 34px;
line-height: 16px;
border-bottom: 1px solid #eee;
font-size: 20px;
display: block;
width: 100%;
color: #444;
text-overflow: ellipsis;
overflow: hidden;
}

Expand Down Expand Up @@ -395,20 +394,17 @@ i.send {
color: #777;
font-size: 15px;
text-align: center;
position: absolute;
top: calc(50% - 15px);
margin: 0;
padding: 0;
width: inherit;
}

.CommentPlugin_CommentsPanel_List {
padding: 0;
list-style-type: none;
margin: 0;
padding: 0;
width: inherit;
position: absolute;
top: 45px;
overflow-y: auto;
height: calc(100% - 45px);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

// remove rounded top corners to look better in tabs
.toolbar {
border-bottom: 1px solid rgb(226, 232, 240);
border-top-left-radius: 0;
border-top-right-radius: 0;
}
Expand All @@ -27,12 +28,6 @@
}
}

// work around https://github.com/BiblioNexus-Foundation/scripture-editors/issues/124
/* stylelint-disable-next-line selector-class-pattern */
.CommentPlugin_CommentsPanel_Heading {
width: auto;
}

// work around https://github.com/BiblioNexus-Foundation/scripture-editors/issues/127
/* stylelint-disable-next-line selector-class-pattern */
.CommentPlugin_AddCommentBox {
Expand Down
99 changes: 99 additions & 0 deletions extensions/src/platform-scripture-editor/src/_editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -824,3 +824,102 @@ button.toolbar-item.active i {
background-color: #eee;
margin: 0 4px;
}

/* ContextMenuPlugin */

.auto-embed-menu {
width: 150px;
}

.typeahead-popover {
background: #fff;
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
border-radius: 8px;
}

.typeahead-popover ul {
padding: 0;
list-style: none;
margin: 0;
border-radius: 8px;
max-height: 200px;
overflow-y: scroll;
-ms-overflow-style: none;
scrollbar-width: none;
}

.typeahead-popover ul::-webkit-scrollbar {
display: none;
}

.typeahead-popover ul li {
margin: 0;
min-width: 180px;
font-size: 14px;
outline: none;
cursor: pointer;
border-radius: 8px;
}

.typeahead-popover ul li.selected {
background: #eee;
}

.typeahead-popover ul li.disabled {
opacity: 0.5;
cursor: not-allowed;
}

.typeahead-popover li {
margin: 0 8px;
padding: 8px;
color: #050505;
cursor: pointer;
line-height: 16px;
font-size: 15px;
display: flex;
align-content: center;
flex-direction: row;
flex-shrink: 0;
background-color: #fff;
border-radius: 8px;
border: 0;
}

.typeahead-popover li.active {
display: flex;
width: 20px;
height: 20px;
background-size: contain;
}

.typeahead-popover li:first-child {
border-radius: 8px 8px 0 0;
}

.typeahead-popover li:last-child {
border-radius: 0 0 8px 8px;
}

.typeahead-popover li:hover {
background-color: #eee;
}

.typeahead-popover li .text {
display: flex;
line-height: 20px;
flex-grow: 1;
min-width: 150px;
}

.typeahead-popover li .icon {
display: flex;
width: 20px;
height: 20px;
user-select: none;
margin-right: 8px;
line-height: 16px;
background-size: contain;
background-repeat: no-repeat;
background-position: center;
}
Loading

0 comments on commit c596d4d

Please sign in to comment.