Skip to content

Commit

Permalink
Merge branch 'feature/sc-30094/add-sheet-options-to-sheets-editor' in…
Browse files Browse the repository at this point in the history 
…to feature/sc-27385/publish-settings2
  • Loading branch information
@stevekaplan123
stevekaplan123 committed Jan 12, 2025
2 parents feae111 + 4958108 commit 8ce15aa
Show file tree
Hide file tree
Showing 14 changed files with 357 additions and 507 deletions.
131 changes: 116 additions & 15 deletions static/css/s2.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4219,6 +4219,9 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item:hover{
body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus {
text-decoration: underline;
}
.singlePanel .searchContent h1 {
height: revert;
}
.searchContent h1 {
height: 40px;
font-size: 30px;
Expand Down Expand Up @@ -4962,9 +4965,19 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
display: flex;
justify-content: space-between;
padding: 20px 0;
}

.readerNavMenu .sheet:not(.profile-page .sheet) {
border-bottom: 1px solid #eee;
color: black;
}

.sheetsProfileList .sheet {
display: flex;
justify-content: space-between;
padding: 20px 0;
}

.readerNavMenu .sheet:hover{
text-decoration: none;
}
Expand Down Expand Up @@ -5612,6 +5625,7 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
}
.sheetContent .successMessage {
color: var(--inline-link-blue);
margin-inline-start: 5px;
}
.sheetContent .modalMessage {
--english-font: var(--english-sans-serif-font-family);
Expand Down Expand Up @@ -8039,7 +8053,9 @@ But not to use a display block directive that might break continuous mode for ot
--hebrew-font: var(--hebrew-sans-serif-font-family);
border: none;
}

