Skip to content

Commit

Permalink
Merge branch 'develop' into auto/content-for-story-28
Browse files Browse the repository at this point in the history
  • Loading branch information
KatvonRivia authored Jun 17, 2021
2 parents de747f1 + 6deb2f4 commit 313abbb
Show file tree
Hide file tree
Showing 68 changed files with 232 additions and 234 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
position: absolute
top: 0
right: 0
z-index: 3
z-index: 4
min-width: emCalc(300px)
max-width: emCalc(500px)
width: 33%
Expand Down
1 change: 1 addition & 0 deletions src/scripts/components/layers/time-slider/time-slider.styl
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ compareThumb()
left: 0
display: flex
justify-content: center
overflow: hidden
padding: emCalc(50px) 0
width: 100%
background: linear-gradient(180deg, rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.4) 100%)
Expand Down
3 changes: 0 additions & 3 deletions src/scripts/components/stories/caption/caption.styl
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
-webkit-line-clamp: 3
-webkit-box-orient: vertical

> *
font-size: 11px

.lightboxCaption
overflow: hidden
padding: emCalc(15px)
Expand Down
Binary file modified storage/stories/story-12/assets/ghg_large_16.png
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 storage/stories/story-12/assets/ghg_large_16a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified storage/stories/story-12/assets/intro_large_15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 storage/stories/story-12/story-12-de.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions storage/stories/story-12/story-12-en.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions storage/stories/story-12/story-12-es.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions storage/stories/story-12/story-12-fr.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions storage/stories/story-12/story-12-nl.json

Large diffs are not rendered by default.

