fix: merge conflict from renaming Grid to Row

Author: Dobromir Hristov

src/components/DocumentationTopic/TopicsLinkCardGrid.vue

@@ -10,26 +10,26 @@
 
 <template>
   <div class="TopicsLinkCardGrid">
-    <Grid :columns="compactCards ? 3 : 2">
+    <Row :columns="compactCards ? 3 : 2">
       <Column
         v-for="(item, index) in items"
         :key="index"
       >
         <TopicsLinkCardGridItem :item="item" :compact="compactCards" />
       </Column>
-    </Grid>
+    </Row>
   </div>
 </template>
 
 <script>
-import Grid from 'docc-render/components/ContentNode/Grid.vue';
+import Row from 'docc-render/components/ContentNode/Row.vue';
 import Column from 'docc-render/components/ContentNode/Column.vue';
 import { TopicStyles } from 'docc-render/constants/TopicStyles';
 import TopicsLinkCardGridItem from './TopicsLinkCardGridItem.vue';
 
 export default {
   name: 'TopicsLinkCardGrid',
-  components: { TopicsLinkCardGridItem, Column, Grid },
+  components: { TopicsLinkCardGridItem, Column, Row },
   inject: ['references'],
   props: {
     identifiers: {
@@ -49,11 +49,3 @@ export default {
   },
 };
 </script>
-
-<style scoped lang='scss'>
-@import 'docc-render/styles/_core.scss';
-
-.grid {
-  grid-gap: 20px;
-}
-</style>

tests/unit/components/DocumentationTopic/TopicsLinkCardGrid.spec.js

@@ -11,7 +11,7 @@
 import TopicsLinkCardGrid from '@/components/DocumentationTopic/TopicsLinkCardGrid.vue';
 import { shallowMount } from '@vue/test-utils';
 import { TopicStyles } from '@/constants/TopicStyles';
-import Grid from '@/components/ContentNode/Grid.vue';
+import Row from '@/components/ContentNode/Row.vue';
 import Column from '@/components/ContentNode/Column.vue';
 import TopicsLinkCardGridItem from '@/components/DocumentationTopic/TopicsLinkCardGridItem.vue';
 
@@ -35,7 +35,7 @@ const createWrapper = ({ propsData, ...others } = {}) => shallowMount(TopicsLink
 describe('TopicsLinkCardGrid', () => {
   it('renders the TopicsLinkCardGrid', () => {
     const wrapper = createWrapper();
-    expect(wrapper.find(Grid).props()).toEqual({
+    expect(wrapper.find(Row).props()).toEqual({
       columns: 3, // compact grid is a 3 column setup
     });
     const cols = wrapper.findAll(Column);
@@ -53,7 +53,7 @@ describe('TopicsLinkCardGrid', () => {
         topicStyle: TopicStyles.detailedGrid,
       },
     });
-    expect(wrapper.find(Grid).props()).toEqual({
+    expect(wrapper.find(Row).props()).toEqual({
       columns: 2, // detailed grid is a 2 column setup
     });
     expect(wrapper.find(TopicsLinkCardGridItem).props('compact')).toBe(false);