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

Chore/sc 28761/super about fit and finish page title #2135

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
+61 −109
Open

Chore/sc 28761/super about fit and finish page title #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f6c96db
chore: show mobileAboutHeader not just on mobile
stevekaplan123 Dec 1, 2024
d080a4e
chore: show mobileaboutheader always
stevekaplan123 Dec 1, 2024
73d9020
chore: title shows up on each page but without right styling
stevekaplan123 Dec 1, 2024
a9ffce1
chore: font on desktop in mobileaboutheader consistent
stevekaplan123 Dec 1, 2024
b72b049
chore: hebrew fonts
stevekaplan123 Dec 1, 2024
8a1e7aa
chore: slightly adjust mobileaboutheader css
stevekaplan123 Dec 2, 2024
8a1377e
chore: include all font-weights
stevekaplan123 Dec 2, 2024
7a52d6c
chore: fix products and updates margin
stevekaplan123 Dec 2, 2024
388e891
chore: remove banner message upon close on a static page
stevekaplan123 Dec 3, 2024
bc252e1
Revert "chore: remove banner message upon close on a static page"
stevekaplan123 Dec 11, 2024
ad7f00c
Merge branch 'master' into chore/sc-28761/super-about-fit-and-finish-…
stevekaplan123 Dec 16, 2024
1aff615
chore: rename mobileAboutHeader to aboutHeader
stevekaplan123 Dec 16, 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
4 changes: 2 additions & 2 deletions static/css/s2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13425,8 +13425,8 @@ span.ref-link-color-3 {color: blue}
}

#productsPageContent {
margin-inline-start: 70px;
margin-top: 165px;
margin-inline-start: 100px;
margin-top: 140px;
margin-bottom: 165px;
}

Expand Down
96 changes: 33 additions & 63 deletions static/css/static.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,22 @@
margin: 0 0 60px 0;
height: auto;
}
.interface-hebrew h1.aboutHeader {
padding-top: 5px;
}
.interface-english h1.aboutHeader {
padding-top: 2px;
}
#aboutSidebar.mobileAbout h1, h1.aboutHeader {
--english-font: var(--english-sans-serif-font-family);
--hebrew-font: var(--hebrew-sans-serif-font-family);
font-style: normal;
font-weight: 500;
font-size: 22px;
text-align: left;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be start (for left in english and right in hebrew)?

line-height: 26px;
color: var(--dark-grey);
}
.static h2 {
font-weight: lighter;
font-size: 16px;
Expand Down Expand Up @@ -1348,7 +1364,6 @@ p.registration-links a:hover{
font-size: 18px;
}
.static.legal iframe {
margin-top: -600px;
width: 100%;
height: 600px;
border: 1px solid #aaa;
Expand Down Expand Up @@ -3271,24 +3286,12 @@ display: none;
filter: invert(100%) sepia(0%) saturate(0%) hue-rotate(93deg) brightness(103%) contrast(103%);
}

#aboutPage .inner {
margin-top: 45px;
}
div .notificationsList {
margin-top: -20px;
}
form.globalUpdateForm + div.notificationsList {
margin-top: 20px;
}
#teamPage .inner {
margin-top: 90px;
}
.interface-hebrew #jobsPage .inner {
margin-top: 70px;
}
.interface-english #jobsPage .inner {
margin-top: 65px;
}
#aboutHeader {
color: white;
margin-bottom: 250px;
Expand Down Expand Up @@ -3343,7 +3346,7 @@ form.globalUpdateForm + div.notificationsList {
}

