diff --git a/Gemfile.lock b/Gemfile.lock index 3191b88..a63c709 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,10 +25,12 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) + eventmachine (1.2.7-x64-mingw32) execjs (2.7.0) faraday (1.0.0) multipart-post (>= 1.2, < 3) ffi (1.12.2) + ffi (1.12.2-x64-mingw32) forwardable-extended (2.6.0) gemoji (3.0.1) github-pages (204) @@ -206,6 +208,8 @@ GEM multipart-post (2.1.1) nokogiri (1.10.8) mini_portile2 (~> 2.4.0) + nokogiri (1.10.8-x64-mingw32) + mini_portile2 (~> 2.4.0) octokit (4.16.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) @@ -240,6 +244,7 @@ GEM PLATFORMS ruby + x64-mingw32 DEPENDENCIES github-pages diff --git a/_includes/article-carousel.html b/_includes/article-carousel.html deleted file mode 100644 index 8d07103..0000000 --- a/_includes/article-carousel.html +++ /dev/null @@ -1,65 +0,0 @@ -{% if site.categories.articles.size > 1 %} - {% assign article_list_displayed = false %} - {% for article in site.categories.articles %} - {% if article.url != page.url %} - {% assign authors = article.authors | split: ", " %} - {% for author in authors %} - {% assign article_date = article.date | date: "%Y" %} - {% assign current_article_date = page.date | date: "%Y" %} - {% if article_date == current_article_date %} - {% assign current_authors = page.authors | split: ", " %} - {% for current_author in current_authors %} - {% assign break = false %} - {% if author == current_author %} - {% if article_list_displayed == false %} -

- {% if current_authors.size > 1 %} - Other Articles By These Authors - {% else %} - Other Articles By This Author - {% endif %} -

- -
- {% assign article_list_displayed = true %} - {% endif %} - -
-
-
-
-

{{ article.title }}

-

- - | by {{ article.authors }} -

