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

Ui fixes #39

Merged
merged 2 commits into from
Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 public/css/_donate.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.header-bg {
background: linear-gradient(rgba(32,32,32,0) 0%, var(--background) 40%), url(../images/raster/donate_top.webp);
background: linear-gradient(rgba(32,32,32,0) 0%, var(--background) 40%), url(../images/raster/donate_top.jpg);
background-position: top;
background-origin: border-box;
background-repeat: no-repeat;
Expand Down
4 changes: 2 additions & 2 deletions public/css/_first_run.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ h1, p {
.fr-1 {
width: 100vw;
height: 100vh;
background: url('/images/raster/updates_header.webp'), #8e7ebb;
background: url('/images/raster/updates_header.jpg'), #8e7ebb;
background-size: cover;
background-blend-mode: multiply;
background-position: right;
Expand All @@ -73,7 +73,7 @@ h1, p {
.fr-2 {
width: 100vw;
height: 100vh;
background-image: url('/images/raster/updates_header.webp') #291561;
background-image: url('/images/raster/updates_header.jpg') #291561;
background-size: cover;
background-position: right;
padding: 27vh 0rem 0 0;
Expand Down
2 changes: 1 addition & 1 deletion public/css/_updates.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

.header-bg {
background: linear-gradient(rgba(32,32,32,0) 0%, var(--background) 40%), url(../images/raster/updates_header.webp);
background: linear-gradient(rgba(32,32,32,0) 0%, var(--background) 40%), url(../images/raster/updates_header.jpg);
background-position: top;
background-origin: border-box;
background-repeat: no-repeat;
Expand Down
Binary file added public/images/raster/boy-horz.jpg
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 public/images/raster/covid_pandemic.jpg
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 public/images/raster/donate_top.jpg
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 public/images/raster/donate_vert.jpg
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 public/images/raster/hands-vert.jpg
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 public/images/raster/updates_header.jpg
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 public/images/raster/video-horz.jpg
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 public/images/raster/wallpaper-quote.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ <h2>Updates</h2>
</a>
</nav>
</div>
<img src="https://gg-analytics.glitch.me/counter.png?fallback=MY_WEBSITE&color=black" alt="" style="vertical-align: bottom;" aria-hidden="true">
<script>

if ("serviceWorker" in navigator) {
Expand Down
8 changes: 4 additions & 4 deletions public/js/_gg_ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ let getActionsContent = (cActions) => {
let loadStaticCards = (cMainContent) =>{
const donateCard = createVerticalCard( 'Donate directly to the UNDP',
'Donate as little as £1 to support any Global Goal through a quick in-app purchase.',
'images/raster/donate_vert.webp',
'images/raster/donate_vert.jpg',
0,
[['Donate','https://give.undp.org/give/120717/#!/donation/checkout']]);

Expand All @@ -242,7 +242,7 @@ let loadStaticCards = (cMainContent) =>{
cMainContent.appendChild(learnCard);
const peopleCard = createHorizontalCard('We the People',
'This star-studded video introduces the new plan for the people and planet: the UN Global Goals for Sustainable Development. Audio is in English.</p>',
'/images/raster/video-horz.webp',
'/images/raster/video-horz.jpg',
0,
[['Watch','https://youtu.be/RpqVmvMCmp0']]
);
Expand All @@ -251,15 +251,15 @@ let loadStaticCards = (cMainContent) =>{

const workCard = createHorizontalCard('How this app works',
'When you see ads from this app, you will earn money for donations that support the Global Goals, such as fighting to end poverty, reducing social inequality, and tackling climate change.',
'/images/raster/boy-horz.webp',
'/images/raster/boy-horz.jpg',
0,
null
);
cMainContent.appendChild(workCard);

const unCard = createVerticalCard('Developed by the United Nations',
'The 17 Global Goals, also called the Sustainable Development Goals (SDGs), were built on decades of work by the UN and adopted by all host countries',
'/images/raster/undp.webp',
'/images/raster/undp.jpg',
0,
[['Learn More','www.undp.org']])

Expand Down
2 changes: 1 addition & 1 deletion public/js/donate.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function loadDonationsCard(){
window.addEventListener('load', () => {
//adds the default donate card
let mc = document.getElementById('_main_content');
let defaultDonateCard = createVerticalCard('Donate directly to the UNDP', 'Donate to the UNDP to help tackle the root causes of poverty and create a better life for everyone.', '/images/raster/donate_vert.webp', 0, [['Donate', 'https://give.undp.org/give/120717/#!/donation/checkout']]);
let defaultDonateCard = createVerticalCard('Donate directly to the UNDP', 'Donate to the UNDP to help tackle the root causes of poverty and create a better life for everyone.', '/images/raster/donate_vert.jpg', 0, [['Donate', 'https://give.undp.org/give/120717/#!/donation/checkout']]);
mc.appendChild(defaultDonateCard);
});

Expand Down
4 changes: 2 additions & 2 deletions public/js/goal.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function getSamsungCard(goal, posts){
if(card){
postCard = createHorizontalCard(card.title,
card.message,
'/images/raster/samsung.webp',
'/images/raster/samsung.jpg',
goal,
[[card.action,card.actionUrl]],
false,
Expand Down Expand Up @@ -127,7 +127,7 @@ function loadStaticGoalsCards(cRootContent){

const developedCard = createVerticalCard('Developed by United Nations',
'The 17 Global Goals, also called the Sustainable Development Goals (SDGs), were built on decades of work by the UN and adopted by all host countries.',
'/images/raster/undp.webp',
'/images/raster/undp.jpg',
0,
[['Learn more','www.undp.org']]
);
Expand Down
2 changes: 1 addition & 1 deletion public/js/updates.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ async function loadWallpapers(){
wallpaperCard = createWallpaperCard(`<p>Julia Gillard</p>
<p>#GlobalGoal4</p>
<a href="goal.html?no=4" id="link-goal">Learn More</a>`,
'/images/raster/wallpaper-quote.webp',
'/images/raster/wallpaper-quote.jpg',
4
)
}
Expand Down
5 changes: 5 additions & 0 deletions public/serviceworker.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@ var urlsToCache = [
'css/gg-light.css',
'css/gg.css',
'images/raster/hands-vert.webp',
'images/raster/hands-vert.jpg',
'images/raster/goals-vert.jpg',
'images/raster/video-horz.webp',
'images/raster/video-horz.jpg',
'images/raster/boy-horz.webp',
'images/raster/boy-horz.jpg',
'images/raster/goals_header.jpg',
'images/raster/covid_pandemic.webp',
'images/raster/covid_pandemic.jpg',
'images/raster/wallpaper-quote.webp',
'images/raster/wallpaper-quote.png',
'assets/goalsDetail.js',
'js/_gg_ui.js',
'offline.html'
Expand Down