diff --git a/imports/startup/common/i18n.js b/imports/startup/common/i18n.js index 2aeeea1..2db4371 100644 --- a/imports/startup/common/i18n.js +++ b/imports/startup/common/i18n.js @@ -15,7 +15,7 @@ const backOpts = { jsonIndent: 2 }; -const forceDebug = false; +const forceDebug = true; const shouldDebug = (forceDebug && !Meteor.isProduction); const i18nOpts = { diff --git a/imports/ui/pages/Index/Index-custom.scss b/imports/ui/pages/Index/Index-custom.scss index 95b5223..ba092dd 100644 --- a/imports/ui/pages/Index/Index-custom.scss +++ b/imports/ui/pages/Index/Index-custom.scss @@ -186,6 +186,13 @@ background-image: url('/home-slide4.jpg') } +.carousel-snd-item-1 { + background-image: url('/home-slide-snd-1.jpg') +} + +.carousel-snd-item-2 { + background-image: url('/home-slide-snd-2.jpg') +} .participe-btn { background-color: $todos-palette1; @@ -267,4 +274,8 @@ font-size: 13px; margin-left: 20px; margin-right: 20px; -} \ No newline at end of file +} + +#carouselSndIndicators > div > div.carousel-item.carousel-snd-item-1 > div > h3 > span > a { + color: white; +} diff --git a/imports/ui/pages/Index/Index.js b/imports/ui/pages/Index/Index.js index aeaab6b..e439027 100644 --- a/imports/ui/pages/Index/Index.js +++ b/imports/ui/pages/Index/Index.js @@ -89,17 +89,16 @@ class Index extends Component {
{ this.slides = ref; }} > {/* for dev ^^^: data-interval=false */}
    -
  1. -
  2. -
  3. -
  4. +
  5. +
  6. +
  7. +
