Merge branch 'develop'

catarse · Aug 18, 2020 · 6c784ce · 6c784ce
2 parents da3771c + e892f19
commit 6c784ce
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/dist/catarse.js b/dist/catarse.js
diff --git a/dist/catarse.js.map b/dist/catarse.js.map
diff --git a/legacy/src/c/home-banner-slide.js b/legacy/src/c/home-banner-slide.js
@@ -12,17 +12,15 @@ export const HomeBannerSlide = {
         return m(`.slide.w-slide.${slideClass}`, {
             style: `${sliderTransitionStyle} background-image: url(${slide.image});`
         }, [
-            m('.w-container', [
-                m('.w-row', [
-                    m('.w-col.w-col-8.w-col-push-2', 
-                        m('.w-container.u-text-center', [
-                            m('.w-row.u-marginbottom-40', [
-                                m('h1.fontcolor-negative.fontsize-megajumbo.u-marginbottom-20', m.trust(slide.title)),
-                                m('h2.fontcolor-negative.fontsize-large', m.trust(slide.subtitle))
-                            ]),
-                            m('a.btn.btn-large.u-marginbottom-10.btn-inline', { href: slide.link }, slide.cta)
+            m('.hero-slide-wrapper', [ 
+                m('.w-container.u-text-center', [
+                    m('.w-row', [
+                        m('.w-col.w-col-8.w-col-push-2', [
+                            m('h1.hero-home-title', m.trust(slide.title)),
+                            m('h2.hero-home-subtitle.u-marginbottom-20', m.trust(slide.subtitle)),
+                            m('a.btn.btn-large.btn-inline', { href: slide.link }, slide.cta)
                         ])
-                    )
+                    ])
                 ])
             ])
         ]);

diff --git a/legacy/src/c/project-row-with-header.js b/legacy/src/c/project-row-with-header.js
@@ -17,7 +17,7 @@ const projectRowWithHeader = {
             ),
             collectionHeaderComponent = (
                 (!_.isUndefined(collection.title) || !_.isUndefined(collection.hash)) ?
-                    m('.u-marginbottom-40.u-text-center-small-only', [
+                    m('.u-marginbottom-20.u-text-center-small-only', [
                         m('div', _.map(collection.badges, badge => m(`img[src="/assets/catarse_bootstrap/${badge}.png"][width='105']`))),
                         m('.w-row', [
                             m('.w-col.w-col-8', m('.fontsize-larger.u-marginbottom-20', `${title}`)),

diff --git a/legacy/src/c/projects-display.js b/legacy/src/c/projects-display.js
@@ -24,7 +24,7 @@ const projectsDisplay = {
             sample3 = _.partial(_.sample, _, 3),
             loader = catarse.loaderWithToken,
             project = models.project,
-            subHomeWith6CollectionsFilters = ['covid_19', 'projects_we_love_not_sub', 'sub', 'contributed_by_friends'],
+            subHomeWith6CollectionsFilters = ['projects_we_love_not_sub', 'sub', 'covid_19', 'contributed_by_friends'],
             windowEventNOTDispatched = true;
 
         project.pageSize(20);