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

feat: add stuff for taylor swift day and add a place for the petition #98

Merged
merged 25 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ea2022e
feat: check point
YummyOreo Apr 11, 2024
57a6cac
feat: design 1
YummyOreo Apr 12, 2024
3a3a167
feat: design 2
YummyOreo Apr 12, 2024
6fafa49
feat: make each have their own page
YummyOreo Apr 12, 2024
e7ade9c
fix: paths
YummyOreo Apr 12, 2024
90148aa
fix: corrupted files
YummyOreo Apr 12, 2024
9e668b6
Add files via upload
YummyOreo Apr 12, 2024
e69980c
feat: add mobile styling, highlighting and more
YummyOreo Apr 16, 2024
a123121
Merge branch 'april-17th' of https://github.com/YummyOreo/tbfightersd…
YummyOreo Apr 16, 2024
721ba3e
add files
YummyOreo Apr 16, 2024
e5a2260
Revert "add files"
YummyOreo Apr 16, 2024
5ba6adc
feat: exclude images in eol stuff
YummyOreo Apr 16, 2024
37dc8ff
fix: some issues with paths
YummyOreo Apr 16, 2024
e513c9d
feat: update featured action to be taylor swift stuff
YummyOreo Apr 17, 2024
6688c26
fix: centering and left align stuff
YummyOreo Apr 17, 2024
149c7a9
fix: make the spacing more equal
YummyOreo Apr 17, 2024
b6b3462
Merge branch 'main' of https://github.com/TBfighters/tbfightersdotorg…
YummyOreo Apr 17, 2024
5e2ce0b
chore: auto update featured actions
github-actions[bot] Apr 17, 2024
4cfa832
refactor: remove unused stuff
YummyOreo Apr 17, 2024
000d7ad
Merge branch 'april-17th' of https://github.com/YummyOreo/tbfightersd…
YummyOreo Apr 17, 2024
f19085b
refactor: remove unused img
YummyOreo Apr 17, 2024
28bb285
fix: change the graphics link to link to the correct sub folder
YummyOreo Apr 17, 2024
61c31db
chore: auto update featured actions
github-actions[bot] Apr 17, 2024
676d80c
refactor: change to use tblink
YummyOreo Apr 17, 2024
d97ba91
chore: auto update featured actions
github-actions[bot] Apr 17, 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
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Declare files that will always have LF line endings on checkout.
* text eol=lf
*.{html,md,css,js,json} text eol=lf
1 change: 1 addition & 0 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ <h2 id="getinvolved">Get Involved</h2>
&copy; The TBFighters Project | <a href="privacy.html" class="footer-link">Privacy Policy</a>
</p>
<p class="too-small">

We lead by following and we act with compassion. Get in touch: contact at tbfighters dot org
</p>
</footer>
Expand Down
25 changes: 25 additions & 0 deletions action-page.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#petition-wrapper {
background-image: url('./img/petition header 1.png');
background-position: center;
background-size: cover;
color: #F5F5F5;
text-shadow: #121212 1px 1px 10px;
}

#petition-wrapper div div {
margin-left: 40%;
max-width: 40%;
}


@media only screen and (max-width: 992px) {
#petition-wrapper {
background: #3c3f60;
}

#petition-wrapper div div {
margin: 0 1em;
width: auto;
max-width: none;
}
}
35 changes: 22 additions & 13 deletions action.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
/>
<script src="actions.js"></script>
<script src="action-page.js" defer></script>
<link rel="stylesheet" href="action-page.css">
<title>Take Action | TBFighters</title>
</head>

