From d26406e713c817cdcca370f92b76ad42a9676523 Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 31 Jan 2018 17:52:02 -0500 Subject: [PATCH 01/11] add collection name next to title Co-authored-by: Mike Romani 29218846+MichaelRomani@users.noreply.github.com --- src/components/Collection/Entries/EntryCard.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index e9f3f9fcd030..7e326d62dbe9 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -16,6 +16,7 @@ const EntryCard = ({ }) => { const label = entry.get('label'); const title = label || entry.getIn(['data', inferedFields.titleField]); + const collectionLabel = collection.get('label'); const path = `/collections/${collection.get('name')}/entries/${entry.get('slug')}`; let image = entry.getIn(['data', inferedFields.imageField]); image = resolvePath(image, publicFolder); @@ -26,7 +27,7 @@ const EntryCard = ({ if (viewStyle === VIEW_STYLE_LIST) { return ( -

{title}

+

{title} (Collection: {collectionLabel})

); } @@ -35,7 +36,7 @@ const EntryCard = ({ return (
-

{title}

+

{title} (Collection: {collectionLabel})

{ image From ad404f93c46f45d1f5aaef55b41fd1fcd6db26f1 Mon Sep 17 00:00:00 2001 From: Sol Date: Wed, 31 Jan 2018 18:04:12 -0500 Subject: [PATCH 02/11] add collection name next to title Co-authored-by: Mike Romani 29218846+MichaelRomani@users.noreply.github.com --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 830b02a87f7f..cf52acfa6c09 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -720,6 +720,15 @@ "design", "doc" ] + }, + { + "login": "solpark", + "name": "Sol Park", + "avatar_url": "https://avatars0.githubusercontent.com/u/30510616?v=4", + "profile": "https://github.com/solpark", + "contributions": [ + "code" + ] } ] } From 1a66b4531b35f4ed80b6c9baa5782594ef9e279c Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 1 Feb 2018 16:09:42 -0500 Subject: [PATCH 03/11] only show collection name when entries are searched Co-authored-by: Mike Romani 29218846+MichaelRomani@users.noreply.github.com --- src/components/Collection/Collection.js | 4 ++-- src/components/Collection/Entries/Entries.js | 4 +++- src/components/Collection/Entries/EntriesSearch.js | 3 ++- src/components/Collection/Entries/EntryCard.js | 5 +++-- src/components/Collection/Entries/EntryListing.js | 4 ++-- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/components/Collection/Collection.js b/src/components/Collection/Collection.js index 8f3294c73b07..69277e5a05ac 100644 --- a/src/components/Collection/Collection.js +++ b/src/components/Collection/Collection.js @@ -24,8 +24,8 @@ class Collection extends React.Component { }; renderEntriesSearch = () => { - const { searchTerm, collections } = this.props; - return + const { searchTerm, collections, isSearchResults } = this.props; + return }; handleChangeViewStyle = (viewStyle) => { diff --git a/src/components/Collection/Entries/Entries.js b/src/components/Collection/Entries/Entries.js index bc9974b2e33d..e2648519f399 100644 --- a/src/components/Collection/Entries/Entries.js +++ b/src/components/Collection/Entries/Entries.js @@ -11,7 +11,8 @@ const Entries = ({ page, onPaginate, isFetching, - viewStyle + viewStyle, + isSearchResults }) => { const loadingMessages = [ 'Loading Entries', @@ -28,6 +29,7 @@ const Entries = ({ page={page} onPaginate={onPaginate} viewStyle={viewStyle} + isSearchResults={isSearchResults} /> ); } diff --git a/src/components/Collection/Entries/EntriesSearch.js b/src/components/Collection/Entries/EntriesSearch.js index daf58d006255..09cbc300be21 100644 --- a/src/components/Collection/Entries/EntriesSearch.js +++ b/src/components/Collection/Entries/EntriesSearch.js @@ -42,7 +42,7 @@ class EntriesSearch extends React.Component { }; render () { - const { collections, entries, publicFolder, page, isFetching } = this.props; + const { collections, entries, publicFolder, page, isFetching, isSearchResults } = this.props; return ( ); } diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index 7e326d62dbe9..4d87f09a746f 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -12,6 +12,7 @@ const EntryCard = ({ entry, inferedFields, publicFolder, + isSearchResults, viewStyle = VIEW_STYLE_LIST, }) => { const label = entry.get('label'); @@ -27,7 +28,7 @@ const EntryCard = ({ if (viewStyle === VIEW_STYLE_LIST) { return ( -

{title} (Collection: {collectionLabel})

+

{title} {isSearchResults && `(Collection: ${collectionLabel})`}

); } @@ -36,7 +37,7 @@ const EntryCard = ({ return (
-

{title} (Collection: {collectionLabel})

+

{title} {isSearchResults && `(Collection: ${collectionLabel})`}

{ image diff --git a/src/components/Collection/Entries/EntryListing.js b/src/components/Collection/Entries/EntryListing.js index dff560bbad07..31f6f5202706 100644 --- a/src/components/Collection/Entries/EntryListing.js +++ b/src/components/Collection/Entries/EntryListing.js @@ -41,12 +41,12 @@ export default class EntryListing extends React.Component { }; renderCardsForMultipleCollections = () => { - const { collections, entries, publicFolder } = this.props; + const { collections, entries, publicFolder, isSearchResults } = this.props; return entries.map((entry, idx) => { const collectionName = entry.get('collection'); const collection = collections.find(coll => coll.get('name') === collectionName); const inferedFields = this.inferFields(collection); - const entryCardProps = { collection, entry, inferedFields, publicFolder, key: idx }; + const entryCardProps = { collection, entry, inferedFields, publicFolder, isSearchResults, key: idx }; return ; }); }; From 520dc545c89b564a4ba3dc589e3533cefbf510ed Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 1 Feb 2018 16:26:46 -0500 Subject: [PATCH 04/11] add simple design to collection label Co-authored-by: Mike Romani 29218846+MichaelRomani@users.noreply.github.com --- src/components/Collection/Entries/EntryCard.css | 7 +++++++ src/components/Collection/Entries/EntryCard.js | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/components/Collection/Entries/EntryCard.css b/src/components/Collection/Entries/EntryCard.css index 8dfc18766ce0..c347b2adf609 100644 --- a/src/components/Collection/Entries/EntryCard.css +++ b/src/components/Collection/Entries/EntryCard.css @@ -41,6 +41,8 @@ .nc-entryListing-listCard { @apply(--card); + display:flex; + justify-content: space-between; width: var(--topCardWidth); max-width: 100%; padding: 16px 22px; @@ -56,6 +58,11 @@ margin-bottom: 0; } +.nc-entryListing-listCard-collection-label { + margin-bottom: 0; + color: #798291; +} + .nc-entryListing-cardBody-full { height: 100%; } diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index 4d87f09a746f..6dfd968e0ac4 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -28,7 +28,8 @@ const EntryCard = ({ if (viewStyle === VIEW_STYLE_LIST) { return ( -

{title} {isSearchResults && `(Collection: ${collectionLabel})`}

+

{title}

+

{isSearchResults && `Collection: ${collectionLabel}`}

); } @@ -37,7 +38,7 @@ const EntryCard = ({ return (
-

{title} {isSearchResults && `(Collection: ${collectionLabel})`}

+

{title}

{ image From 4bc362f8349236649c735fbc43b3ae3082bc8644 Mon Sep 17 00:00:00 2001 From: Sol Date: Thu, 1 Feb 2018 16:31:26 -0500 Subject: [PATCH 05/11] add simple design to collection label Co-authored-by: Mike Romani 29218846+MichaelRomani@users.noreply.github.com --- .all-contributorsrc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index cf52acfa6c09..4902df2aaa56 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -729,6 +729,15 @@ "contributions": [ "code" ] + }, + { + "login": "michaelromani", + "name": "Michael Romani", + "avatar_url": "https://avatars0.githubusercontent.com/u/29218846?v=4", + "profile": "https://github.com/michaelromani", + "contributions": [ + "code" + ] } ] } From b9b1e1418aad51d969270d9c2ed108b017b0c83c Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 3 Feb 2018 14:17:52 -0500 Subject: [PATCH 06/11] remove from higher components. Add props passing down directly from EntryListing --- src/components/Collection/Collection.js | 4 ++-- src/components/Collection/Entries/Entries.js | 4 +--- src/components/Collection/Entries/EntriesSearch.js | 3 +-- src/components/Collection/Entries/EntryCard.js | 4 ++-- src/components/Collection/Entries/EntryListing.js | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/components/Collection/Collection.js b/src/components/Collection/Collection.js index 69277e5a05ac..8f3294c73b07 100644 --- a/src/components/Collection/Collection.js +++ b/src/components/Collection/Collection.js @@ -24,8 +24,8 @@ class Collection extends React.Component { }; renderEntriesSearch = () => { - const { searchTerm, collections, isSearchResults } = this.props; - return + const { searchTerm, collections } = this.props; + return }; handleChangeViewStyle = (viewStyle) => { diff --git a/src/components/Collection/Entries/Entries.js b/src/components/Collection/Entries/Entries.js index e2648519f399..bc9974b2e33d 100644 --- a/src/components/Collection/Entries/Entries.js +++ b/src/components/Collection/Entries/Entries.js @@ -11,8 +11,7 @@ const Entries = ({ page, onPaginate, isFetching, - viewStyle, - isSearchResults + viewStyle }) => { const loadingMessages = [ 'Loading Entries', @@ -29,7 +28,6 @@ const Entries = ({ page={page} onPaginate={onPaginate} viewStyle={viewStyle} - isSearchResults={isSearchResults} /> ); } diff --git a/src/components/Collection/Entries/EntriesSearch.js b/src/components/Collection/Entries/EntriesSearch.js index 09cbc300be21..daf58d006255 100644 --- a/src/components/Collection/Entries/EntriesSearch.js +++ b/src/components/Collection/Entries/EntriesSearch.js @@ -42,7 +42,7 @@ class EntriesSearch extends React.Component { }; render () { - const { collections, entries, publicFolder, page, isFetching, isSearchResults } = this.props; + const { collections, entries, publicFolder, page, isFetching } = this.props; return ( ); } diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index 6dfd968e0ac4..532a94a681b1 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -12,7 +12,7 @@ const EntryCard = ({ entry, inferedFields, publicFolder, - isSearchResults, + collectionName, viewStyle = VIEW_STYLE_LIST, }) => { const label = entry.get('label'); @@ -29,7 +29,7 @@ const EntryCard = ({ return (

{title}

-

{isSearchResults && `Collection: ${collectionLabel}`}

+

{collectionName && `Collection: ${collectionLabel}`}

); } diff --git a/src/components/Collection/Entries/EntryListing.js b/src/components/Collection/Entries/EntryListing.js index 31f6f5202706..b1a85ec309f1 100644 --- a/src/components/Collection/Entries/EntryListing.js +++ b/src/components/Collection/Entries/EntryListing.js @@ -41,12 +41,12 @@ export default class EntryListing extends React.Component { }; renderCardsForMultipleCollections = () => { - const { collections, entries, publicFolder, isSearchResults } = this.props; + const { collections, entries, publicFolder} = this.props; return entries.map((entry, idx) => { const collectionName = entry.get('collection'); const collection = collections.find(coll => coll.get('name') === collectionName); const inferedFields = this.inferFields(collection); - const entryCardProps = { collection, entry, inferedFields, publicFolder, isSearchResults, key: idx }; + const entryCardProps = { collection, entry, inferedFields, publicFolder, key: idx, collectionName }; return ; }); }; From b7d3aed63c21edbbb5e36e08499464c90a94211f Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 3 Feb 2018 15:27:36 -0500 Subject: [PATCH 07/11] fix design of collection label to top left corner --- src/components/Collection/Entries/EntryCard.css | 9 +++++---- src/components/Collection/Entries/EntryCard.js | 5 ++--- src/components/Collection/Entries/EntryListing.js | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/Collection/Entries/EntryCard.css b/src/components/Collection/Entries/EntryCard.css index c347b2adf609..da0b1a0c7621 100644 --- a/src/components/Collection/Entries/EntryCard.css +++ b/src/components/Collection/Entries/EntryCard.css @@ -41,11 +41,8 @@ .nc-entryListing-listCard { @apply(--card); - display:flex; - justify-content: space-between; width: var(--topCardWidth); max-width: 100%; - padding: 16px 22px; margin-left: 12px; margin-bottom: 16px; @@ -55,12 +52,16 @@ } .nc-entryListing-listCard-title { + padding: 16px 22px; margin-bottom: 0; } .nc-entryListing-listCard-collection-label { + position: absolute; + margin: 4px; margin-bottom: 0; - color: #798291; + font-size: 10px; + color:#798291; } .nc-entryListing-cardBody-full { diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index 532a94a681b1..ab1f6fc145f0 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -12,12 +12,11 @@ const EntryCard = ({ entry, inferedFields, publicFolder, - collectionName, + collectionLabel, viewStyle = VIEW_STYLE_LIST, }) => { const label = entry.get('label'); const title = label || entry.getIn(['data', inferedFields.titleField]); - const collectionLabel = collection.get('label'); const path = `/collections/${collection.get('name')}/entries/${entry.get('slug')}`; let image = entry.getIn(['data', inferedFields.imageField]); image = resolvePath(image, publicFolder); @@ -28,8 +27,8 @@ const EntryCard = ({ if (viewStyle === VIEW_STYLE_LIST) { return ( +

{collectionLabel && collectionLabel}

{title}

-

{collectionName && `Collection: ${collectionLabel}`}

); } diff --git a/src/components/Collection/Entries/EntryListing.js b/src/components/Collection/Entries/EntryListing.js index b1a85ec309f1..6f8008af1288 100644 --- a/src/components/Collection/Entries/EntryListing.js +++ b/src/components/Collection/Entries/EntryListing.js @@ -45,8 +45,9 @@ export default class EntryListing extends React.Component { return entries.map((entry, idx) => { const collectionName = entry.get('collection'); const collection = collections.find(coll => coll.get('name') === collectionName); + const collectionLabel = collection.get('label') const inferedFields = this.inferFields(collection); - const entryCardProps = { collection, entry, inferedFields, publicFolder, key: idx, collectionName }; + const entryCardProps = { collection, entry, inferedFields, publicFolder, key: idx, collectionLabel }; return ; }); }; From 0f26c7f83eda4c5dc77f585cd98c2d0c3d10153b Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 3 Feb 2018 16:03:11 -0500 Subject: [PATCH 08/11] fix minor lint issues --- src/components/Collection/Entries/EntryCard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index ab1f6fc145f0..6fede8725b0c 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -27,8 +27,8 @@ const EntryCard = ({ if (viewStyle === VIEW_STYLE_LIST) { return ( -

{collectionLabel && collectionLabel}

-

{title}

+

{ collectionLabel && collectionLabel }

+

{ title }

); } From ae56536e2822734323574d2f86603a0c73016b34 Mon Sep 17 00:00:00 2001 From: Caleb Date: Mon, 5 Feb 2018 12:09:55 -0700 Subject: [PATCH 09/11] Fix all-contributors list. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4949e45a687b..1e37c35403ba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Netlify CMS -[![All Contributors](https://img.shields.io/badge/all_contributors-84-orange.svg)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-86-orange.svg)](#contributors) [![Open Source Helpers](https://www.codetriage.com/netlify/netlify-cms/badges/users.svg)](https://www.codetriage.com/netlify/netlify-cms) [![](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/netlify/netlifycms) @@ -63,6 +63,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds | [
Bryan Robinson](http://bryanlrobinson.com)
[📖](https://github.com/netlify/netlify-cms/commits?author=brob "Documentation") | [
Darren](https://github.com/dardub)
[📖](https://github.com/netlify/netlify-cms/commits?author=dardub "Documentation") | [
Richard Pullinger](http://www.richardpullinger.com)
[💻](https://github.com/netlify/netlify-cms/commits?author=rpullinger "Code") | [
Taylor Bryant](https://taylorbryant.blog)
[📖](https://github.com/netlify/netlify-cms/commits?author=taylorbryant "Documentation") | [
kvanerkelens](https://github.com/kvanerkelens)
[📖](https://github.com/netlify/netlify-cms/commits?author=kvanerkelens "Documentation") | [
Patrick Sier](https://patsier.com/)
[💻](https://github.com/netlify/netlify-cms/commits?author=pjsier "Code") | [
Christian Nolte](http://noltech.net)
[💻](https://github.com/netlify/netlify-cms/commits?author=drlogout "Code") | | [
Edward Betts](http://edwardbetts.com/)
[📖](https://github.com/netlify/netlify-cms/commits?author=EdwardBetts "Documentation") | [
Josh Hardman](https://github.com/jhardman0830)
[📖](https://github.com/netlify/netlify-cms/commits?author=jhardman0830 "Documentation") | [
Mantas](https://behance.net/mistermantas)
[📖](https://github.com/netlify/netlify-cms/commits?author=mistermantas "Documentation") | [
Marco Biedermann](https://www.marcobiedermann.com)
[📖](https://github.com/netlify/netlify-cms/commits?author=marcobiedermann "Documentation") | [
Max Stoiber](https://mxstbr.blog/newsletter)
[📖](https://github.com/netlify/netlify-cms/commits?author=mxstbr "Documentation") | [
Vyacheslav Matyukhin](http://berekuk.ru)
[📖](https://github.com/netlify/netlify-cms/commits?author=berekuk "Documentation") | [
jimmaaay](https://jimmythompson.me)
[💻](https://github.com/netlify/netlify-cms/commits?author=jimmaaay "Code") | | [
Luís Miguel](https://github.com/Quicksaver)
[🐛](https://github.com/netlify/netlify-cms/issues?q=author%3AQuicksaver "Bug reports") [💻](https://github.com/netlify/netlify-cms/commits?author=Quicksaver "Code") | [
Chris Swithinbank](http://chrisswithinbank.net/)
[📖](https://github.com/netlify/netlify-cms/commits?author=delucis "Documentation") | [
remmah](https://github.com/remmah)
[📖](https://github.com/netlify/netlify-cms/commits?author=remmah "Documentation") | [
Sumeet Jain](http://sumeetjain.com)
[📖](https://github.com/netlify/netlify-cms/commits?author=sumeetjain "Documentation") | [
Sagar Khatri](https://github.com/ragasirtahk)
[📖](https://github.com/netlify/netlify-cms/commits?author=ragasirtahk "Documentation") [💡](#example-ragasirtahk "Examples") | [
Kevin Doocey](https://www.dooceykev.in)
[💻](https://github.com/netlify/netlify-cms/commits?author=Doocey "Code") | [
Tim Carry](http://www.pixelastic.com/)
[💻](https://github.com/netlify/netlify-cms/commits?author=pixelastic "Code") [🎨](#design-pixelastic "Design") [📖](https://github.com/netlify/netlify-cms/commits?author=pixelastic "Documentation") | +| [
Sol Park](https://github.com/solpark)
[💻](https://github.com/netlify/netlify-cms/commits?author=solpark "Code") | [
Michael Romani](https://github.com/michaelromani)
[💻](https://github.com/netlify/netlify-cms/commits?author=michaelromani "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! From 6c46b381e301cac0125f2d378813f77b5fb877d9 Mon Sep 17 00:00:00 2001 From: Shawn Erquhart Date: Wed, 7 Feb 2018 16:28:10 -0500 Subject: [PATCH 10/11] update collection label styling to match workflow --- src/components/Collection/Entries/EntryCard.css | 10 ++++------ src/components/Collection/Entries/EntryCard.js | 6 +++++- src/components/Workflow/WorkflowCard.css | 1 - 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/Collection/Entries/EntryCard.css b/src/components/Collection/Entries/EntryCard.css index da0b1a0c7621..620624d5e109 100644 --- a/src/components/Collection/Entries/EntryCard.css +++ b/src/components/Collection/Entries/EntryCard.css @@ -43,6 +43,7 @@ @apply(--card); width: var(--topCardWidth); max-width: 100%; + padding: 16px 22px; margin-left: 12px; margin-bottom: 16px; @@ -52,16 +53,13 @@ } .nc-entryListing-listCard-title { - padding: 16px 22px; margin-bottom: 0; } .nc-entryListing-listCard-collection-label { - position: absolute; - margin: 4px; - margin-bottom: 0; - font-size: 10px; - color:#798291; + font-size: 12px; + color: var(--colorTextLead); + text-transform: uppercase; } .nc-entryListing-cardBody-full { diff --git a/src/components/Collection/Entries/EntryCard.js b/src/components/Collection/Entries/EntryCard.js index 6fede8725b0c..0e48b2c9b8d9 100644 --- a/src/components/Collection/Entries/EntryCard.js +++ b/src/components/Collection/Entries/EntryCard.js @@ -7,6 +7,9 @@ import history from 'Routing/history'; import { resolvePath } from 'Lib/pathHelper'; import { VIEW_STYLE_LIST, VIEW_STYLE_GRID } from 'Constants/collectionViews'; +const CollectionLabel = ({ label }) => +

{label}

; + const EntryCard = ({ collection, entry, @@ -27,7 +30,7 @@ const EntryCard = ({ if (viewStyle === VIEW_STYLE_LIST) { return ( -

{ collectionLabel && collectionLabel }

+ { collectionLabel ? : null }

{ title }

); @@ -37,6 +40,7 @@ const EntryCard = ({ return (
+ { collectionLabel ? : null }

{title}

{ diff --git a/src/components/Workflow/WorkflowCard.css b/src/components/Workflow/WorkflowCard.css index cabf7dd54b73..634b1046d670 100644 --- a/src/components/Workflow/WorkflowCard.css +++ b/src/components/Workflow/WorkflowCard.css @@ -15,7 +15,6 @@ .nc-workflow-card-collection { font-size: 14px; - font-weight: 16px; color: var(--colorTextLead); text-transform: uppercase; margin-top: 12px; From f08535bc72c8a7fe6c7b60d1a97ee952023b4ca7 Mon Sep 17 00:00:00 2001 From: Caleb Date: Wed, 7 Feb 2018 15:01:56 -0700 Subject: [PATCH 11/11] lint code --- src/components/Collection/Entries/EntryListing.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Collection/Entries/EntryListing.js b/src/components/Collection/Entries/EntryListing.js index 6f8008af1288..efde350c7e7f 100644 --- a/src/components/Collection/Entries/EntryListing.js +++ b/src/components/Collection/Entries/EntryListing.js @@ -41,11 +41,11 @@ export default class EntryListing extends React.Component { }; renderCardsForMultipleCollections = () => { - const { collections, entries, publicFolder} = this.props; + const { collections, entries, publicFolder } = this.props; return entries.map((entry, idx) => { const collectionName = entry.get('collection'); const collection = collections.find(coll => coll.get('name') === collectionName); - const collectionLabel = collection.get('label') + const collectionLabel = collection.get('label'); const inferedFields = this.inferFields(collection); const entryCardProps = { collection, entry, inferedFields, publicFolder, key: idx, collectionLabel }; return ;