Skip to content

Commit

Permalink
Merge pull request #75 from nih-sparc/latest-review-changes
Browse files Browse the repository at this point in the history
latest round of review changes
  • Loading branch information
egauzens authored Jan 28, 2022
2 parents 47323ef + b3b4be1 commit f4eda45
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nih-sparc/sparc-design-system-components",
"version": "0.21.0",
"version": "0.22.0",
"private": false,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ export const Primary = () => createDemo({
description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing",
image: "https://via.placeholder.com/736",
metadata: [{
title: 'NIH Award',
title: 'NIH AWARD',
value: '000000000000'
},
{
title: 'Principal Investigator',
title: 'PRINCIPAL INVESTIGATOR',
value: 'Fynn Blackwell'
},
{
title: 'Institution',
title: 'INSTITUTION',
value: 'University of California Los Angeles'
}
]
Expand Down
4 changes: 2 additions & 2 deletions src/components/EventCard/src/EventCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
</h3>
<div class="upcoming-event__detail">
<svgicon name="calendar" height="16" width="16" />
<p>{{ getDateRange(startDate, endDate) }}</p>
<div class="body1">{{ getDateRange(startDate, endDate) }}</div>
</div>
<div v-if="location" class="upcoming-event__detail">
<svgicon name="map" height="16" width="16" />
<p>{{ location }}</p>
<div class="body1">{{ location }}</div>
</div>
</div>
</template>
Expand Down
4 changes: 2 additions & 2 deletions src/components/ListCard/src/ListCardItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
</el-col>
<el-col :xs="image === undefined ? 24 : 20" :sm="image === undefined ? 24 : 21" :md="image === undefined ? 24 : 22" :lg="image === undefined ? 24 : 22">
<div class="list-card-content">
<h3 class="mt-0">
<div class="body1 mt-0">
<a
:href="url"
:target="openInNewTab ? '_self' : '_blank'"
>
{{ title }}
</a>
</h3>
</div>
<div v-if="image !== undefined">
<p class="list-item__date spacing">
{{ formattedDate }}
Expand Down
1 change: 1 addition & 0 deletions src/components/Pagination/src/Pagination.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default {
.el-pager li {
min-width: 0;
margin: 0 .5em;
font-size: 14px;
}
}
</style>
4 changes: 2 additions & 2 deletions src/components/SparcCheckbox/src/SparcCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ export default {
}
}
}
&.is-focus:not(.is-checked) {
&:not(.is-checked) {
.el-checkbox__inner {
border-color: $lineColor1;
border-color: $lightGrey;
}
}
}
Expand Down
5 changes: 5 additions & 0 deletions src/components/SparcRadio/src/SparcRadio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ export default {
}
}
}
&:not(.is-checked) {
.el-radio__inner {
border-color: $lightGrey;
}
}
}
.el-radio {
Expand Down

0 comments on commit f4eda45

Please sign in to comment.