Expand Down Expand Up @@ -57,21 +58,29 @@ <h1 class="break-anywhere">Take <span class="red">Action</span></h1>
<p>
Join the fight for accessible and affordable testing! We'll keep this page updated with current actions, theme days and other campaigns, contact information, templates, graphics, and more!
</p>
<p>
You can also stay up-to-date by <a href="#list">signing up for our mailing list</a>. Emails may be authored by TBFighters, John Green, and partner organizations, such as MSF Access and PIH.
</p>
<p class="smaller">
<em>Threats and intimidation are <strong>never okay</strong>. Be polite and respectful in all interactions&mdash;we're all human here! Please read the <a href="activism-guide.html">activism guide</a> as well!</em>
</p>
<h2 id="contact">Contact <span class="red">Danaher and Cepheid</span></h2>
<p>
Come up with your own messages, or use our templates, guides, and graphics to tell Danaher and Cepheid it's #TimeFor5!
</p>
<p class="featured">
<strong>FEATURED ACTION:</strong> <a href="https://timefor5.msfaccess.org/" target="_blank">Sign the petition</a> asking Danaher to lower the cost of ALL their crucial tests to $5!

<p class="featured" style="margin-top: 1.4em;">
<strong>FEATURED ACTION:</strong> It's time to ask Danaher a <em>Question</em>... <em>Long Story Short</em> we need them to <em>Change</em> the price of their GeneXpert tests, so we wrote them an album to tell them how we feel. We want an end to the <em>Great War</em> so we can all have some <em>Closure</em>. Find memes and graphics in the <a href="https://tbfighter.link/theme" target="_blank">TBFighters Graphics Library</a> and check out the community-made <a href="https://tbfighter.link/songs">Taylor Swift parodies here</a>!<br><span class="buttons" style="width: 100%;"><a class="button" href="https://tbfighter.link/songs" style="margin: 0.5em 0;">Songs</a> <a href="https://tbfighter.link/theme" class="button button-subtle" style="margin: 0.5em 0;">Graphics Library</a></span>
</p>
</div>
<div id="petition-wrapper" style="margin: 2em 0;">
<div class="wrapper-full">
<div style="height: 5px;"></div>
<hr>
<div class="action">
<h3 class="wrap-centered" id="petition">
Sign the <strong class="highlight">Petition</strong>
</h3>
<p>
We call on <span class="highlight">Danaher</span> to drop the price of their GeneXpert medical tests supplied to low- and middle-income countries to <span class="highlight">US$5</span> each for all diseases so that millions more people around the world can be properly diagnosed and receive the treatment they need to stay alive and healthy.
</p>
<p class="smaller">
<a class="button" href="https://timefor5.msfaccess.org" target="_blank" style="box-shadow: var(--aside-shadow);">Sign the petition</a>
</p>
</div>
<hr>
<div style="height: 5px;"></div>
</div>
</div>
<div class="wrapper-full wrapper-action-grid">
<div class="action">
<p class="larger">
Expand Down
2 changes: 2 additions & 0 deletions img/highlight.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/petition header 1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,14 @@ <h1>
</div>
<div class="wrapper wrapper-columns featured-columns">
<p>
<strong>FEATURED ACTION:</strong> <a href="https://timefor5.msfaccess.org/" target="_blank">Sign the petition</a> asking Danaher to lower the cost of ALL their crucial tests to $5!
<strong>FEATURED ACTION:</strong> It's time to ask Danaher a <em>Question</em>... <em>Long Story Short</em> we need them to <em>Change</em> the price of their GeneXpert tests, so we wrote them an album to tell them how we feel. We want an end to the <em>Great War</em> so we can all have some <em>Closure</em>. Find memes and graphics in the <a href="https://tbfighter.link/theme" target="_blank">TBFighters Graphics Library</a> and check out the community-made <a href="https://tbfighter.link/songs">Taylor Swift parodies here</a>!<br><span class="buttons" style="width: 100%;"><a class="button" href="https://tbfighter.link/songs" style="margin: 0.5em 0;">Songs</a> <a href="https://tbfighter.link/theme" class="button button-subtle" style="margin: 0.5em 0;">Graphics Library</a></span>