-
-
-
- -
-
- - -
-
- {% assign break = true %} - {% break %} - {% endif %} - {% endfor %} - {% endif %} - {% if break == true %} - {% break %} - {% endif %} - {% endfor %} - {% endif %} - {% endfor %} - {% if article_list_displayed == true %} - -
- {% endif %} -{% endif %} diff --git a/_includes/article-page-head.html b/_includes/article-page-head.html index f2a8bf2..fe286cc 100644 --- a/_includes/article-page-head.html +++ b/_includes/article-page-head.html @@ -1,5 +1,2 @@ - - - diff --git a/_includes/footer.html b/_includes/footer.html index 32d206d..e7ac624 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,4 +1,6 @@ - +
+ +
\ No newline at end of file diff --git a/_includes/head.html b/_includes/head.html index 9208adc..b5805b8 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -39,6 +39,9 @@ + + + diff --git a/_includes/navbar.html b/_includes/navbar.html index daf86c1..1c788c2 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -2,7 +2,7 @@
{% include footer.html %} - {% include top-scroll-button.html %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html b/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html index 443a6d1..16e9fb4 100644 --- a/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html +++ b/_site/articles/2019/03/06/could-sky-high-aims-bring-reading-down.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,16 +251,17 @@
-

Could Sky-High Aims Bring Reading Down?

+
+

Could Sky-High Aims Bring Reading Down?

+
+
One of the buildings in CNM Estates' Verto developments | © Reading School
+

| by Ben P

-
- -
One of the buildings in CNM Estates' Verto developments | © Reading School
-
-

On February 6th, 2019, Berkeley Developments started to tear down the old Homebase and Toys R Us in Forbury Retail Park, Reading, to turn it into a housing estate. Homebase and Toys R Us are some of the many buildings being knocked down in the area to make way for new high-rise flats, but could reaching for the sky also have a negative effect that brings the people of Reading down?

+
+

On February 6th, 2019, Berkeley Developments started to tear down the old Homebase and Toys R Us in Forbury Retail Park, Reading, to turn it into a housing estate. Homebase and Toys R Us are some of the many buildings being knocked down in the area to make way for new high-rise flats, but could reaching for the sky also have a negative effect that brings the people of Reading down?

As of worldpopulationreview.com, since the year 2000, the population of Reading has increased by 43,253 people. The population of Reading continues to increase so more residencies are needed to give people the shelter and safety they need. The Government has a target to build 300,000 new homes nationally each year which must be met.

@@ -271,267 +287,15 @@

So, Reading needs to plan carefully and take action to respond to all the needs of its growing population, to keep it an attractive place to live and work and make sure its success doesn’t become its downfall.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/finished-product.html b/_site/articles/2019/03/06/finished-product.html index b8d2abd..623b611 100644 --- a/_site/articles/2019/03/06/finished-product.html +++ b/_site/articles/2019/03/06/finished-product.html @@ -42,16 +42,16 @@ + + + - - - - + @@ -67,7 +67,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -235,316 +250,27 @@
-

The Finished Product

+
+

The Finished Product

+
+
Reading School's 2019 BBC Young Reporter team at the end of the day
+

| by Mr Baldock

-
- -
Reading School's 2019 BBC Young Reporter team at the end of the day
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

+
- Other Articles By This Author - -

- -
- - - -
-
-
-
-

Reading School's BBC Young Reporter Team… Ready To Go!

-

- - | by Mr Baldock -

-
-
-
- -
-
- -
- - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.html b/_site/articles/2019/03/06/student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.html index fbbb529..8b59b0e 100644 --- a/_site/articles/2019/03/06/student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.html +++ b/_site/articles/2019/03/06/student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,16 +251,17 @@
-

Student Survey Shows Rosa Parks Is Most Inspirational Woman Ever

+
+

Student Survey Shows Rosa Parks Is Most Inspirational Woman Ever

+
+
Rosa Parks - who topped the poll | © BBC
+

| by Tom S-R, Ben S-R

-
- -
Rosa Parks - who topped the poll | © BBC
-
-

Tomorrow is International Women’s Day (7th March 2019) and we went around our school finding out who people in the school environment thought was the most inspirational woman ever. 90 students and staff took part in the survey which crowned Rosa Parks as the winner.

+
+

Tomorrow is International Women’s Day (7th March 2019) and we went around our school finding out who people in the school environment thought was the most inspirational woman ever. 90 students and staff took part in the survey which crowned Rosa Parks as the winner.

Rosa Parks was an American civil rights activist in the mid-20th century, who became famous for refusing to give up her seat on a bus to a white person in December 1955. When Ben P, who voted for Rosa Parks, was asked why he voted this way, he said “She devoted her life to freeing people and giving rights to the people who need them most, which is quite a sacrifice.”

@@ -264,319 +280,15 @@
The results from our student survey | © Reading School
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - Other Articles By These Authors - -

- -
- - - -
-
-
-
-

What's Next For Reading Prison?

-

- - | by Tom S-R, Ben S-R -

-
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.html b/_site/articles/2019/03/06/tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.html index 1ea0cba..a7d9faf 100644 --- a/_site/articles/2019/03/06/tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.html +++ b/_site/articles/2019/03/06/tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,16 +251,17 @@
-

Tennis Club Needs To Relocate As Redevelopment Plans Are Called ‘Out’

+
+

Tennis Club Needs To Relocate As Redevelopment Plans Are Called ‘Out’

+
+
A rainy winters day at Caversham lawn tennis club | © Reading School
+

| by Hal R-D

-
- -
A rainy winters day at Caversham lawn tennis club | © Reading School
-
-

A ninety-nine year old sports institution is looking for a new home; club member and BBC Young Reporter Hal investigates.

+
+

A ninety-nine year old sports institution is looking for a new home; club member and BBC Young Reporter Hal investigates.

Caversham Lawn Tennis Club, which celebrates its centenary in 2020, has voted to move venues following the rejection of their planning application for floodlights.

@@ -285,267 +301,15 @@ Others objected to the planning application by expressing fears of the damaging

The club is now preparing for the move which members hope will happen within the next few years. The club will move when new facilities are built at proposed site of Caversham Heath golf club, but the tennis club is still looking for a buyer for the current location within the next few months.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/video-games-virtual-fantasy-or-a-virtual-prison.html b/_site/articles/2019/03/06/video-games-virtual-fantasy-or-a-virtual-prison.html index 811e0f9..256e5ad 100644 --- a/_site/articles/2019/03/06/video-games-virtual-fantasy-or-a-virtual-prison.html +++ b/_site/articles/2019/03/06/video-games-virtual-fantasy-or-a-virtual-prison.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,16 +251,17 @@
-

Video Games - Virtual Fantasy Or A Virtual Prison?

+
+

Video Games - Virtual Fantasy Or A Virtual Prison?

+
+
Fortnite - one of the world's biggest video games | © Getty
+

| by Kamran S

-
- -
Fortnite - one of the world's biggest video games | © Getty
-
-

With Fortnite Season 8 unveiled last week, Tom Clancy’s Rainbow 6 Siege Year 4 beginning yesterday and two of the world’s most anticipated games, Red Dead Redemption 2 and Call of Duty: Black Ops 4, just released, there’s no better time for young people to be educated on how to stay safe while gaming. Xbox player and Rainbow 6 enthusiast Kamran S reports on the issues to do with bullying in video games.

+
+

With Fortnite Season 8 unveiled last week, Tom Clancy’s Rainbow 6 Siege Year 4 beginning yesterday and two of the world’s most anticipated games, Red Dead Redemption 2 and Call of Duty: Black Ops 4, just released, there’s no better time for young people to be educated on how to stay safe while gaming. Xbox player and Rainbow 6 enthusiast Kamran S reports on the issues to do with bullying in video games.

Three Reading School gamers were involved in a situation where one of them had been playing online with another player they didn’t know who sent him a pornographic image “as a joke”. When speaking about how he tackled the situation he said, “I didn’t want to lose the privilege of playing on the Playstation”, that was the reason he didn’t tell his parents. The other two students he told took it upon themselves to sort it out and tell their school what the victim couldn’t because he thought he would get in trouble. This proves that awareness needs to be raised as the victim didn’t know what to do, in fear that he would not be able to play on his PlayStation.

@@ -287,267 +303,15 @@ Well of course the most effective and most common method experienced by Reading

The gamers I contacted said that there is a lack of awareness in the community on how to deal with these situations. Declan says: “awareness is not raised enough for young people to know what to do when they experience these situations.” Tom thinks that the un-educated should be told in PSHE lessons, or made aware of the problems: “This will encourage them to ask how they are able to address the problems themselves.” Reading School gamers, Xbox and Playstation alike, agreed that developers do try to raise awareness about in-game bullying but they do not do it enough.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/what-is-in-the-patients-best-interest.html b/_site/articles/2019/03/06/what-is-in-the-patients-best-interest.html index f8af70a..41c224e 100644 --- a/_site/articles/2019/03/06/what-is-in-the-patients-best-interest.html +++ b/_site/articles/2019/03/06/what-is-in-the-patients-best-interest.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,16 +251,17 @@
-

What Is 'In The Patient's Best Interest’?

+
+

What Is 'In The Patient's Best Interest’?

+
+
Disagreements, difficult decisions and assisted dying. What is 'in the patient's best interest'? | © BBC
+

| by Aadith C

-
- -
Disagreements, difficult decisions and assisted dying. What is 'in the patient's best interest'? | © BBC
-
-

The Royal College of Physicians (RCP) has announced they are polling their fellows and members on their stance on assisted dying. The poll opened on the 5th of February and it closed on the 1st of March. The RCP is yet to release the results. The debate has been reignited by a public push to look into what the patient’s ‘best interest’ is in many different scenarios.

+
+

The Royal College of Physicians (RCP) has announced they are polling their fellows and members on their stance on assisted dying. The poll opened on the 5th of February and it closed on the 1st of March. The RCP is yet to release the results. The debate has been reignited by a public push to look into what the patient’s ‘best interest’ is in many different scenarios.

The UK law currently allows medical decisions that are classified as in ‘the best interest’ of the patient. But what is it and how is it used in the NHS?

@@ -298,283 +314,15 @@ It is standard protocol in the NHS that doctors must consult with the patient an

In their view, palliative care is a ‘wonderful resource’ but ‘cannot help in all situations’. They also suggest that discussions on how assisted dying can be ‘safely and comprehensively’ implemented into UK healthcare.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - Other Articles By This Author - -

- -
- - - -
-
-
-
-

Book Week - Real Life Issues Inspire Sarah Govett

-

- - | by Aadith C, Adit S, Adi V -

-
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/whats-next-for-reading-prison.html b/_site/articles/2019/03/06/whats-next-for-reading-prison.html index 8d2a43c..1445b5e 100644 --- a/_site/articles/2019/03/06/whats-next-for-reading-prison.html +++ b/_site/articles/2019/03/06/whats-next-for-reading-prison.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,16 +251,17 @@
-

What's Next For Reading Prison?

+
+

What's Next For Reading Prison?

+
+
A view of one of the prison buildings | © BBC
+

| by Tom S-R, Ben S-R

-
- -
A view of one of the prison buildings | © BBC
-
-

After being shut 63 months ago, Reading Gaol has remained unused. Reading East MP Matt Rodda says, during this time, “The government has spent over one million pounds on just maintaining the site … whilst homelessness has increased in our borough [Reading East] by 700%.” Currently a feasibility study is being undertaken by Theatre and Arts Reading (TAR) and is nearing completion. Mrs Scott, the TAR Executive Secretary said TAR hopes “to have some sort of public announcement in March which will update everyone on what is happening.”

+
+

After being shut 63 months ago, Reading Gaol has remained unused. Reading East MP Matt Rodda says, during this time, “The government has spent over one million pounds on just maintaining the site … whilst homelessness has increased in our borough [Reading East] by 700%.” Currently a feasibility study is being undertaken by Theatre and Arts Reading (TAR) and is nearing completion. Mrs Scott, the TAR Executive Secretary said TAR hopes “to have some sort of public announcement in March which will update everyone on what is happening.”

In June 2014, it was proposed locally that Reading Gaol should be turned into a theatre and arts centre. However, 17 months later, the then Chancellor George Osborne and the then Justice Secretary Michael Gove announced that the site might be sold to housing developers.

@@ -292,319 +308,15 @@ Under the plan, the main theatre would operate on a commercial basis with the re
An inside view of the prison | © BBC
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - Other Articles By These Authors - -

- -
- - - -
-
-
-
-

Student Survey Shows Rosa Parks Is Most Inspirational Woman Ever

-

- - | by Tom S-R, Ben S-R -

-
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/articles/2019/03/06/young-reporter-team-ready-to-go.html b/_site/articles/2019/03/06/young-reporter-team-ready-to-go.html index 922f6cc..419a62c 100644 --- a/_site/articles/2019/03/06/young-reporter-team-ready-to-go.html +++ b/_site/articles/2019/03/06/young-reporter-team-ready-to-go.html @@ -43,16 +43,16 @@ + + + - - - - + @@ -68,7 +68,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -236,318 +251,29 @@
-

Reading School's BBC Young Reporter Team… Ready To Go!

+
+

Reading School's BBC Young Reporter Team… Ready To Go!

+
+
Reading School's 2019 BBC Young Reporter team | © Reading School
+

| by Mr Baldock

-
- -
Reading School's 2019 BBC Young Reporter team | © Reading School
-
-

Here are our intrepid Young Reporters, chomping at the bit to bring you lots of terrific stories about Reading School, our local area and the amazing things happening here. And rest assured, this will be a Brexit-free zone.

+
+

Here are our intrepid Young Reporters, chomping at the bit to bring you lots of terrific stories about Reading School, our local area and the amazing things happening here. And rest assured, this will be a Brexit-free zone.

Breaking news will appear here as it happens…

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - Other Articles By This Author - -

- -
- - - -
-
-
-
-

The Finished Product

-

- - | by Mr Baldock -

-
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/articles/2020/03/01/test.html b/_site/articles/2020/03/01/test.html index 87b9876..13b4fd3 100644 --- a/_site/articles/2020/03/01/test.html +++ b/_site/articles/2020/03/01/test.html @@ -42,16 +42,16 @@ + + + - - - - + @@ -67,7 +67,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -235,200 +250,27 @@
-

Test

+
+

Test

+
+
A caption for the cover image
+

| by Matthew G

-
- -
A caption for the cover image
-
-

Content

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+

Content

+
- - +
+ +
Scroll to top diff --git a/_site/articles/2020/03/02/test1.html b/_site/articles/2020/03/02/test1.html index 441413a..f404a41 100644 --- a/_site/articles/2020/03/02/test1.html +++ b/_site/articles/2020/03/02/test1.html @@ -42,16 +42,16 @@ + + + - - - - + @@ -67,7 +67,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -235,238 +250,27 @@
-

Title

+
+

Title

+
+
A caption for the cover image
+

| by Name

-
- -
A caption for the cover image
-
-

Content

+
+

Content

- - - - - - - - - - - - - - - -

- - Other Articles By This Author - -

- -
- - - -
-
-
-
-

Title

-

- - | by Name -

-
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/articles/2020/03/02/test2.html b/_site/articles/2020/03/02/test2.html index 95a7f0b..5b868dd 100644 --- a/_site/articles/2020/03/02/test2.html +++ b/_site/articles/2020/03/02/test2.html @@ -42,16 +42,16 @@ + + + - - - - + @@ -67,7 +67,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -235,238 +250,27 @@
-

Title

+
+

Title

+
+
A caption for the cover image
+

| by Name

-
- -
A caption for the cover image
-
-

Content

+
+

Content

- - - - - - - - - - - - - - - - - -

- - Other Articles By This Author - -

- -
- - - -
-
-
-
-

Title

-

- - | by Name -

-
-
-
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - +
+ +
Scroll to top diff --git a/_site/css/article-page.css b/_site/css/article-page.css index 0706300..961c91b 100644 --- a/_site/css/article-page.css +++ b/_site/css/article-page.css @@ -7,11 +7,26 @@ } .mdc-typography--caption-text { font-style: italic; + margin: 5px; } .mdc-typography--headline5 { margin-bottom: 5px; } +/* change background */ +.article-content { + background-color: var(--mdc-theme-background); + padding-top: 6px; + padding-bottom: 6px; +} + +/* position headline in middle of image */ +.parallax-section { + text-align: center; + vertical-align: middle; + padding: 150px 15px; +} + /* adjust video dimensions depending on screen size */ iframe { @@ -31,8 +46,15 @@ iframe { height: calc(90vw / 16 * 9 - 5px); } .mdc-typography--headline3, .mdc-typography--headline5 { - font-size: 1.5rem; - line-height: 1.625rem; + font-size: 2.5rem; + line-height: 2.625rem; + } +} + +@media screen and (max-width: 400px) { + .mdc-typography--headline3, .mdc-typography--headline5 { + font-size: 2rem; + line-height: 2.125rem; } } @@ -40,60 +62,4 @@ iframe { iframe { height: calc(93.5vw / 16 * 9); } -} - - -/* make article cards look nice by altering margins */ -.mdc-card-content { - margin: 5px 15px 5px 15px; -} - -.mdc-card .mdc-typography--headline6, .mdc-card .mdc-typography--subtitle2 { - margin: 0; -} - - -/* change carousel dots' styling to make them more visible */ -.slick-dots { - position: relative; - bottom: 0; - margin: auto; -} - -.slick-dots li button:before { - font-size: 30px; - opacity: 1; - color: #ababab; -} - -.slick-dots li.slick-active button::before { - font-size: 40px; - opacity: 1; - color: var(--mdc-theme-primary); -} - - -/* ensure buttons don't get in the way & enable scrolling */ -.slick-next { - right: 0; -} - -.slick-prev { - left: 0; -} - - -/* ensure MDC cards are separated enough that they are distinguishable */ -.carousel-item { - margin: 4px; -} - -/* remove excessive margin below carousel */ -.slick-dotted.slick-slider { - margin-bottom: 13px; -} - -/* align article carousel title with carousel items */ -.article-carousel-title { - text-align: center; } \ No newline at end of file diff --git a/_site/css/global.css b/_site/css/global.css index 2b2bbb7..ddfe12c 100644 --- a/_site/css/global.css +++ b/_site/css/global.css @@ -1,7 +1,12 @@ /* change theme */ :root { - --mdc-theme-primary: #273967; - --mdc-theme-secondary: #ef6c00; + --mdc-theme-primary: #253a67; + --mdc-theme-secondary: #ea6343; + --mdc-theme-background: #181a1b; +} + +.mdc-top-app-bar--short-fixed-adjust { + padding-top: 41px; } .mdc-text-field--focused:not(.mdc-text-field--disabled) .mdc-floating-label, .mdc-list-item--activated .mdc-list-item__text, .mdc-drawer .mdc-list-item--activated .mdc-list-item__graphic { @@ -12,6 +17,24 @@ body { font-family: 'Roboto', sans-serif; display: flex; margin: 0; + background-color: var(--mdc-theme-primary); + color: #ffffff; +} +.mdc-drawer { + background-color: var(--mdc-theme-background); +} +.mdc-drawer *, .mdc-drawer .material-icons, .mdc-drawer h3 { + color: #ddd; +} +.mdc-drawer .mdc-list-group__subheader { + color: #ccc; +} + +.mdc-text-field--focused:not(.mdc-text-field--disabled) .mdc-floating-label, .mdc-list-item--activated .mdc-list-item__text, .mdc-drawer .mdc-list-item--activated .mdc-list-item__graphic { + color: var(--mdc-theme-secondary); +} +:not(.mdc-list--non-interactive)>:not(.mdc-list-item--disabled).mdc-list-item--activated::before, :not(.mdc-list--non-interactive)>:not(.mdc-list-item--disabled).mdc-list-item--activated::after { + background-color: var(--mdc-theme-secondary); } a { @@ -33,7 +56,7 @@ a { } .main-content { - margin: 15px; + margin: 15px 0; overflow: auto; } @@ -41,11 +64,49 @@ a { position: absolute; } +.footer-container { + background: var(--mdc-theme-background); + padding: 5px 0; +} footer { margin: 15px; overflow: auto; } +/* change button colours */ +.mdc-button:not(:disabled) { + color: var(--mdc-theme-secondary); + border-color: var(--mdc-theme-secondary); +} +.mdc-button::before, .mdc-button::after { + background-color: var(--mdc-theme-secondary); +} + +/* parallax backgrounds */ +.parallax-section { + position: relative; + z-index: 0; + display: flow-root; +} + +/* responsive side margins */ +.article-section .articles, .article-section-header, .footer-container, .article-content, .footer-container, .article-title-section ~ .mdc-typography--caption-text, .article-title-section, .mdc-typography--subtitle1, .mdc-typography--headline3 { + padding-left: 15%; + padding-right: 15%; +} +@media screen and (max-width: 1000px) { + .article-section .articles, .article-section-header, .footer-container, .article-content, .footer-container, .article-title-section ~ .mdc-typography--caption-text, .article-title-section, .mdc-typography--subtitle1, .mdc-typography--headline3 { + padding-left: 8%; + padding-right: 8%; + } +} +@media screen and (max-width: 800px) { + .article-section .articles, .article-section-header, .footer-container, .article-content, .footer-container, .article-title-section ~ .mdc-typography--caption-text, .article-title-section, .mdc-typography--subtitle1, .mdc-typography--headline3 { + padding-left: 2%; + padding-right: 2%; + } +} + /* edit footer depending on screen size - edits alignment & changes switches between center- and left- aligned BBC Young Reporter logos */ footer span { position: relative; @@ -76,24 +137,6 @@ footer img { } } -/* add side margins */ -.main-content, footer { - margin-left: 15%; - margin-right: 15%; -} -@media screen and (max-width: 600px) { - .main-content, footer { - margin-left: 5%; - margin-right: 5%; - } -} -@media screen and (max-width: 500px) { - .main-content, footer { - margin-left: 2%; - margin-right: 2%; - } -} - /* for cookie notice */ #cookies { display: none; diff --git a/_site/css/home.css b/_site/css/home.css index 08bf437..c350718 100644 --- a/_site/css/home.css +++ b/_site/css/home.css @@ -1,20 +1,3 @@ -html, body { - background-color: var(--mdc-theme-primary); -} -.footer-container { - background: #ffffff; - padding: 5px 0; -} - -.mdc-top-app-bar--short-fixed-adjust { - padding-top: 41px; -} -.article-section { - position: relative; - z-index: 0; - display: flow-root; - background-image: url("/images/backgrounds/2019.jpg"); -} .main-content .mdc-card { float: left; width: calc((100% / 3) - 12px); @@ -24,12 +7,10 @@ html, body { margin: 6px 6px 10px 6px; background: none; } -.main-content { - margin-left: 0; - margin-right: 0; -} .article-section-header { - background-color: rgba(255,255,255,0.8); + background-color: rgba(24,26,27,0.5); + padding-top: 12px; + padding-bottom: 12px; } .article-section-header h1 { margin-block-start: 0; @@ -49,37 +30,23 @@ html, body { left: 0; top: 1.25px; transition: left 0.1s linear; - height: 100%; font-size: inherit; } .article-section-header button:hover span { left: 3px; } -.article-section .articles, .article-section-header { - padding: 12px 15% 12px 15%; -} .splitter { height: 15px; width: 100%; background-color: var(--mdc-theme-primary); } -.article-section:nth-of-type(3) { - background: #ffffff; +.article-section:nth-of-type(3n) { + background: var(--mdc-theme-background); } -.article-section:nth-of-type(3) #jarallax-container-1 { +.article-section:nth-of-type(3n) #jarallax-container-1 { display: none; } -@media screen and (max-width: 1000px) { - .article-section .articles, .article-section-header { - padding: 12px 8% 12px 8%; - } -} -@media screen and (max-width: 800px) { - .article-section .articles, .article-section-header { - padding: 12px 2% 12px 2%; - } -} @media screen and (max-width: 600px) { .article-section .mdc-card:nth-of-type(3) { display: none; diff --git a/_site/css/slick-theme.css b/_site/css/slick-theme.css deleted file mode 100644 index 1232fca..0000000 --- a/_site/css/slick-theme.css +++ /dev/null @@ -1,204 +0,0 @@ -@charset 'UTF-8'; -/* Slider */ -.slick-loading .slick-list -{ - background: #fff url('./ajax-loader.gif') center center no-repeat; -} - -/* Icons */ -@font-face -{ - font-family: 'slick'; - font-weight: normal; - font-style: normal; - - src: url('./fonts/slick.eot'); - src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg'); -} -/* Arrows */ -.slick-prev, -.slick-next -{ - font-size: 0; - line-height: 0; - - position: absolute; - top: 50%; - - display: block; - - width: 20px; - height: 20px; - padding: 0; - -webkit-transform: translate(0, -50%); - -ms-transform: translate(0, -50%); - transform: translate(0, -50%); - - cursor: pointer; - - color: transparent; - border: none; - outline: none; - background: transparent; -} -.slick-prev:hover, -.slick-prev:focus, -.slick-next:hover, -.slick-next:focus -{ - color: transparent; - outline: none; - background: transparent; -} -.slick-prev:hover:before, -.slick-prev:focus:before, -.slick-next:hover:before, -.slick-next:focus:before -{ - opacity: 1; -} -.slick-prev.slick-disabled:before, -.slick-next.slick-disabled:before -{ - opacity: .25; -} - -.slick-prev:before, -.slick-next:before -{ - font-family: 'slick'; - font-size: 20px; - line-height: 1; - - opacity: .75; - color: white; - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.slick-prev -{ - left: -25px; -} -[dir='rtl'] .slick-prev -{ - right: -25px; - left: auto; -} -.slick-prev:before -{ - content: '←'; -} -[dir='rtl'] .slick-prev:before -{ - content: '→'; -} - -.slick-next -{ - right: -25px; -} -[dir='rtl'] .slick-next -{ - right: auto; - left: -25px; -} -.slick-next:before -{ - content: '→'; -} -[dir='rtl'] .slick-next:before -{ - content: '←'; -} - -/* Dots */ -.slick-dotted.slick-slider -{ - margin-bottom: 30px; -} - -.slick-dots -{ - position: absolute; - bottom: -25px; - - display: block; - - width: 100%; - padding: 0; - margin: 0; - - list-style: none; - - text-align: center; -} -.slick-dots li -{ - position: relative; - - display: inline-block; - - width: 20px; - height: 20px; - margin: 0 5px; - padding: 0; - - cursor: pointer; -} -.slick-dots li button -{ - font-size: 0; - line-height: 0; - - display: block; - - width: 20px; - height: 20px; - padding: 5px; - - cursor: pointer; - - color: transparent; - border: 0; - outline: none; - background: transparent; -} -.slick-dots li button:hover, -.slick-dots li button:focus -{ - outline: none; -} -.slick-dots li button:hover:before, -.slick-dots li button:focus:before -{ - opacity: 1; -} -.slick-dots li button:before -{ - font-family: 'slick'; - font-size: 6px; - line-height: 20px; - - position: absolute; - top: 0; - left: 0; - - width: 20px; - height: 20px; - - content: '•'; - text-align: center; - - opacity: .25; - color: black; - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -.slick-dots li.slick-active button:before -{ - opacity: .75; - color: black; -} diff --git a/_site/css/slick.css b/_site/css/slick.css deleted file mode 100644 index 57477e8..0000000 --- a/_site/css/slick.css +++ /dev/null @@ -1,119 +0,0 @@ -/* Slider */ -.slick-slider -{ - position: relative; - - display: block; - box-sizing: border-box; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - -webkit-touch-callout: none; - -khtml-user-select: none; - -ms-touch-action: pan-y; - touch-action: pan-y; - -webkit-tap-highlight-color: transparent; -} - -.slick-list -{ - position: relative; - - display: block; - overflow: hidden; - - margin: 0; - padding: 0; -} -.slick-list:focus -{ - outline: none; -} -.slick-list.dragging -{ - cursor: pointer; - cursor: hand; -} - -.slick-slider .slick-track, -.slick-slider .slick-list -{ - -webkit-transform: translate3d(0, 0, 0); - -moz-transform: translate3d(0, 0, 0); - -ms-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); -} - -.slick-track -{ - position: relative; - top: 0; - left: 0; - - display: block; - margin-left: auto; - margin-right: auto; -} -.slick-track:before, -.slick-track:after -{ - display: table; - - content: ''; -} -.slick-track:after -{ - clear: both; -} -.slick-loading .slick-track -{ - visibility: hidden; -} - -.slick-slide -{ - display: none; - float: left; - - height: 100%; - min-height: 1px; -} -[dir='rtl'] .slick-slide -{ - float: right; -} -.slick-slide img -{ - display: block; -} -.slick-slide.slick-loading img -{ - display: none; -} -.slick-slide.dragging img -{ - pointer-events: none; -} -.slick-initialized .slick-slide -{ - display: block; -} -.slick-loading .slick-slide -{ - visibility: hidden; -} -.slick-vertical .slick-slide -{ - display: block; - - height: auto; - - border: 1px solid transparent; -} -.slick-arrow.slick-hidden { - display: none; -} diff --git a/_site/images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it--cover.jpg b/_site/images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it.jpg similarity index 100% rename from _site/images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it--cover.jpg rename to _site/images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it.jpg diff --git a/_site/images/2019-03-06-are-the-roads-around-your-home-and-school-safe--cover.jpg b/_site/images/2019-03-06-are-the-roads-around-your-home-and-school-safe.jpg similarity index 100% rename from _site/images/2019-03-06-are-the-roads-around-your-home-and-school-safe--cover.jpg rename to _site/images/2019-03-06-are-the-roads-around-your-home-and-school-safe.jpg diff --git a/_site/images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett--cover.jpg b/_site/images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett.jpg similarity index 100% rename from _site/images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett--cover.jpg rename to _site/images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett.jpg diff --git a/_site/images/2019-03-06-could-sky-high-aims-bring-reading-down--cover.jpg b/_site/images/2019-03-06-could-sky-high-aims-bring-reading-down.jpg similarity index 100% rename from _site/images/2019-03-06-could-sky-high-aims-bring-reading-down--cover.jpg rename to _site/images/2019-03-06-could-sky-high-aims-bring-reading-down.jpg diff --git a/_site/images/2019-03-06-finished-product--cover.jpg b/_site/images/2019-03-06-finished-product.jpg similarity index 100% rename from _site/images/2019-03-06-finished-product--cover.jpg rename to _site/images/2019-03-06-finished-product.jpg diff --git a/_site/images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever--cover.jpg b/_site/images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.jpg similarity index 100% rename from _site/images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever--cover.jpg rename to _site/images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.jpg diff --git a/_site/images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out--cover.jpg b/_site/images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.jpg similarity index 100% rename from _site/images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out--cover.jpg rename to _site/images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.jpg diff --git a/_site/images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison--cover.jpg b/_site/images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison.jpg similarity index 100% rename from _site/images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison--cover.jpg rename to _site/images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison.jpg diff --git a/_site/images/2019-03-06-what-is-in-the-patients-best-interest--cover.jpg b/_site/images/2019-03-06-what-is-in-the-patients-best-interest.jpg similarity index 100% rename from _site/images/2019-03-06-what-is-in-the-patients-best-interest--cover.jpg rename to _site/images/2019-03-06-what-is-in-the-patients-best-interest.jpg diff --git a/_site/images/2019-03-06-whats-next-for-reading-prison--cover.jpg b/_site/images/2019-03-06-whats-next-for-reading-prison.jpg similarity index 100% rename from _site/images/2019-03-06-whats-next-for-reading-prison--cover.jpg rename to _site/images/2019-03-06-whats-next-for-reading-prison.jpg diff --git a/_site/images/2019-03-06-young-reporter-team-ready-to-go--cover.jpg b/_site/images/2019-03-06-young-reporter-team-ready-to-go.jpg similarity index 100% rename from _site/images/2019-03-06-young-reporter-team-ready-to-go--cover.jpg rename to _site/images/2019-03-06-young-reporter-team-ready-to-go.jpg diff --git a/_site/images/backgrounds/2019.jpg b/_site/images/backgrounds/2019.jpg index b78f881..9509542 100644 Binary files a/_site/images/backgrounds/2019.jpg and b/_site/images/backgrounds/2019.jpg differ diff --git a/_site/images/backgrounds/2020.jpg b/_site/images/backgrounds/2020.jpg new file mode 100644 index 0000000..9509542 Binary files /dev/null and b/_site/images/backgrounds/2020.jpg differ diff --git a/_site/index.html b/_site/index.html index 20312fc..0712e22 100644 --- a/_site/index.html +++ b/_site/index.html @@ -41,6 +41,9 @@ + + + @@ -50,7 +53,6 @@ -
@@ -64,7 +66,7 @@
+ +
+

2018

+ + + + + A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It? + +
@@ -233,10 +250,10 @@
-
+

2020

- +
@@ -261,7 +278,7 @@
@@ -290,7 +307,7 @@
@@ -319,7 +336,7 @@
@@ -334,10 +351,10 @@
-
+

2019

- +
@@ -362,7 +379,7 @@
@@ -391,7 +408,7 @@
@@ -420,7 +437,7 @@
@@ -471,6 +488,49 @@ + + + + + + + + +
+ +
+ +
+
+

2018

+ +
+
+ + + + +
+
+
+

A Possible Autism-Anorexia Link Has Been Found, So What Are We Doing About It?

+

+ + | by Luke H +

+
+
+
+
+ +
+
+
+ @@ -481,16 +541,11 @@
- - -
- - Scroll to top - - + +
diff --git a/_site/js/jquery.paroller.min.js b/_site/js/jquery.paroller.min.js deleted file mode 100644 index 9d8c294..0000000 --- a/_site/js/jquery.paroller.min.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict';/** - * jQuery plugin paroller.js v1.4.6 - * https://github.com/tgomilar/paroller.js - * preview: https://tgomilar.github.io/paroller/ - **/(function(a){'use strict';'function'==typeof define&&define.amd?define('parollerjs',['jquery'],a):'object'==typeof module&&'object'==typeof module.exports?module.exports=a(require('jquery')):a(jQuery)})(function(a){'use strict';var b=Math.round;let c=!1,d=function(){c=!1},e={bgVertical:function(a,b){return a.css({"background-position":'center '+-b+'px'})},bgHorizontal:function(a,b){return a.css({"background-position":-b+'px center'})},vertical:function(a,b,c,d){return'none'===d&&(d=''),a.css({"-webkit-transform":'translateY('+b+'px)'+d,"-moz-transform":'translateY('+b+'px)'+d,transform:'translate(0,'+b+'px)'+d,transition:c,"will-change":'transform'})},horizontal:function(a,b,c,d){return'none'===d&&(d=''),a.css({"-webkit-transform":'translateX('+b+'px)'+d,"-moz-transform":'translateX('+b+'px)'+d,transform:'translate('+b+'px, 0)'+d,transition:c,"will-change":'transform'})}},f={factor:function(a,b,c){let d=a.data('paroller-factor'),e=d?d:c.factor;if(576>b){let b=a.data('paroller-factor-xs'),d=b?b:c.factorXs;return d?d:e}if(768>=b){let b=a.data('paroller-factor-sm'),d=b?b:c.factorSm;return d?d:e}if(1024>=b){let b=a.data('paroller-factor-md'),d=b?b:c.factorMd;return d?d:e}if(1200>=b){let b=a.data('paroller-factor-lg'),d=b?b:c.factorLg;return d?d:e}if(1920>=b){let b=a.data('paroller-factor-xl'),d=b?b:c.factorXl;return d?d:e}return e},bgOffset:function(a,c){return b(a*c)},transform:function(a,c,d,e){return b((a-d/2+e)*c)}},g={background:function(a){return a.css({"background-position":'unset'})},foreground:function(a){return a.css({transform:'unset',transition:'unset'})}};a.fn.paroller=function(h){const i=a(window).height(),j=a(document).height();// default options -return h=a.extend({factor:0,// - to + -factorXs:0,// - to + -factorSm:0,// - to + -factorMd:0,// - to + -factorLg:0,// - to + -factorXl:0,// - to + -transition:'transform .1s ease',// CSS transition -type:'background',// foreground -direction:'vertical'// horizontal -},h),this.each(function(){const k=a(this);let l=k.outerHeight(),m=a(window).width(),n=k.offset().top,o=0,p=function(a,b){// console.log(`offset ${scrollOffset} => ${transform - scrollOffset}`) -return a||(o=b),b-o};const q=k.data('paroller-type'),r=k.data('paroller-direction'),s=k.data('paroller-transition'),t=k.css('transform'),u=s?s:h.transition,v=q?q:h.type,w=r?r:h.direction;let x=0,y=f.bgOffset(n,x),z=f.transform(n,x,i,l);'background'===v?'vertical'===w?e.bgVertical(k,y):'horizontal'===w&&e.bgHorizontal(k,y):'foreground'===v&&('vertical'===w?e.vertical(k,z,u,t):'horizontal'===w&&e.horizontal(k,z,u,t)),a(window).on('resize',function(){let o=a(this).scrollTop();m=a(window).width(),n=k.offset().top,l=k.outerHeight(),x=f.factor(k,m,h),y=b(n*x);let q=p(a(document).scrollTop(),b((n-i/2+l)*x));c||(window.requestAnimationFrame(d),c=!0),'background'===v?(g.background(k),'vertical'===w?e.bgVertical(k,y):'horizontal'===w&&e.bgHorizontal(k,y)):'foreground'===v&&o<=j&&(g.foreground(k),'vertical'===w?e.vertical(k,q,u):'horizontal'===w&&e.horizontal(k,q,u))}),a(window).on('load scroll',function(){let g=a(this).scrollTop(),o=a(document).scrollTop();x=f.factor(k,m,h);let q=p(o,b((n-i/2+l-g)*x));c||(window.requestAnimationFrame(d),c=!0),'background'===v?'vertical'===w?e.bgVertical(k,y):'horizontal'===w&&e.bgHorizontal(k,y):'foreground'===v&&g<=j&&('vertical'===w?e.vertical(k,q,u,t):'horizontal'===w&&e.horizontal(k,q,u,t))})})}}); \ No newline at end of file diff --git a/_site/js/slick.min.js b/_site/js/slick.min.js deleted file mode 100644 index 42172c2..0000000 --- a/_site/js/slick.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(i){"use strict";"function"==typeof define&&define.amd?define(["jquery"],i):"undefined"!=typeof exports?module.exports=i(require("jquery")):i(jQuery)}(function(i){"use strict";var e=window.Slick||{};(e=function(){var e=0;return function(t,o){var s,n=this;n.defaults={accessibility:!0,adaptiveHeight:!1,appendArrows:i(t),appendDots:i(t),arrows:!0,asNavFor:null,prevArrow:'',nextArrow:'',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i(' + + + + + + - - - - Scroll to top - - +
+ +
diff --git a/css/article-page.css b/css/article-page.css index 0706300..961c91b 100644 --- a/css/article-page.css +++ b/css/article-page.css @@ -7,11 +7,26 @@ } .mdc-typography--caption-text { font-style: italic; + margin: 5px; } .mdc-typography--headline5 { margin-bottom: 5px; } +/* change background */ +.article-content { + background-color: var(--mdc-theme-background); + padding-top: 6px; + padding-bottom: 6px; +} + +/* position headline in middle of image */ +.parallax-section { + text-align: center; + vertical-align: middle; + padding: 150px 15px; +} + /* adjust video dimensions depending on screen size */ iframe { @@ -31,8 +46,15 @@ iframe { height: calc(90vw / 16 * 9 - 5px); } .mdc-typography--headline3, .mdc-typography--headline5 { - font-size: 1.5rem; - line-height: 1.625rem; + font-size: 2.5rem; + line-height: 2.625rem; + } +} + +@media screen and (max-width: 400px) { + .mdc-typography--headline3, .mdc-typography--headline5 { + font-size: 2rem; + line-height: 2.125rem; } } @@ -40,60 +62,4 @@ iframe { iframe { height: calc(93.5vw / 16 * 9); } -} - - -/* make article cards look nice by altering margins */ -.mdc-card-content { - margin: 5px 15px 5px 15px; -} - -.mdc-card .mdc-typography--headline6, .mdc-card .mdc-typography--subtitle2 { - margin: 0; -} - - -/* change carousel dots' styling to make them more visible */ -.slick-dots { - position: relative; - bottom: 0; - margin: auto; -} - -.slick-dots li button:before { - font-size: 30px; - opacity: 1; - color: #ababab; -} - -.slick-dots li.slick-active button::before { - font-size: 40px; - opacity: 1; - color: var(--mdc-theme-primary); -} - - -/* ensure buttons don't get in the way & enable scrolling */ -.slick-next { - right: 0; -} - -.slick-prev { - left: 0; -} - - -/* ensure MDC cards are separated enough that they are distinguishable */ -.carousel-item { - margin: 4px; -} - -/* remove excessive margin below carousel */ -.slick-dotted.slick-slider { - margin-bottom: 13px; -} - -/* align article carousel title with carousel items */ -.article-carousel-title { - text-align: center; } \ No newline at end of file diff --git a/css/global.css b/css/global.css index 2b2bbb7..ddfe12c 100644 --- a/css/global.css +++ b/css/global.css @@ -1,7 +1,12 @@ /* change theme */ :root { - --mdc-theme-primary: #273967; - --mdc-theme-secondary: #ef6c00; + --mdc-theme-primary: #253a67; + --mdc-theme-secondary: #ea6343; + --mdc-theme-background: #181a1b; +} + +.mdc-top-app-bar--short-fixed-adjust { + padding-top: 41px; } .mdc-text-field--focused:not(.mdc-text-field--disabled) .mdc-floating-label, .mdc-list-item--activated .mdc-list-item__text, .mdc-drawer .mdc-list-item--activated .mdc-list-item__graphic { @@ -12,6 +17,24 @@ body { font-family: 'Roboto', sans-serif; display: flex; margin: 0; + background-color: var(--mdc-theme-primary); + color: #ffffff; +} +.mdc-drawer { + background-color: var(--mdc-theme-background); +} +.mdc-drawer *, .mdc-drawer .material-icons, .mdc-drawer h3 { + color: #ddd; +} +.mdc-drawer .mdc-list-group__subheader { + color: #ccc; +} + +.mdc-text-field--focused:not(.mdc-text-field--disabled) .mdc-floating-label, .mdc-list-item--activated .mdc-list-item__text, .mdc-drawer .mdc-list-item--activated .mdc-list-item__graphic { + color: var(--mdc-theme-secondary); +} +:not(.mdc-list--non-interactive)>:not(.mdc-list-item--disabled).mdc-list-item--activated::before, :not(.mdc-list--non-interactive)>:not(.mdc-list-item--disabled).mdc-list-item--activated::after { + background-color: var(--mdc-theme-secondary); } a { @@ -33,7 +56,7 @@ a { } .main-content { - margin: 15px; + margin: 15px 0; overflow: auto; } @@ -41,11 +64,49 @@ a { position: absolute; } +.footer-container { + background: var(--mdc-theme-background); + padding: 5px 0; +} footer { margin: 15px; overflow: auto; } +/* change button colours */ +.mdc-button:not(:disabled) { + color: var(--mdc-theme-secondary); + border-color: var(--mdc-theme-secondary); +} +.mdc-button::before, .mdc-button::after { + background-color: var(--mdc-theme-secondary); +} + +/* parallax backgrounds */ +.parallax-section { + position: relative; + z-index: 0; + display: flow-root; +} + +/* responsive side margins */ +.article-section .articles, .article-section-header, .footer-container, .article-content, .footer-container, .article-title-section ~ .mdc-typography--caption-text, .article-title-section, .mdc-typography--subtitle1, .mdc-typography--headline3 { + padding-left: 15%; + padding-right: 15%; +} +@media screen and (max-width: 1000px) { + .article-section .articles, .article-section-header, .footer-container, .article-content, .footer-container, .article-title-section ~ .mdc-typography--caption-text, .article-title-section, .mdc-typography--subtitle1, .mdc-typography--headline3 { + padding-left: 8%; + padding-right: 8%; + } +} +@media screen and (max-width: 800px) { + .article-section .articles, .article-section-header, .footer-container, .article-content, .footer-container, .article-title-section ~ .mdc-typography--caption-text, .article-title-section, .mdc-typography--subtitle1, .mdc-typography--headline3 { + padding-left: 2%; + padding-right: 2%; + } +} + /* edit footer depending on screen size - edits alignment & changes switches between center- and left- aligned BBC Young Reporter logos */ footer span { position: relative; @@ -76,24 +137,6 @@ footer img { } } -/* add side margins */ -.main-content, footer { - margin-left: 15%; - margin-right: 15%; -} -@media screen and (max-width: 600px) { - .main-content, footer { - margin-left: 5%; - margin-right: 5%; - } -} -@media screen and (max-width: 500px) { - .main-content, footer { - margin-left: 2%; - margin-right: 2%; - } -} - /* for cookie notice */ #cookies { display: none; diff --git a/css/home.css b/css/home.css index 08bf437..c350718 100644 --- a/css/home.css +++ b/css/home.css @@ -1,20 +1,3 @@ -html, body { - background-color: var(--mdc-theme-primary); -} -.footer-container { - background: #ffffff; - padding: 5px 0; -} - -.mdc-top-app-bar--short-fixed-adjust { - padding-top: 41px; -} -.article-section { - position: relative; - z-index: 0; - display: flow-root; - background-image: url("/images/backgrounds/2019.jpg"); -} .main-content .mdc-card { float: left; width: calc((100% / 3) - 12px); @@ -24,12 +7,10 @@ html, body { margin: 6px 6px 10px 6px; background: none; } -.main-content { - margin-left: 0; - margin-right: 0; -} .article-section-header { - background-color: rgba(255,255,255,0.8); + background-color: rgba(24,26,27,0.5); + padding-top: 12px; + padding-bottom: 12px; } .article-section-header h1 { margin-block-start: 0; @@ -49,37 +30,23 @@ html, body { left: 0; top: 1.25px; transition: left 0.1s linear; - height: 100%; font-size: inherit; } .article-section-header button:hover span { left: 3px; } -.article-section .articles, .article-section-header { - padding: 12px 15% 12px 15%; -} .splitter { height: 15px; width: 100%; background-color: var(--mdc-theme-primary); } -.article-section:nth-of-type(3) { - background: #ffffff; +.article-section:nth-of-type(3n) { + background: var(--mdc-theme-background); } -.article-section:nth-of-type(3) #jarallax-container-1 { +.article-section:nth-of-type(3n) #jarallax-container-1 { display: none; } -@media screen and (max-width: 1000px) { - .article-section .articles, .article-section-header { - padding: 12px 8% 12px 8%; - } -} -@media screen and (max-width: 800px) { - .article-section .articles, .article-section-header { - padding: 12px 2% 12px 2%; - } -} @media screen and (max-width: 600px) { .article-section .mdc-card:nth-of-type(3) { display: none; diff --git a/css/slick-theme.css b/css/slick-theme.css deleted file mode 100644 index 1232fca..0000000 --- a/css/slick-theme.css +++ /dev/null @@ -1,204 +0,0 @@ -@charset 'UTF-8'; -/* Slider */ -.slick-loading .slick-list -{ - background: #fff url('./ajax-loader.gif') center center no-repeat; -} - -/* Icons */ -@font-face -{ - font-family: 'slick'; - font-weight: normal; - font-style: normal; - - src: url('./fonts/slick.eot'); - src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg'); -} -/* Arrows */ -.slick-prev, -.slick-next -{ - font-size: 0; - line-height: 0; - - position: absolute; - top: 50%; - - display: block; - - width: 20px; - height: 20px; - padding: 0; - -webkit-transform: translate(0, -50%); - -ms-transform: translate(0, -50%); - transform: translate(0, -50%); - - cursor: pointer; - - color: transparent; - border: none; - outline: none; - background: transparent; -} -.slick-prev:hover, -.slick-prev:focus, -.slick-next:hover, -.slick-next:focus -{ - color: transparent; - outline: none; - background: transparent; -} -.slick-prev:hover:before, -.slick-prev:focus:before, -.slick-next:hover:before, -.slick-next:focus:before -{ - opacity: 1; -} -.slick-prev.slick-disabled:before, -.slick-next.slick-disabled:before -{ - opacity: .25; -} - -.slick-prev:before, -.slick-next:before -{ - font-family: 'slick'; - font-size: 20px; - line-height: 1; - - opacity: .75; - color: white; - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.slick-prev -{ - left: -25px; -} -[dir='rtl'] .slick-prev -{ - right: -25px; - left: auto; -} -.slick-prev:before -{ - content: '←'; -} -[dir='rtl'] .slick-prev:before -{ - content: '→'; -} - -.slick-next -{ - right: -25px; -} -[dir='rtl'] .slick-next -{ - right: auto; - left: -25px; -} -.slick-next:before -{ - content: '→'; -} -[dir='rtl'] .slick-next:before -{ - content: '←'; -} - -/* Dots */ -.slick-dotted.slick-slider -{ - margin-bottom: 30px; -} - -.slick-dots -{ - position: absolute; - bottom: -25px; - - display: block; - - width: 100%; - padding: 0; - margin: 0; - - list-style: none; - - text-align: center; -} -.slick-dots li -{ - position: relative; - - display: inline-block; - - width: 20px; - height: 20px; - margin: 0 5px; - padding: 0; - - cursor: pointer; -} -.slick-dots li button -{ - font-size: 0; - line-height: 0; - - display: block; - - width: 20px; - height: 20px; - padding: 5px; - - cursor: pointer; - - color: transparent; - border: 0; - outline: none; - background: transparent; -} -.slick-dots li button:hover, -.slick-dots li button:focus -{ - outline: none; -} -.slick-dots li button:hover:before, -.slick-dots li button:focus:before -{ - opacity: 1; -} -.slick-dots li button:before -{ - font-family: 'slick'; - font-size: 6px; - line-height: 20px; - - position: absolute; - top: 0; - left: 0; - - width: 20px; - height: 20px; - - content: '•'; - text-align: center; - - opacity: .25; - color: black; - - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -.slick-dots li.slick-active button:before -{ - opacity: .75; - color: black; -} diff --git a/css/slick.css b/css/slick.css deleted file mode 100644 index 57477e8..0000000 --- a/css/slick.css +++ /dev/null @@ -1,119 +0,0 @@ -/* Slider */ -.slick-slider -{ - position: relative; - - display: block; - box-sizing: border-box; - - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - - -webkit-touch-callout: none; - -khtml-user-select: none; - -ms-touch-action: pan-y; - touch-action: pan-y; - -webkit-tap-highlight-color: transparent; -} - -.slick-list -{ - position: relative; - - display: block; - overflow: hidden; - - margin: 0; - padding: 0; -} -.slick-list:focus -{ - outline: none; -} -.slick-list.dragging -{ - cursor: pointer; - cursor: hand; -} - -.slick-slider .slick-track, -.slick-slider .slick-list -{ - -webkit-transform: translate3d(0, 0, 0); - -moz-transform: translate3d(0, 0, 0); - -ms-transform: translate3d(0, 0, 0); - -o-transform: translate3d(0, 0, 0); - transform: translate3d(0, 0, 0); -} - -.slick-track -{ - position: relative; - top: 0; - left: 0; - - display: block; - margin-left: auto; - margin-right: auto; -} -.slick-track:before, -.slick-track:after -{ - display: table; - - content: ''; -} -.slick-track:after -{ - clear: both; -} -.slick-loading .slick-track -{ - visibility: hidden; -} - -.slick-slide -{ - display: none; - float: left; - - height: 100%; - min-height: 1px; -} -[dir='rtl'] .slick-slide -{ - float: right; -} -.slick-slide img -{ - display: block; -} -.slick-slide.slick-loading img -{ - display: none; -} -.slick-slide.dragging img -{ - pointer-events: none; -} -.slick-initialized .slick-slide -{ - display: block; -} -.slick-loading .slick-slide -{ - visibility: hidden; -} -.slick-vertical .slick-slide -{ - display: block; - - height: auto; - - border: 1px solid transparent; -} -.slick-arrow.slick-hidden { - display: none; -} diff --git a/images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it--cover.jpg b/images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it.jpg similarity index 100% rename from images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it--cover.jpg rename to images/2019-03-06-a-possible-autism-anorexia-link-has-been-found-so-what-are-we-doing-about-it.jpg diff --git a/images/2019-03-06-are-the-roads-around-your-home-and-school-safe--cover.jpg b/images/2019-03-06-are-the-roads-around-your-home-and-school-safe.jpg similarity index 100% rename from images/2019-03-06-are-the-roads-around-your-home-and-school-safe--cover.jpg rename to images/2019-03-06-are-the-roads-around-your-home-and-school-safe.jpg diff --git a/images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett--cover.jpg b/images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett.jpg similarity index 100% rename from images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett--cover.jpg rename to images/2019-03-06-book-week-real-life-issues-inspire-sarah-govett.jpg diff --git a/images/2019-03-06-could-sky-high-aims-bring-reading-down--cover.jpg b/images/2019-03-06-could-sky-high-aims-bring-reading-down.jpg similarity index 100% rename from images/2019-03-06-could-sky-high-aims-bring-reading-down--cover.jpg rename to images/2019-03-06-could-sky-high-aims-bring-reading-down.jpg diff --git a/images/2019-03-06-finished-product--cover.jpg b/images/2019-03-06-finished-product.jpg similarity index 100% rename from images/2019-03-06-finished-product--cover.jpg rename to images/2019-03-06-finished-product.jpg diff --git a/images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever--cover.jpg b/images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.jpg similarity index 100% rename from images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever--cover.jpg rename to images/2019-03-06-student-survey-shows-rosa-parks-is-most-inspirational-woman-ever.jpg diff --git a/images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out--cover.jpg b/images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.jpg similarity index 100% rename from images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out--cover.jpg rename to images/2019-03-06-tennis-club-needs-to-relocate-as-redevelopment-plans-are-called-out.jpg diff --git a/images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison--cover.jpg b/images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison.jpg similarity index 100% rename from images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison--cover.jpg rename to images/2019-03-06-video-games-virtual-fantasy-or-a-virtual-prison.jpg diff --git a/images/2019-03-06-what-is-in-the-patients-best-interest--cover.jpg b/images/2019-03-06-what-is-in-the-patients-best-interest.jpg similarity index 100% rename from images/2019-03-06-what-is-in-the-patients-best-interest--cover.jpg rename to images/2019-03-06-what-is-in-the-patients-best-interest.jpg diff --git a/images/2019-03-06-whats-next-for-reading-prison--cover.jpg b/images/2019-03-06-whats-next-for-reading-prison.jpg similarity index 100% rename from images/2019-03-06-whats-next-for-reading-prison--cover.jpg rename to images/2019-03-06-whats-next-for-reading-prison.jpg diff --git a/images/2019-03-06-young-reporter-team-ready-to-go--cover.jpg b/images/2019-03-06-young-reporter-team-ready-to-go.jpg similarity index 100% rename from images/2019-03-06-young-reporter-team-ready-to-go--cover.jpg rename to images/2019-03-06-young-reporter-team-ready-to-go.jpg diff --git a/images/backgrounds/2019.jpg b/images/backgrounds/2019.jpg index b78f881..9509542 100644 Binary files a/images/backgrounds/2019.jpg and b/images/backgrounds/2019.jpg differ diff --git a/images/backgrounds/2020.jpg b/images/backgrounds/2020.jpg new file mode 100644 index 0000000..9509542 Binary files /dev/null and b/images/backgrounds/2020.jpg differ diff --git a/index.md b/index.md index 73f2ffe..c0b2d22 100644 --- a/index.md +++ b/index.md @@ -16,10 +16,10 @@ layout: home
{% endif %} -
+

{{ currentdate }}

- +
{% assign date = currentdate %} @@ -44,7 +44,7 @@ layout: home
{% endif %} diff --git a/js/jquery.paroller.min.js b/js/jquery.paroller.min.js deleted file mode 100644 index 9d8c294..0000000 --- a/js/jquery.paroller.min.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict';/** - * jQuery plugin paroller.js v1.4.6 - * https://github.com/tgomilar/paroller.js - * preview: https://tgomilar.github.io/paroller/ - **/(function(a){'use strict';'function'==typeof define&&define.amd?define('parollerjs',['jquery'],a):'object'==typeof module&&'object'==typeof module.exports?module.exports=a(require('jquery')):a(jQuery)})(function(a){'use strict';var b=Math.round;let c=!1,d=function(){c=!1},e={bgVertical:function(a,b){return a.css({"background-position":'center '+-b+'px'})},bgHorizontal:function(a,b){return a.css({"background-position":-b+'px center'})},vertical:function(a,b,c,d){return'none'===d&&(d=''),a.css({"-webkit-transform":'translateY('+b+'px)'+d,"-moz-transform":'translateY('+b+'px)'+d,transform:'translate(0,'+b+'px)'+d,transition:c,"will-change":'transform'})},horizontal:function(a,b,c,d){return'none'===d&&(d=''),a.css({"-webkit-transform":'translateX('+b+'px)'+d,"-moz-transform":'translateX('+b+'px)'+d,transform:'translate('+b+'px, 0)'+d,transition:c,"will-change":'transform'})}},f={factor:function(a,b,c){let d=a.data('paroller-factor'),e=d?d:c.factor;if(576>b){let b=a.data('paroller-factor-xs'),d=b?b:c.factorXs;return d?d:e}if(768>=b){let b=a.data('paroller-factor-sm'),d=b?b:c.factorSm;return d?d:e}if(1024>=b){let b=a.data('paroller-factor-md'),d=b?b:c.factorMd;return d?d:e}if(1200>=b){let b=a.data('paroller-factor-lg'),d=b?b:c.factorLg;return d?d:e}if(1920>=b){let b=a.data('paroller-factor-xl'),d=b?b:c.factorXl;return d?d:e}return e},bgOffset:function(a,c){return b(a*c)},transform:function(a,c,d,e){return b((a-d/2+e)*c)}},g={background:function(a){return a.css({"background-position":'unset'})},foreground:function(a){return a.css({transform:'unset',transition:'unset'})}};a.fn.paroller=function(h){const i=a(window).height(),j=a(document).height();// default options -return h=a.extend({factor:0,// - to + -factorXs:0,// - to + -factorSm:0,// - to + -factorMd:0,// - to + -factorLg:0,// - to + -factorXl:0,// - to + -transition:'transform .1s ease',// CSS transition -type:'background',// foreground -direction:'vertical'// horizontal -},h),this.each(function(){const k=a(this);let l=k.outerHeight(),m=a(window).width(),n=k.offset().top,o=0,p=function(a,b){// console.log(`offset ${scrollOffset} => ${transform - scrollOffset}`) -return a||(o=b),b-o};const q=k.data('paroller-type'),r=k.data('paroller-direction'),s=k.data('paroller-transition'),t=k.css('transform'),u=s?s:h.transition,v=q?q:h.type,w=r?r:h.direction;let x=0,y=f.bgOffset(n,x),z=f.transform(n,x,i,l);'background'===v?'vertical'===w?e.bgVertical(k,y):'horizontal'===w&&e.bgHorizontal(k,y):'foreground'===v&&('vertical'===w?e.vertical(k,z,u,t):'horizontal'===w&&e.horizontal(k,z,u,t)),a(window).on('resize',function(){let o=a(this).scrollTop();m=a(window).width(),n=k.offset().top,l=k.outerHeight(),x=f.factor(k,m,h),y=b(n*x);let q=p(a(document).scrollTop(),b((n-i/2+l)*x));c||(window.requestAnimationFrame(d),c=!0),'background'===v?(g.background(k),'vertical'===w?e.bgVertical(k,y):'horizontal'===w&&e.bgHorizontal(k,y)):'foreground'===v&&o<=j&&(g.foreground(k),'vertical'===w?e.vertical(k,q,u):'horizontal'===w&&e.horizontal(k,q,u))}),a(window).on('load scroll',function(){let g=a(this).scrollTop(),o=a(document).scrollTop();x=f.factor(k,m,h);let q=p(o,b((n-i/2+l-g)*x));c||(window.requestAnimationFrame(d),c=!0),'background'===v?'vertical'===w?e.bgVertical(k,y):'horizontal'===w&&e.bgHorizontal(k,y):'foreground'===v&&g<=j&&('vertical'===w?e.vertical(k,q,u,t):'horizontal'===w&&e.horizontal(k,q,u,t))})})}}); \ No newline at end of file diff --git a/js/slick.min.js b/js/slick.min.js deleted file mode 100644 index 42172c2..0000000 --- a/js/slick.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(i){"use strict";"function"==typeof define&&define.amd?define(["jquery"],i):"undefined"!=typeof exports?module.exports=i(require("jquery")):i(jQuery)}(function(i){"use strict";var e=window.Slick||{};(e=function(){var e=0;return function(t,o){var s,n=this;n.defaults={accessibility:!0,adaptiveHeight:!1,appendArrows:i(t),appendDots:i(t),arrows:!0,asNavFor:null,prevArrow:'',nextArrow:'',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i('