#aboutSidebar {
margin-top: 70px;
margin-top: 120px;
}
.interface-hebrew #aboutSidebar.updates {
left: revert;
Expand Down Expand Up @@ -3403,9 +3406,6 @@ form.globalUpdateForm + div.notificationsList {
#aboutSidebar a:hover {
text-decoration: underline;
}
.annualReport {
padding-top: 85px;
}
.interface-hebrew .annualReport {
padding-top: 95px;
}
Expand Down Expand Up @@ -3468,20 +3468,8 @@ form.globalUpdateForm + div.notificationsList {
padding: 5px;
margin-left: -5px;
}
#testimonialsPage .inner {
margin-top: 80px;
}
.interface-hebrew #testimonialsPage .inner {
margin-top: 90px;
}
#supportersPage .inner {
margin-top: 85px;
}
#metricsPage .inner {
margin-top: 60px;
}
#updatesPanelContent .readerNavMenu .content .contentInner {
margin-top: 160px;
margin-top: 80px;
}
#updatesPage .readerNavMenu {
position: relative;
Expand All @@ -3490,12 +3478,6 @@ form.globalUpdateForm + div.notificationsList {
margin-left: 200px;
}

.mobileAboutHeader, .updatesHeader, .jobsHeader {
display: none;
}
.container.doc.legal.static .inner {
margin-top: 675px;
}
.container.doc.legal.static .inner,
#annualReport .inner,
#metricsPage .inner,
Expand All @@ -3507,7 +3489,7 @@ form.globalUpdateForm + div.notificationsList {
margin-inline-start: 100px;
}
#updatesPanelContent .readerNavMenu .content .contentInner {
margin-inline-start: 100px;
margin-inline-start: 70px;
}
.interface-hebrew #testimonialsPage .inner {
margin-inline-start: auto;
Expand Down Expand Up @@ -3538,7 +3520,16 @@ form.globalUpdateForm + div.notificationsList {
margin-right: 20px;
}
}
.interface-hebrew h1.aboutHeader, .interface-hebrew #aboutSidebar h1 {
text-align: right;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