</p>
<div class="buttons">
<a class="button" href="action.html">More actions</a>
<a class="button button-subtle" href="action.html#list">Newsletter signup</a>
</div>
<!-- TODO: uncomment this when you change the featured action -->
<!-- <div class="buttons"> -->
<!-- <a class="button" href="action.html">More actions</a> -->
<!-- <a class="button button-subtle" href="action.html#list">Newsletter signup</a> -->
<!-- </div> -->
</div>
<div class="wrapper wrap-centered">
<a href="#primer"><img src="img/arrow-down.svg" class="scroll-arrow" alt="down-arrow"></a>
Expand Down Expand Up @@ -143,8 +144,7 @@ <h2 class="action-head">Take <span class="red">Action</span>:</h2>
</div>
<div class="join-right">
<p class="featured">
<strong>FEATURED ACTION:</strong> <a href="https://timefor5.msfaccess.org/" target="_blank">Sign the petition</a> asking Danaher to lower the cost of ALL their crucial tests to $5!

<strong>FEATURED ACTION:</strong> It's time to ask Danaher a <em>Question</em>... <em>Long Story Short</em> we need them to <em>Change</em> the price of their GeneXpert tests, so we wrote them an album to tell them how we feel. We want an end to the <em>Great War</em> so we can all have some <em>Closure</em>. Find memes and graphics in the <a href="https://tbfighter.link/theme" target="_blank">TBFighters Graphics Library</a> and check out the community-made <a href="https://tbfighter.link/songs">Taylor Swift parodies here</a>!<br><span class="buttons" style="width: 100%;"><a class="button" href="https://tbfighter.link/songs" style="margin: 0.5em 0;">Songs</a> <a href="https://tbfighter.link/theme" class="button button-subtle" style="margin: 0.5em 0;">Graphics Library</a></span>
</p>
<a class="button button-centered" href="action.html">More actions and templates</a>
</div>
Expand Down
13 changes: 12 additions & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ a[target="_blank"]:not(:has(img))::after {
width: 10px;
margin: 0 3px;
}

a:has(img) {
display: inline-block;
}
Expand Down Expand Up @@ -274,8 +275,9 @@ p.featured {
display: block;
background-color: #DDDDDD;
text-align: center;
padding: 10px 15px;
padding: 20px 25px;
margin: 0 1em .6em;
font-size: 1.2em;
box-shadow: var(--aside-shadow);
}

Expand All @@ -288,9 +290,17 @@ p.featured {
.featured-columns .button, .featured-columns .button-subtle {
margin: .125em .5em;
width: 200px;
min-width: fit-content;
padding: .5em .8em;
}

.highlight {
background-image: url("img/highlight.svg");
padding: 0 0.15em;
margin: 0 -0.15em;
color: #F5F5F5;
}

/* ===============
PAGE HEADER
=============== */
Expand Down Expand Up @@ -847,6 +857,7 @@ h2.action-head {
flex-direction: row;
flex-wrap: nowrap;
justify-content: flex-start;
gap: 0.5em;
}

.buttons .button {
Expand Down
1 change: 1 addition & 0 deletions timeline.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ <h2>July 11 2023</h2>
&copy; The TBFighters Project | <a href="privacy.html" class="footer-link">Privacy Policy</a>
</p>
<p class="too-small">

We lead by following and we act with compassion. Get in touch: contact at tbfighters dot org
</p>
</footer>
Expand Down
2 changes: 1 addition & 1 deletion update-action/featured-action.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<a href="https://timefor5.msfaccess.org/" target="_blank">Sign the petition</a> asking Danaher to lower the cost of ALL their crucial tests to $5!
It's time to ask Danaher a <em>Question</em>... <em>Long Story Short</em> we need them to <em>Change</em> the price of their GeneXpert tests, so we wrote them an album to tell them how we feel. We want an end to the <em>Great War</em> so we can all have some <em>Closure</em>. Find memes and graphics in the <a href="https://tbfighter.link/theme" target="_blank">TBFighters Graphics Library</a> and check out the community-made <a href="https://tbfighter.link/songs">Taylor Swift parodies here</a>!<br><span class="buttons" style="width: 100%;"><a class="button" href="https://tbfighter.link/songs" style="margin: 0.5em 0;">Songs</a> <a href="https://tbfighter.link/theme" class="button button-subtle" style="margin: 0.5em 0;">Graphics Library</a></span>