.saveProfileButton{
background-color: var(--midrash-green);
}
.button.disabled{
border: 1px solid var(--light-grey);
background-color: var(--lightest-grey);
Expand Down Expand Up @@ -8480,9 +8496,19 @@ a .button:hover {
display: flex;
flex-direction: row;
justify-content: space-between;

}
.profile-page .collectionListing {
padding: 20px 0;
margin-top: 20px;
background-color: white;
border: 1000px solid white;
border-top: 4px solid white;
border-bottom: 120px solid white;
margin: -4px 0 -120px 0;
margin-inline-start: -1000px;
margin-inline-end: 0;
width: 100%;
}
.collectionListing .left-content {
display: flex;
Expand Down Expand Up @@ -8887,6 +8913,9 @@ body.interface-english .publishBox .react-tags__suggestions ul {
.collectionListingDetails {
color: #999;
font-size: 14px;
font-family: Roboto !important;
font-weight: 400;
line-height: 18px;
}
.collectionListingMembership {
text-transform: capitalize;
Expand Down Expand Up @@ -8996,7 +9025,10 @@ body.interface-english .publishBox .react-tags__suggestions ul {
flex: 1;
}
.sheet .sheetTitleText {
font-family: var(--english-serif-font-family);
font-family: Roboto;
font-size: 16px;
font-weight: 600;
line-height: 18.75px;
}
.sheetListingPinButton {
display: none;
Expand Down Expand Up @@ -10334,7 +10366,7 @@ span.purim-emoji img{
align-items: flex-end;
width: 25px;
height: 25px;
background-color: green;
background-color: var(--midrash-green);
border-radius: 50%;
color: white;
font-size: 30px;
Expand Down Expand Up @@ -11626,8 +11658,8 @@ cursor: pointer;
.sheetList .sheet .sheetTags {
color: #999;
}
.sheetList .sheet .sheetTags .bullet {
margin: 0 5px;
.sheetsProfileList .sheet .sheetTags .bullet {
padding: 0 5px;
}
.sheetList .sheet a {
color: inherit;
Expand Down Expand Up @@ -11763,8 +11795,12 @@ cursor: pointer;
top: -2px;
}
.profile-page .collectionListingName {
font-size: 18px;
margin-bottom: 10px;
font-family: Roboto;
font-size: 16px;
font-weight: 600;
line-height: 18.75px;

}
.profile-page .collectionListing + .collectionListing {
border-top: 0;
Expand Down Expand Up @@ -11813,6 +11849,10 @@ cursor: pointer;
margin-top: 20px;
font-size: 18px;
line-height: 1.4;
font-family: Roboto;
font-size: 14px;
font-weight: 400;
line-height: 16.41px;
}
@media (max-width: 540px) {
.profile-page .profile-pic:hover .profile-pic-hover-button.profile-pic-button-visible {
Expand All @@ -11835,7 +11875,9 @@ cursor: pointer;
font-size: 43.5px !important;
}
.profile-page .profile-summary .profile-actions {
display: flex;
flex-wrap: wrap;
flex-direction: row;
}
}
.profile-page .profile-summary .follow {
Expand All @@ -11846,11 +11888,7 @@ cursor: pointer;
.profile-page .profile-summary .follow .follow-bull {
padding: 0 5px;
}
.profile-page .profile-summary .profile-actions {
display: flex;
flex-direction: row;
margin: 10px 0;
}

.profile-page .resourcesLink.faded {
color: #666;
}
Expand Down Expand Up @@ -14141,7 +14179,7 @@ span.ref-link-color-3 {color: blue}
-webkit-margin-start: 20px;
-moz-margin-start: 20px;
margin-inline-start: 10px;
line-height: 0px;
line-height: 0;
}
.sheetsInPanel .dropdownHeader {
margin-bottom: revert;
Expand Down Expand Up @@ -14169,7 +14207,9 @@ span.ref-link-color-3 {color: blue}
content: "";
transform: scale(0.75);
} */
.sheetsInPanel .headerDropdownMenu a.dropdownLinks-button::after {

/*.sheetsInPanel .headerDropdownMenu a.dropdownLinks-button::after {*/
.sheetsInPanel .headerDropdownMenu a.headerDropdownMenu::after {
display: inline-block;
height: 10px;
width: 12px;
Expand All @@ -14188,55 +14228,65 @@ span.ref-link-color-3 {color: blue}
display:none;
overflow:hidden;
}

.sheetsInPanel .dropdownItem:nth-child(n+2):nth-last-child(n+2) {
padding: 5px 5px !important;
}

.sheetsInPanel .dropdownItem:first-child {
padding-block-start: 10px !important;
padding-block-end: 5px !important;
}

.sheetsInPanel .dropdownItem:last-child {
padding-block-start: 5px !important;
padding-block-end: 10px !important;
}

.sheetsInPanel .headerDropdownMenu .dropdownLinks-menu {
background: white;
box-shadow: revert;
border: 1px solid var(--light-grey);
}

.sheetsInPanel .dropdownSeparator {
margin-block: 5px;
border: 0.5px solid var(--light-grey);
}


.interface-english .header .headerDropdownMenu .dropdownLinks-menu {
right: 0px;
min-width: 150px;
width: max-content;
}

.interface-english .sheetsInPanel .headerDropdownMenu .dropdownLinks-menu {
min-width: 150px;
width: max-content;
}

.interface-hebrew .header .headerDropdownMenu .dropdownLinks-menu {
left: 0px;
min-width: 150px;
width: max-content;
}
.interface-hebrew .sheetsInPanel .dropdownLinks .dropdownLinks-menu {

.interface-hebrew .sheetsInPanel .headerDropdownMenu .dropdownLinks-menu {
min-width: 150px;
width: max-content;
}

.dropdownLinks-options {
display: flex;
flex-direction: column;
padding: 4px;
max-width: 220px;
}

.sheetsInPanel .dropdownLinks-options {
padding: 0;
}

.header .headerDropdownMenu .dropdownLinks-menu.open, .sheetsInPanel .headerDropdownMenu .dropdownLinks-menu.open {
display: block;
}
Expand Down Expand Up @@ -14530,6 +14580,57 @@ span.ref-link-color-3 {color: blue}
padding: 0px 4px;
}

.profilePicAndButtonContainer {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

.createButtons {
display: flex;
align-items: center;
flex-direction: row;
justify-content: space-evenly;
padding-top: 20px;
}

.sheetsProfileList {
margin-top: 20px;
background-color: white;
border: 1000px solid white;
border-top: 4px solid white;
border-bottom: 120px solid white;
margin: -4px 0 -120px -1000px;
width: 100%;

}

.profile-page .sheetsProfileList {
margin: -4px 0 -120px 0;
margin-inline-start: -1000px;
margin-inline-end: 0;
}

.sheetsProfileList .readerNavMenuSearchButton {
margin: 0 10px 0 5px;
display: inline-flex;
top: 0;
}
.sheetsProfileList .readerNavMenuSearchButton {
margin-inline-start: 10px;
margin-inline-end: 5px;
}
.sheetsProfileList input {
border: 0;
font-size: 18px;
font-family: "adobe-garamond-pro", "Crimson Text", Georgia, serif;
background-color: transparent;
}
.sheetsProfileList .loadingMessage {
margin-top: 30px;
}

@-webkit-keyframes load5 {
0%,100%{box-shadow:0 -2.6em 0 0 #ffffff,1.8em -1.8em 0 0 rgba(0,0,0,0.2),2.5em 0 0 0 rgba(0,0,0,0.2),1.75em 1.75em 0 0 rgba(0,0,0,0.2),0 2.5em 0 0 rgba(0,0,0,0.2),-1.8em 1.8em 0 0 rgba(0,0,0,0.2),-2.6em 0 0 0 rgba(0,0,0,0.5),-1.8em -1.8em 0 0 rgba(0,0,0,0.7)}
12.5%{box-shadow:0 -2.6em 0 0 rgba(0,0,0,0.7),1.8em -1.8em 0 0 #ffffff,2.5em 0 0 0 rgba(0,0,0,0.2),1.75em 1.75em 0 0 rgba(0,0,0,0.2),0 2.5em 0 0 rgba(0,0,0,0.2),-1.8em 1.8em 0 0 rgba(0,0,0,0.2),-2.6em 0 0 0 rgba(0,0,0,0.2),-1.8em -1.8em 0 0 rgba(0,0,0,0.5)}
Expand Down
6 changes: 0 additions & 6 deletions static/css/static.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,11 +858,6 @@ p.registration-links a:hover{
#editProfilePage #sheetsBox,
#editProfilePage #aboutBox {
margin-bottom: 60px;
display: flex;
display: -webkit-flex;
justify-content: space-between;
-webkit-justify-content:space-between;
flex-flow: row wrap;
}
#editProfilePage #sheetsBox{
flex-direction: column;
Expand Down Expand Up @@ -906,7 +901,6 @@ p.registration-links a:hover{
}
#editProfilePage .field {
margin-bottom: 20px;
width: 48%;
min-width: 300px;
}
#editProfilePage .field input {
Expand Down
19 changes: 0 additions & 19 deletions static/js/Misc.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import Cookies from "js-cookie";
import {EditTextInfo} from "./BookPage";
import ReactMarkdown from 'react-markdown';
import TrackG4 from "./sefaria/trackG4";
import { ReaderApp } from './ReaderApp';
import {ToolsButton} from "./ConnectionsPanel";
import {DropdownMenuItemWithIcon} from "./common/DropdownMenu";

/**
Expand Down Expand Up @@ -1681,28 +1679,13 @@ const SheetListing = ({
);
});

const topics = sheet.topics.map((topic, i) => {
const separator = i == sheet.topics.length -1 ? null : <span className="separator">,</span>;
return (
<a href={`/topics/${topic.slug}`}
target={openInNewTab ? "_blank" : "_self"}
className="sheetTag"
key={i}
onClick={handleTopicClick.bind(null, topic.slug)}
>
<InterfaceText text={topic} />
{separator}
</a>
);
});
const created = Sefaria.util.localeDate(sheet.created);
const underInfo = infoUnderneath ? [
sheet.status !== 'public' ? (<span className="unlisted"><img src="/static/img/eye-slash.svg"/><span>{Sefaria._("Not Published")}</span></span>) : undefined,
showAuthorUnderneath ? (<a href={sheet.ownerProfileUrl} target={openInNewTab ? "_blank" : "_self"}>{sheet.ownerName}</a>) : undefined,
views,
created,
collections.length ? collections : undefined,
sheet.topics.length ? topics : undefined,
].filter(x => x !== undefined) : [topics];


Expand All @@ -1716,7 +1699,6 @@ const SheetListing = ({
<div className="sheetLeft">
{sheetInfo}
<a href={sheet.sheetUrl} target={openInNewTab ? "_blank" : "_self"} className="sheetTitle" onClick={handleSheetClickLocal}>
<img src="/static/img/sheet.svg" className="sheetIcon"/>
<span className="sheetTitleText">{title}</span>
</a>
{sheetSummary}
Expand Down Expand Up @@ -1778,7 +1760,6 @@ const CollectionListing = ({data}) => {
<div className="collectionListingText">

<a href={collectionUrl} className="collectionListingName">
<img className="collectionListingImage" src={imageUrl} alt="Collection Icon"/>
{data.name}
</a>

Expand Down
Loading

0 comments on commit 8ce15aa

Please sign in to comment.