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.

Sign up for GitHub

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

[Sheets][Desktop] My Profile #2210

Merged
merged 8 commits into from
Jan 9, 2025
Merged

[Sheets][Desktop] My Profile #2210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bf6d509
feat(sheets profile): New design - moving buttons, removing tt and no…
saengel Jan 2, 2025
adda641
feat(sheets profile): Remove search and sort
saengel Jan 2, 2025
199d3cc
feat(sheet profile): First pass style refining on sheets side
saengel Jan 2, 2025
dc1ff1c
feat(sheets profile): Additional refining styles
saengel Jan 2, 2025
06c9cfa
feat(sheets profile): Shorten gap between edit button and prof pic
saengel Jan 2, 2025
426a96a
feat(sheets profile): More style polish
saengel Jan 2, 2025
912e440
chore(sheets profile): Remove console.log
saengel Jan 6, 2025
c90e4a4
chore(sheets profile): Use margin-start and margin-end in css
saengel Jan 8, 2025
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
101 changes: 92 additions & 9 deletions static/css/s2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4921,9 +4921,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 @@ -8414,9 +8424,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 @@ -8752,6 +8772,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 @@ -8861,7 +8884,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 @@ -11480,8 +11506,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 @@ -11617,8 +11643,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 @@ -11667,6 +11697,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 @@ -11689,7 +11723,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 @@ -11700,11 +11736,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 @@ -14081,6 +14113,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
17 changes: 0 additions & 17 deletions static/js/Misc.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,28 +1661,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 @@ -1696,7 +1681,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 @@ -1758,7 +1742,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
Loading