Skip to content

Commit

Permalink
[Fixes #368] Include geo carousel section in geostories (#369)
Browse files Browse the repository at this point in the history
  • Loading branch information
allyoucanmap authored Jul 23, 2021
1 parent caca831 commit 2747f3b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/MapStore2
Submodule MapStore2 updated 70 files
+0 −1 package.json
+9 −52 web/client/actions/__tests__/geostory-test.js
+5 −28 web/client/actions/geostory.js
+4 −2 web/client/components/geostory/builder/SectionsPreview.jsx
+4 −4 web/client/components/geostory/common/MapEditor.jsx
+1 −23 web/client/components/geostory/common/MapView.jsx
+51 −22 web/client/components/geostory/common/enhancers/withPopupSupport.jsx
+72 −0 web/client/components/geostory/common/hooks/__tests__/useSwipeControls-test.js
+299 −0 web/client/components/geostory/common/hooks/useSwipeControls.js
+129 −0 web/client/components/geostory/common/map/FitBounds.jsx
+83 −0 web/client/components/geostory/common/map/LocalDrawSupport.jsx
+83 −0 web/client/components/geostory/common/map/__tests__/FitBounds-test.jsx
+32 −0 web/client/components/geostory/common/map/__tests__/LocalDrawSupport-test.jsx
+4 −4 web/client/components/geostory/contents/ContentToolbar.jsx
+2 −2 web/client/components/geostory/contents/ContentWrapper.jsx
+3 −2 web/client/components/geostory/contents/Contents.jsx
+1 −3 web/client/components/geostory/contents/__tests__/ContentToolbar-test.jsx
+145 −93 web/client/components/geostory/contents/carousel/Carousel.jsx
+19 −0 web/client/components/geostory/contents/carousel/InfoCarousel.jsx
+0 −45 web/client/components/geostory/contents/carousel/VectorInfoViewer.jsx
+147 −37 web/client/components/geostory/contents/carousel/__tests__/Carousel-test.jsx
+51 −0 web/client/components/geostory/contents/carousel/__tests__/InfoCarousel-test.jsx
+0 −68 web/client/components/geostory/contents/carousel/__tests__/VectorInfoViewer-test.jsx
+3 −2 web/client/components/geostory/contents/carousel/carouselItem/ItemThumbnail.jsx
+2 −2 web/client/components/geostory/contents/carousel/carouselItem/__tests__/ItemThumbnail-test.jsx
+0 −38 web/client/components/geostory/contents/carousel/withKeyboardEnhancer.jsx
+0 −107 web/client/components/geostory/contents/carousel/withScrollEnhancer.jsx
+8 −3 web/client/components/geostory/layouts/Cascade.jsx
+10 −3 web/client/components/geostory/layouts/sections/Background.jsx
+1 −1 web/client/components/geostory/layouts/sections/Banner.jsx
+163 −20 web/client/components/geostory/layouts/sections/GeoCarousel.jsx
+2 −2 web/client/components/geostory/layouts/sections/Immersive.jsx
+1 −1 web/client/components/geostory/layouts/sections/Paragraph.jsx
+9 −2 web/client/components/geostory/layouts/sections/Section.jsx
+1 −1 web/client/components/geostory/layouts/sections/Title.jsx
+28 −28 web/client/components/geostory/layouts/sections/__tests__/GoeCarousel-test.jsx
+20 −1 web/client/components/geostory/layouts/sections/enhancers/__tests__/immersiveBackgroundManager-test.jsx
+38 −14 web/client/components/geostory/layouts/sections/enhancers/immersiveBackgroundManager.jsx
+12 −7 web/client/components/geostory/media/Map.jsx
+4 −2 web/client/components/geostory/media/index.js
+2 −288 web/client/components/geostory/navigation/ScrollMenu.jsx
+1 −1 web/client/components/geostory/navigation/__tests__/ScrollMenu-test.jsx
+2 −1 web/client/components/map/leaflet/Feature.jsx
+1 −1 web/client/components/map/plugins/leaflet.js
+14 −1 web/client/components/misc/withConfirm.jsx
+1 −8 web/client/configs/localConfig.json
+6 −473 web/client/epics/__tests__/geostory-test.js
+26 −318 web/client/epics/geostory.js
+10 −9 web/client/plugins/GeoStory.jsx
+3 −1 web/client/plugins/geostory/MediaViewer.js
+7 −30 web/client/reducers/__tests__/geostory-test.js
+6 −24 web/client/reducers/geostory.js
+6 −26 web/client/selectors/__tests__/geostory-test.js
+8 −18 web/client/selectors/geostory.js
+35 −34 web/client/test-resources/geostory/sampleStory_1.json
+78 −76 web/client/themes/default/icons.less
+ web/client/themes/default/icons/icons.eot
+44 −38 web/client/themes/default/icons/icons.svg
+ web/client/themes/default/icons/icons.ttf
+ web/client/themes/default/icons/icons.woff
+ web/client/themes/default/icons/icons.woff2
+132 −66 web/client/themes/default/less/geostory.less
+60 −0 web/client/themes/default/svg/story-carousel-section.svg
+3 −0 web/client/translations/data.de-DE.json
+3 −0 web/client/translations/data.en-US.json
+3 −0 web/client/translations/data.es-ES.json
+3 −0 web/client/translations/data.fr-FR.json
+3 −0 web/client/translations/data.it-IT.json
+45 −53 web/client/utils/GeoStoryUtils.js
+109 −1 web/client/utils/__tests__/GeoStoryUtils-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
height: 100%;
z-index: 0;
overflow: hidden;
transform: translate(0, 0);
}
}

Expand Down

0 comments on commit 2747f3b

Please sign in to comment.