@@ -141,11 +140,11 @@ class Index extends Component {
- + - + @@ -182,6 +181,41 @@ class Index extends Component { +
{ this.slidesSnd = ref; }} + > + {/* for dev ^^^: data-interval=false */} +
    +
  1. +
  2. +
+
+ +
+ +
+
+
+

Ayúdanos a combatir el cambio climático y a proteger el medioambiente

+

+

+
+
+ + + + +
+
diff --git a/private/pages/credits-en.md b/private/pages/credits-en.md index 5990543..049f3b5 100644 --- a/private/pages/credits-en.md +++ b/private/pages/credits-en.md @@ -8,6 +8,8 @@ We acknowledge the use of data and imagery from LANCE FIRMS operated by the NASA * Home slide 2: Silverhorne, United States, photo by Nathan Anderson [source](https://unsplash.com/photos/ZLOZC1uUdns). * Home slide 3: Bitterroot National Forest, Montana, United States, photo by John McColgan, Public Domain, [source](https://commons.wikimedia.org/wiki/File:Deerfire_high_res.jpg). * Home slide 4: Cox Valley Fire, Olympic NP, United States, August 2016, [source](https://www.nps.gov/olym/learn/management/current-fire-status.htm). +* Home slide secondary 1: La Tuna fire and nighttime city lights, LA, United States, September 2017, photo by Scott L, CC-BY-SA 2.0, [source](https://commons.wikimedia.org/wiki/File:La_Tuna_fire_and_cityscape_1.jpg) +* Home slide secondary 2: Smog over Almaty city, Kazakhstan, January 2014, photo by Igors Jefimovs, CC-BY 3.0, [source](https://commons.wikimedia.org/wiki/File:Smog_over_Almaty.jpg) * Wildfire home photo: [California Wildfires, October 23th 2007](https://commons.wikimedia.org/wiki/File:California_Wildfires_October_23_2007.jpg), [fuente](http://www.nasa.gov/vision/earth/lookingatearth/socal_wildfires_oct07.html). * Default avatar: A colored Emoji from Noto project, released under Apache license, [source](https://commons.wikimedia.org/wiki/File:Emoji_u1f469_1f3fd_200d_1f692.svg). diff --git a/private/pages/credits-es.md b/private/pages/credits-es.md index 8412d8d..a1202f2 100644 --- a/private/pages/credits-es.md +++ b/private/pages/credits-es.md @@ -4,10 +4,12 @@ Reconocemos el uso de datos e imágenes de LANCE FIRMS operadas por NASA/GSFC/Ea **Imágenes** -* Diapositiva 1 inicial: Sotres, Picos de Europa, Asturias, foto de Mick Stephenson, licencia CC-BY-SA 3.0, [fuente](https://es.wikipedia.org/wiki/Sotres#/media/File:SotresPanorama.jpg). -* Diapositiva 2 inicial: Silverhorne, Estados Unidos, foto de Nathan Anderson [fuente](https://unsplash.com/photos/ZLOZC1uUdns). -* Diapositiva 3 inicial: Bitterroot National Forest, Montana, Estados Unidos, foto de John McColgan, Public Domain, [fuente](https://commons.wikimedia.org/wiki/File:Deerfire_high_res.jpg). -* Diapositiva 4 inicial: Cox Valley Fire, Olympic NP, Estados Unidos, agosto de 2016, [fuente](https://www.nps.gov/olym/learn/management/current-fire-status.htm). +* Diapositiva 1 del Inicio: Sotres, Picos de Europa, Asturias, foto de Mick Stephenson, licencia CC-BY-SA 3.0, [fuente](https://es.wikipedia.org/wiki/Sotres#/media/File:SotresPanorama.jpg). +* Diapositiva 2 del Inicio: Silverhorne, Estados Unidos, foto de Nathan Anderson [fuente](https://unsplash.com/photos/ZLOZC1uUdns). +* Diapositiva 3 del Inicio: Bitterroot National Forest, Montana, Estados Unidos, foto de John McColgan, Public Domain, [fuente](https://commons.wikimedia.org/wiki/File:Deerfire_high_res.jpg). +* Diapositiva 4 del Inicio: Cox Valley Fire, Olympic NP, Estados Unidos, agosto de 2016, [fuente](https://www.nps.gov/olym/learn/management/current-fire-status.htm). +* Diapositiva secundaria 1 del Inicio: La Tuna fire and nighttime city lights, LA, Estados Unidos, septiembre de 2017, foto de Scott L, CC-BY-SA 2.0, [source](https://commons.wikimedia.org/wiki/File:La_Tuna_fire_and_cityscape_1.jpg) +* Diapositiva secundaria 2 del Inicio: Smog over Almaty city, Kazakhstan, enero de 2014, foto de Igors Jefimovs, CC-BY 3.0, [source](https://commons.wikimedia.org/wiki/File:Smog_over_Almaty.jpg) * Foto de inicio de fuego forestal: [Incendios forestales de California, 23 de octubre de 2007](https://commons.wikimedia.org/wiki/File:California_Wildfires_October_23_2007.jpg), [fuente](http://www.nasa.gov/vision/earth/lookingatearth/socal_wildfires_oct07.html). * Avatar predeterminado: un Emoji coloreado del proyecto Noto, publicado bajo licencia Apache, [fuente](https://commons.wikimedia.org/wiki/File:Emoji_u1f469_1f3fd_200d_1f692.svg). diff --git a/public/home-slide-snd-1.jpg b/public/home-slide-snd-1.jpg new file mode 100644 index 0000000..33859de Binary files /dev/null and b/public/home-slide-snd-1.jpg differ diff --git a/public/home-slide-snd-2.jpg b/public/home-slide-snd-2.jpg new file mode 100644 index 0000000..355ea97 Binary files /dev/null and b/public/home-slide-snd-2.jpg differ diff --git a/public/locales/en/common.json b/public/locales/en/common.json index 5ba9314..df512c3 100644 --- a/public/locales/en/common.json +++ b/public/locales/en/common.json @@ -162,5 +162,8 @@ "Zonas vigiladas": "Monitored areas", "En verde, las zonas vigiladas por nuestros usuari@s actualmente": "In green, the areas monitored by our users currently", "Datos actualizados <1>.": "Data updated <1>.", - "Información adicional sobre fuego": "Additional information about fire" + "Información adicional sobre fuego": "Additional information about fire", + "CO2emisions": + "Did you know that wildfires <1>produce as much CO² as cars and <3>about ⅕ of all our carbon emissions?", + "Ayúdanos a combatir el cambio climático y a proteger el medioambiente": "Help us fight climate change and protect the environment" } diff --git a/public/locales/es/common.json b/public/locales/es/common.json index 22a0008..ffefe05 100644 --- a/public/locales/es/common.json +++ b/public/locales/es/common.json @@ -253,5 +253,8 @@ "Fuegos activos en el mundo actualizados en tiempo real": "Fuegos activos en el mundo actualizados en tiempo real", "Información adicional sobre fuego": - "Información adicional sobre fuego" + "Información adicional sobre fuego", + "CO2emisions": + "¿Sabías que los fuegos <1>producen tanto CO² como los coches y <3>aproximadamente ⅕ de todas nuestras emisiones?", + "Ayúdanos a combatir el cambio climático": "Ayúdanos a combatir el cambio climático" }