Skip to content

Commit

Permalink
feat: updated Content Loader, turned all Content Loader Prefabs and m…
Browse files Browse the repository at this point in the history
…ade them accessible by passing in themes into the new Loader Content component. Next steps will be to make default width and required health props available for devs when they make their own custom loaders
  • Loading branch information
Amirah Chamble authored and Amirah Chamble committed Oct 25, 2018
1 parent 6973f77 commit 5436e18
Show file tree
Hide file tree
Showing 16 changed files with 1,647 additions and 1,809 deletions.
119 changes: 57 additions & 62 deletions dev/views/ContentLoaders.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
>
<div class="footer"/>
<div class="nav"/>
<ContentLoaderAlertList/>
<ContentLoaderAlertList/>
<ContentLoaderAlertList/>
<ContentLoaderAlertList/>
<ContentLoaderAlertList/>
<ContentLoaderAlertList/>
<ContentLoaderAlertList/>
<LoaderContent theme="AlertList"/>
<LoaderContent theme="AlertList"/>
<LoaderContent theme="AlertList"/>
<LoaderContent theme="AlertList"/>
<LoaderContent theme="AlertList"/>
<LoaderContent theme="AlertList"/>
<LoaderContent theme="AlertList"/>
</div>
</div>

Expand All @@ -67,7 +67,7 @@
<div
class="screen-container"
>
<ContentLoaderAlertResult/>
<LoaderContent theme="AlertResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -78,7 +78,7 @@
<div
class="screen-container"
>
<ContentLoaderCalendarResult/>
<LoaderContent theme="CalendarResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -89,7 +89,7 @@
<div
class="screen-container"
>
<ContentLoaderCommiteeResult/>
<LoaderContent theme="CommiteeResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -100,7 +100,7 @@
<div
class="screen-container"
>
<ContentLoaderDirectoriesResult/>
<LoaderContent theme="DirectoriesResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -111,12 +111,12 @@
<div
class="screen-container"
>
<ContentLoaderLegislationList/>
<ContentLoaderLegislationList/>
<ContentLoaderLegislationList/>
<ContentLoaderLegislationList/>
<ContentLoaderLegislationList/>
<ContentLoaderLegislationList/>
<LoaderContent theme="LegislationList"/>
<LoaderContent theme="LegislationList"/>
<LoaderContent theme="LegislationList"/>
<LoaderContent theme="LegislationList"/>
<LoaderContent theme="LegislationList"/>
<LoaderContent theme="LegislationList"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -127,7 +127,7 @@
<div
class="screen-container"
>
<ContentLoaderLegislationResult/>
<LoaderContent theme="LegislationResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -138,15 +138,15 @@
<div
class="screen-container"
>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<ContentLoaderMembersOfCongressList/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<LoaderContent theme="MembersOfCongressList"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -157,7 +157,7 @@
<div
class="screen-container"
>
<ContentLoaderMembersOfCongressResult/>
<LoaderContent theme="MembersOfCongressResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -168,9 +168,8 @@
<div
class="screen-container"
>
<ContentLoaderNewsList/>
<ContentLoaderNewsList/>
<ContentLoaderNewsList/>
<LoaderContent theme="NewsList"/>
<LoaderContent theme="NewsList"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -181,7 +180,7 @@
<div
class="screen-container"
>
<ContentLoaderNewsResult/>
<LoaderContent theme="NewsResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -192,7 +191,7 @@
<div
class="screen-container"
>
<ContentLoaderProfileResult/>
<LoaderContent theme="ProfileResult"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -203,7 +202,7 @@
<div
class="screen-container"
>
<ContentLoaderStaffersList/>
<LoaderContent theme="StaffersList"/>
<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -214,7 +213,27 @@
<div
class="screen-container"
>
<ContentLoaderStaffersList/>
<LoaderContent>
<rect
x="0"
y="12"
rx="5"
ry="0"
width="141"
height="24"
/>

<rect
x="0"
y="42"
rx="5"
ry="0"
width="156"
height="18"
/>

</LoaderContent>

<div class="footer"/>
<div class="nav"/>
</div>
Expand All @@ -228,37 +247,13 @@
import Vue from 'vue'
import {
ContentLoaderAlertList,
ContentLoaderAlertResult,
ContentLoaderCalendarResult,
ContentLoaderCommiteeResult,
ContentLoaderDirectoriesResult,
ContentLoaderLegislationList,
ContentLoaderLegislationResult,
ContentLoaderMembersOfCongressList,
ContentLoaderMembersOfCongressResult,
ContentLoaderNewsList,
ContentLoaderNewsResult,
ContentLoaderProfileResult,
ContentLoaderStaffersList
import {
LoaderContent
} from '@/index'
export default Vue.extend({
components:{
ContentLoaderAlertList,
ContentLoaderAlertResult,
ContentLoaderCalendarResult,
ContentLoaderCommiteeResult,
ContentLoaderDirectoriesResult,
ContentLoaderLegislationList,
ContentLoaderLegislationResult,
ContentLoaderMembersOfCongressList,
ContentLoaderMembersOfCongressResult,
ContentLoaderNewsList,
ContentLoaderNewsResult,
ContentLoaderProfileResult,
ContentLoaderStaffersList
LoaderContent
},
})
Expand Down
63 changes: 0 additions & 63 deletions src/components/ContentLoaderAlertList.vue

This file was deleted.

Loading

0 comments on commit 5436e18

Please sign in to comment.