again, i thinkg the right way here is to be start, and something general that switches the direction in the hebrew interface

}
nav#aboutSidebar h1 {
display: none;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i can't understand it. most of the times when we have display none, i think it's self evident (like hebrew/english staff). here i ask myself why we have it if it isn't displayed.

}
@media (max-width: 480px) {
.interface-english nav#aboutSidebar h1.int-en, .interface-hebrew nav#aboutSidebar h1.int-he {
display: block;
}
.container.doc.legal.static .inner, #annualReport .inner, #metricsPage .inner, #supportersPage .inner,
#testimonialsPage .inner, #aboutPage .inner, #teamPage .inner, #jobsPage .inner {
margin-inline-start: auto;
Expand Down Expand Up @@ -3592,9 +3583,6 @@ form.globalUpdateForm + div.notificationsList {
.interface-english #teamPage .inner {
margin-top: -75px;
}
.interface-hebrew .about.section {
padding-top: 50px;
}
div #metricsBox {
margin-top: 50px;
}
Expand Down Expand Up @@ -3629,20 +3617,12 @@ form.globalUpdateForm + div.notificationsList {
margin: 0;
padding-top: 55px;
}
#aboutSidebar.mobileAbout h1, h1.mobileAboutHeader {
font-family: 'Roboto', sans-serif;
font-style: normal;
font-weight: 500;
font-size: 22px;
text-align: left;
line-height: 26px;
color: var(--dark-grey);
}
.interface-hebrew h1.mobileAboutHeader, .interface-hebrew #aboutSidebar h1 {
text-align: right;
h1.aboutHeader {
margin: 40px 0 40px 0;
padding-top: 0;
}
h1.mobileAboutHeader {
margin: 40px 0 0 0;
div#productsPageContent h1.aboutHeader {
margin: revert;
}
.interface-english #aboutSidebar li {
margin-left: 5px;
Expand All @@ -3659,20 +3639,10 @@ form.globalUpdateForm + div.notificationsList {
div .section.leading-supporters {
margin-top: 40px;
}

.updatesHeader, .jobsHeader, .mobileAboutHeader {
display: block;
}
.static.legal iframe {
margin-top: 60px;
}
}
#metricsBox {
margin-top: 30px;
}
.updateTextarea {
width: 100%;
}
.about.section {
padding-top: 40px;
}
4 changes: 2 additions & 2 deletions static/js/StaticPages.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2912,7 +2912,7 @@ const JobsPageHeader = ({ jobsAreAvailable }) => {
return (
<>
<header>
<h1 className="mobileAboutHeader">
<h1 className="aboutHeader">
<span className="int-en">Jobs at Sefaria</span>
<span className="int-he">משרות פנויות בספריא</span>
</h1>
Expand Down Expand Up @@ -3435,7 +3435,7 @@ const ProductsPage = memo(() => {

return (
<>
<h1 className="mobileAboutHeader">
<h1 className="aboutHeader">
<span className="int-en">Sefaria's Products</span>
<span className="int-he">המוצרים של ספריא</span>
</h1>
Expand Down
2 changes: 1 addition & 1 deletion static/js/UpdatesPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class UpdatesPanel extends Component {
<div className="content">
<div className="sidebarLayout">
<div className="contentInner">
<h1 className="mobileAboutHeader"><InterfaceText>Updates</InterfaceText></h1>
<h1 className="aboutHeader"><InterfaceText>Updates</InterfaceText></h1>

{Sefaria.is_moderator?<NewUpdateForm handleSubmit={this.handleSubmit} key={this.state.submitCount} error={this.state.error}/>:""}

Expand Down
4 changes: 2 additions & 2 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<script>
WebFont.load({
google: {
families: ['Crimson Text:400,700'],
families: ['Crimson Text:100,200,300,400,500,600,700,800,900'],
text: 'ăǎġḥḤḫḳḲŏŠšṭżūẓŻāīēḗęîїìi̧ ̆̄'
},
typekit: {
Expand All @@ -80,7 +80,7 @@
});
WebFont.load({
google: {
families: ['Roboto:300,400,700', 'Heebo:300,400,700:hebrew'] // The dotted h causes Heebo not to load.
families: ['Roboto:100,200,300,400,500,600,700,800,900', 'Heebo:100,200,300,400,500,600,700,800,900:hebrew'] // The dotted h causes Heebo not to load.
}
});
WebFont.load({
Expand Down
6 changes: 2 additions & 4 deletions templates/metrics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='metrics' title="Metrics" heTitle="מדדים" %}
{% include '_sidebar.html' with whichPage='metrics' %}
{% endif %}
stevekaplan123 marked this conversation as resolved.
Show resolved Hide resolved
<div id="metricsPage" class="biReady container static">


<div class="inner">
{% if request.user_agent.is_mobile %}
<h1 class="mobileAboutHeader">
<h1 class="aboutHeader">
<span class="int-en">Metrics</span>
<span class="int-he">מדדים</span>
</h1>
{% endif %}
<div id="metricsBox">
{% trans "Loading..." %}
</div>
Expand Down
6 changes: 2 additions & 4 deletions templates/static/en/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='about' title="What is Sefaria?" heTitle="מהי ספריא" %}
{% include '_sidebar.html' with whichPage='about' %}
stevekaplan123 marked this conversation as resolved.
Show resolved Hide resolved
{% endif %}
<main id="aboutPage" class="biReady container static">
<div class="inner">
{% if request.user_agent.is_mobile %}
<header><h1 class="mobileAboutHeader"><span class="int-en">What is Sefaria?</span></h1></header>
{% endif %}
<header><h1 class="aboutHeader"><span class="int-en">What is Sefaria?</span></h1></header>
<section class="about section">

<p class="first">
Expand Down
6 changes: 2 additions & 4 deletions templates/static/he/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='about' title="What is Sefaria?" heTitle="מהי ספריא" %}
{% include '_sidebar.html' with whichPage='about' %}
{% endif %}
<main id="aboutPage" class="biReady container static sans-serif">
<div class="inner">
{% if request.user_agent.is_mobile %}
<header><h1 class="mobileAboutHeader"><span class="int-he">מהי ספריא</span></h1></header>
{% endif %}
<header><h1 class="aboutHeader"><span class="int-he">מהי ספריא</span></h1></header>
<section class="about section">
<p class="first">
<span class="int-he">אנו עַם הספר. במשך אלפי שנים מתקיימים התרבות, המסורת והערכים שלנו באמצעות הטקסטים שלנו.
Expand Down
2 changes: 1 addition & 1 deletion templates/static/jobs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='jobs' title="Jobs at Sefaria" heTitle="משרות פנויות בספריא" %}
{% include '_sidebar.html' with whichPage='jobs' %}
{% endif %}
<main id="jobsPage" class="container biReady static">
<div class="inner">
Expand Down
6 changes: 2 additions & 4 deletions templates/static/link-to-annual-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='annualreport' title="Annual Report" heTitle='דו"ח שנתי' %}
{% include '_sidebar.html' with whichPage='annualreport' %}
{% endif %}
<main id="annualReport" class="container biReady static">
<div class="inner">
{% if request.user_agent.is_mobile %}
<h1 class="mobileAboutHeader"><span class="int-en">Annual Report</span>
<h1 class="aboutHeader"><span class="int-en">Annual Report</span>
<span class="int-he">דו"ח שנתי</span></h1>
{% endif %}
<div class="annualReport"><a href="/annualreport">Open the Current Annual Report (PDF)</a></div>
</div>
</main>
Expand Down
6 changes: 2 additions & 4 deletions templates/static/privacy-policy.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='privacy' title="Privacy Policy" heTitle="מדיניות פרטיות" %}
{% include '_sidebar.html' with whichPage='privacy' %}
{% endif %}
<div id="" class="container doc legal static">

<div class="inner">
{% if request.user_agent.is_mobile %}
<h1 class="mobileAboutHeader"><span class="int-en">Privacy Policy</span><span class="int-he">מדיניות פרטיות</span></h1>
{% endif %}
<h1 class="aboutHeader"><span class="int-en">Privacy Policy</span><span class="int-he">מדיניות פרטיות</span></h1>
<iframe src="https://docs.google.com/document/d/e/2PACX-1vTItZ7aXzScKUIzMgWP8GaiWjjKPDAXGDUVpvLG8vv-xb42MaGGQMjctIQwKKT5pAuSHSFCKyHfdm53/pub?embedded=true"></iframe> </div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/static/products.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='products' title="Products" heTitle="המוצרים של ספריא" %}
{% include '_sidebar.html' with whichPage='products' %}
{% endif %}
<main id="productsPage">
<div id="productsPageContent">
Expand Down
6 changes: 2 additions & 4 deletions templates/static/supporters.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='supporters' title="Our Supporters" heTitle="התומכים שלנו" %}
{% include '_sidebar.html' with whichPage='supporters' %}
{% endif %}
<div id="supportersPage" class="container static biReady">
<div class="inner">
{% if request.user_agent.is_mobile %}
<h1 class="mobileAboutHeader">
<h1 class="aboutHeader">
<span class="int-en">Our Supporters</span>
<span class="int-he">התומכים שלנו</span>
</h1>
{% endif %}
<div class="section leading-supporters">
<p class="tagline">
<span class="int-en">
Expand Down
6 changes: 2 additions & 4 deletions templates/static/team.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@
{% block content %}
<div class="superAbout">
{% if not request.user_agent.is_mobile %}
{% include '_sidebar.html' with whichPage='team' title="Team" heTitle="צוות ספריא" %}
{% include '_sidebar.html' with whichPage='team' %}
{% endif %}
<main id="teamPage" class="container static sans-serif">
<div class="inner">
<header>
{% if request.user_agent.is_mobile %}
<h1 class="mobileAboutHeader">
<h1 class="aboutHeader">
<span class="int-en">Team</span>
<span class="int-he">צוות ספריא</span>
</h1>
{% endif %}
<header>

</header>
Expand Down
Loading
Loading