Binary file modified storage/stories/story-15/assets/story15_04.png
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 storage/stories/story-15/assets/story15_04a.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions storage/stories/story-15/story-15-de.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions storage/stories/story-15/story-15-en.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions storage/stories/story-15/story-15-es.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions storage/stories/story-15/story-15-fr.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions storage/stories/story-15/story-15-nl.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions storage/stories/story-16/story-16-de.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
{
"type": "video",
"text": "## Weather Kitchens\r\n\r\nThe oceans and the atmosphere transport about the same amount of heat towards the poles, but the circulation of the atmosphere is itself partly driven by the energy exchanged when water evaporates from the ocean and when it falls back as rain. This is where our weather is cooked up.\r\n\r\nHigher sea surface temperatures lead to more evaporation. More water vapour in the atmosphere potentially means more clouds and more rain. Warmer water in the western Mediterranean is a key factor in the sudden rainstorms and flash floods that afflict the coasts of France, Italy and Spain in late summer.\r\n\r\nOn a larger scale, high temperatures in tropical oceans power extreme weather events such as hurricanes. The energy exchange between ocean and atmosphere during these events is shown by a dip in the sea surface temperature in the wake of large hurricanes. \r\n \r\n## Climate Indicators\r\nIn 2020 forecasters reached the end of the alphabet when naming Atlantic storms and had to resort to Greek letters for only the second time (the first was 2005). While it is not clear that there will be more hurricanes in a warming world, there is evidence that storms are becoming more powerful, so we are likely to see more of the most damaging Category 4 and 5 hurricanes.\r\n\r\nWhile atmospheric weather systems can quickly move energy around the planet, the ocean’s much greater heat capacity makes it a better indicator of longer-term climate trends. The sea is an important regulator of the climate, and the temperature of its surface a key measurement for climate scientists. The rise in global average air temperature slowed down in the first decade of this century, causing some to question global warming. But the slowdown has proved temporary and air temperatures have risen quickly again since 2012. The temperature of the oceans continued to rise throughout.",
"text": "## Weather Kitchens\r\n\r\nThe oceans and the atmosphere transport about the same amount of heat towards the poles, but the circulation of the atmosphere is itself partly driven by the [energy exchanged](stories/story-21/2) when water evaporates from the ocean and when it falls back as rain. This is where our weather is cooked up.\r\n\r\nHigher sea surface temperatures lead to more evaporation. More water vapour in the atmosphere potentially means more clouds and more rain. Warmer water in the western Mediterranean is a key factor in the sudden rainstorms and flash floods that afflict the coasts of France, Italy and Spain in late summer.\r\n\r\nOn a larger scale, high temperatures in tropical oceans power extreme weather events such as hurricanes. The energy exchange between ocean and atmosphere during these events is shown by a dip in the sea surface temperature in the wake of large hurricanes. \r\n \r\n## Climate Indicators\r\nIn 2020 forecasters reached the end of the alphabet when naming Atlantic storms and had to resort to Greek letters for only the second time (the first was 2005). While it is not clear that there will be more hurricanes in a warming world, there is evidence that storms are becoming more powerful, so we are likely to see more of the most damaging Category 4 and 5 hurricanes.\r\n\r\nWhile atmospheric weather systems can quickly move energy around the planet, the ocean’s much greater heat capacity makes it a better indicator of longer-term climate trends. The sea is an important regulator of the climate, and the temperature of its surface a key measurement for climate scientists. The rise in global average air temperature slowed down in the first decade of this century, causing some to question global warming. But the slowdown has proved temporary and air temperatures have risen quickly again since 2012. The temperature of the oceans continued to rise throughout.",
"shortText": "## Weather Kitchens \r\n\r\nOceans and atmosphere transport about the same amount of heat towards the poles. \r\n\r\nEnergy is also exchanged during the evaporation and condensation of water. \r\n\r\nThe sea is an important regulator of the climate and its temperature is a key measurement. \r\n\r\nHigher sea surface temperatures allow:\r\n\r\n- more evaporation\r\n- giving more atmospheric water vapour\r\n- with the potential for more clouds and more rain\r\n\r\nHigh water temperatures in tropical oceans power extreme weather events such as hurricanes. \r\n\r\nThe atmosphere can quickly move energy around the planet, but the ocean is a more stable indicator of longer-term climate trends.",
"imageFits": [
"contain",
Expand Down Expand Up @@ -160,7 +160,7 @@
},
{
"type": "video",
"text": "## CCI Sea Surface Temperature\r\n\r\nIt is likely that the upper ocean has been warming since the middle of the nineteenth century, and scientists have been able to measure the warming of the ocean surface from space since the 1970s. The earliest measurements of ocean temperatures came from ships and floating instruments but satellite observations provide more detailed and even coverage as well as more frequent repeat measurement. \r\n\r\nThe CCI SST team has used four trillion measurements collected by fourteen satellites over four decades to give a complete record of daily sea temperatures spanning 37 years. This record is not only more accurate than earlier datasets but needs very few in situ measurements from ships and buoys for calibration. This means individual measurements can be compared with the very precise spot temperatures collected by these devices. \r\n\r\nIf similar climate signals are detected independently from space and on the Earth, we can be confident they truly reflect what is happening in nature and that they can be used in climate models to evaluate how the climate is likely to change.",
"text": "## CCI Sea Surface Temperature\r\n\r\nIt is likely that the upper ocean has been warming since the middle of the nineteenth century, and scientists have been able to measure the warming of the ocean surface from space since the 1970s. The earliest measurements of ocean temperatures came from ships and floating instruments but satellite observations provide more detailed and even coverage as well as more frequent repeat measurement. \r\n\r\nThe [CCI](stories/story-32/3) SST team has used four trillion measurements collected by fourteen satellites over four decades to give a complete record of daily sea temperatures spanning 37 years. This record is not only more accurate than earlier datasets but needs very few in situ measurements from ships and buoys for calibration. This means individual measurements can be compared with the very precise spot temperatures collected by these devices. \r\n\r\nIf similar climate signals are detected independently from space and on the Earth, we can be confident they truly reflect what is happening in nature and that they can be used in climate models to evaluate how the climate is likely to change.",
"shortText": "## CCI Sea Surface Temperature\r\n\r\nThe upper ocean has been warming since the middle of the nineteenth century.\r\n\r\nSurface warming measured from space since the 1970s.\r\n\r\nSatellites provide more detailed and even coverage, and more frequent repeats, than is possible from ships and floating instruments.\r\n\r\nCCI SST team has combined:\r\n\r\n- data from 14 satellites over 4 decades\r\n- the latest, highly accurate sensor technology \r\n- greater coverage from longer-running weather satellites\r\n- to give four trillion SST measurements\r\n\r\nThis dataset is largely independent of in situ observations.",
"imageFits": [
"contain",
Expand Down
4 changes: 2 additions & 2 deletions storage/stories/story-16/story-16-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
},
{
"type": "video",
"text": "## Weather Kitchens\r\n\r\nThe oceans and the atmosphere transport about the same amount of heat towards the poles, but the circulation of the atmosphere is itself partly driven by the energy exchanged when water evaporates from the ocean and when it falls back as rain. This is where our weather is cooked up.\r\n\r\nHigher sea surface temperatures lead to more evaporation. More water vapour in the atmosphere potentially means more clouds and more rain. Warmer water in the western Mediterranean is a key factor in the sudden rainstorms and flash floods that afflict the coasts of France, Italy and Spain in late summer.\r\n\r\nOn a larger scale, high temperatures in tropical oceans power extreme weather events such as hurricanes. The energy exchange between ocean and atmosphere during these events is shown by a dip in the sea surface temperature in the wake of large hurricanes. \r\n \r\n## Climate Indicators\r\nIn 2020 forecasters reached the end of the alphabet when naming Atlantic storms and had to resort to Greek letters for only the second time (the first was 2005). While it is not clear that there will be more hurricanes in a warming world, there is evidence that storms are becoming more powerful, so we are likely to see more of the most damaging Category 4 and 5 hurricanes.\r\n\r\nWhile atmospheric weather systems can quickly move energy around the planet, the ocean’s much greater heat capacity makes it a better indicator of longer-term climate trends. The sea is an important regulator of the climate, and the temperature of its surface a key measurement for climate scientists. The rise in global average air temperature slowed down in the first decade of this century, causing some to question global warming. But the slowdown has proved temporary and air temperatures have risen quickly again since 2012. The temperature of the oceans continued to rise throughout.",
"text": "## Weather Kitchens\r\n\r\nThe oceans and the atmosphere transport about the same amount of heat towards the poles, but the circulation of the atmosphere is itself partly driven by the [energy exchanged](stories/story-21/2) when water evaporates from the ocean and when it falls back as rain. This is where our weather is cooked up.\r\n\r\nHigher sea surface temperatures lead to more evaporation. More water vapour in the atmosphere potentially means more clouds and more rain. Warmer water in the western Mediterranean is a key factor in the sudden rainstorms and flash floods that afflict the coasts of France, Italy and Spain in late summer.\r\n\r\nOn a larger scale, high temperatures in tropical oceans power extreme weather events such as hurricanes. The energy exchange between ocean and atmosphere during these events is shown by a dip in the sea surface temperature in the wake of large hurricanes. \r\n \r\n## Climate Indicators\r\nIn 2020 forecasters reached the end of the alphabet when naming Atlantic storms and had to resort to Greek letters for only the second time (the first was 2005). While it is not clear that there will be more hurricanes in a warming world, there is evidence that storms are becoming more powerful, so we are likely to see more of the most damaging Category 4 and 5 hurricanes.\r\n\r\nWhile atmospheric weather systems can quickly move energy around the planet, the ocean’s much greater heat capacity makes it a better indicator of longer-term climate trends. The sea is an important regulator of the climate, and the temperature of its surface a key measurement for climate scientists. The rise in global average air temperature slowed down in the first decade of this century, causing some to question global warming. But the slowdown has proved temporary and air temperatures have risen quickly again since 2012. The temperature of the oceans continued to rise throughout.",
"shortText": "## Weather Kitchens \r\n\r\nOceans and atmosphere transport about the same amount of heat towards the poles. \r\n\r\nEnergy is also exchanged during the evaporation and condensation of water. \r\n\r\nThe sea is an important regulator of the climate and its temperature is a key measurement. \r\n\r\nHigher sea surface temperatures allow:\r\n\r\n- more evaporation\r\n- giving more atmospheric water vapour\r\n- with the potential for more clouds and more rain\r\n\r\nHigh water temperatures in tropical oceans power extreme weather events such as hurricanes. \r\n\r\nThe atmosphere can quickly move energy around the planet, but the ocean is a more stable indicator of longer-term climate trends.",
"imageFits": [
"contain",
Expand Down Expand Up @@ -160,7 +160,7 @@
},
{
"type": "video",
"text": "## CCI Sea Surface Temperature\r\n\r\nIt is likely that the upper ocean has been warming since the middle of the nineteenth century, and scientists have been able to measure the warming of the ocean surface from space since the 1970s. The earliest measurements of ocean temperatures came from ships and floating instruments but satellite observations provide more detailed and even coverage as well as more frequent repeat measurement. \r\n\r\nThe CCI SST team has used four trillion measurements collected by fourteen satellites over four decades to give a complete record of daily sea temperatures spanning 37 years. This record is not only more accurate than earlier datasets but needs very few in situ measurements from ships and buoys for calibration. This means individual measurements can be compared with the very precise spot temperatures collected by these devices. \r\n\r\nIf similar climate signals are detected independently from space and on the Earth, we can be confident they truly reflect what is happening in nature and that they can be used in climate models to evaluate how the climate is likely to change.",
"text": "## CCI Sea Surface Temperature\r\n\r\nIt is likely that the upper ocean has been warming since the middle of the nineteenth century, and scientists have been able to measure the warming of the ocean surface from space since the 1970s. The earliest measurements of ocean temperatures came from ships and floating instruments but satellite observations provide more detailed and even coverage as well as more frequent repeat measurement. \r\n\r\nThe [CCI](stories/story-32/3) SST team has used four trillion measurements collected by fourteen satellites over four decades to give a complete record of daily sea temperatures spanning 37 years. This record is not only more accurate than earlier datasets but needs very few in situ measurements from ships and buoys for calibration. This means individual measurements can be compared with the very precise spot temperatures collected by these devices. \r\n\r\nIf similar climate signals are detected independently from space and on the Earth, we can be confident they truly reflect what is happening in nature and that they can be used in climate models to evaluate how the climate is likely to change.",
"shortText": "## CCI Sea Surface Temperature\r\n\r\nThe upper ocean has been warming since the middle of the nineteenth century.\r\n\r\nSurface warming measured from space since the 1970s.\r\n\r\nSatellites provide more detailed and even coverage, and more frequent repeats, than is possible from ships and floating instruments.\r\n\r\nCCI SST team has combined:\r\n\r\n- data from 14 satellites over 4 decades\r\n- the latest, highly accurate sensor technology \r\n- greater coverage from longer-running weather satellites\r\n- to give four trillion SST measurements\r\n\r\nThis dataset is largely independent of in situ observations.",
"imageFits": [
"contain",
Expand Down
Loading

0 comments on commit 313abbb

Please sign in to comment.