diff --git a/package.json b/package.json index 15f1c7b9..bfb2cb93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@nih-sparc/sparc-design-system-components", - "version": "0.17.0", + "version": "0.18.0", "private": false, "scripts": { "serve": "vue-cli-service serve", diff --git a/src/assets/_base.scss b/src/assets/_base.scss index b46c3a4d..ae234e25 100644 --- a/src/assets/_base.scss +++ b/src/assets/_base.scss @@ -1,95 +1,209 @@ @import './_variables'; body { - background-color: #F7FAFF; - font-family: $font-family; - line-height: 1.5rem; - margin: 0; + font-family:$font-family; + font-size:1em; + line-height:1.5rem; + font-weight:400; + color:$grey; + margin:0; } -h1 { - font-size: 2em; - margin: 0; - line-height: 2.75rem; - padding: 0; +.heading1 { + font-size:2em; + font-weight:500; + line-height:2.75rem; + color:$grey; } -h2 { - font-size: 1.5em; - line-height: 2.25rem; - margin: 0 0 1rem; - padding: 0; +.heading2 { + font-size:1.5em; + font-weight:500; + line-height:2.25rem; + color:$grey; } -h3, h4 { - font-size: 1em; - line-height: 1.875rem; - margin: 0 0 0.5rem; - padding: 0; +.heading3 { + font-size:1em; + font-weight:500; + line-height:1.875rem; + color:$grey; } -h5, h6 { - font-size: 1em; - font-weight: normal; - line-height: 1.75rem; - margin: 0 0 0.5rem; - padding: 0; +.nav1 { + font-size:1em; + font-weight:500; + line-height:2rem; + color:$darkBlue; } -a { - color: $app-primary-color; - &:not(.underline) { - text-decoration: none; - } - &:hover, - &:focus { - text-decoration: underline; - } +.nav2 { + font-size:.875em; + font-weight:500; + line-height:2rem; + color:$darkBlue; } -p { - margin: 0 0 1rem; +.nav3 { + font-size:.875em; + font-weight:500; + line-height:16px; + color:$darkBlue; } -hr { - margin: 0 0 1rem; +.nav4 { + font-size:.875em; + font-weight:500; + line-height:1rem; + color:$darkBlue; } -input { - color: $input-text; - font-family: $font-family; - font-size: inherit; +.nav5 { + font-size:.75em;; + font-weight:400; + line-height:1.5rem; + color:$cochlear; } -.btn-link { - display: inline-block; - text-decoration: none;; +.nav6 { + font-size:.75em;; + line-height:1.5rem; + font-weight:400; + color:$darkBlue; } -.nav1 { - font-size:16px; - line-height:32px; +.body1 { + font-size:1em; + line-height:1.5rem; + font-weight:400; + color:$grey; +} + +.body2 { + font-size:1em; + line-height:1.5rem; + font-weight:400; + color:$cochlear; +} + +.body4 { + font-size:.875em; + line-height:1.25rem; + font-weight:400; + color:$lightGrey; +} + +.label1 { + font-size:.875em; + line-height:1.5rem; + font-weight:400; + color:$grey; +} + +.label2 { + font-size:.875em; + line-height:1.5rem; font-weight:500; - color: $darkBlue; + color:$grey; } -.nav2 { - font-size:14px; - line-height:32px; +.label3 { + font-size:.875em; + line-height:1.5rem; font-weight:500; - color: $darkBlue; + color:$darkBlue; } -.nav5 { - font-size:12px; - line-height:24px; +.label4 { + font-size:1em; + line-height:1.5rem; + font-weight:600; + color:$grey; +} + +.tab1 { + font-size:1.125em;; + line-height:1.5rem; + font-weight:500; + color:$purple; +} + +.tab2 { + font-size:1.125em;; + line-height:1.5rem; font-weight:400; - color: $cochlear; + color:$grey; } -.nav6 { - font-size:12px; - line-height:24px; +.tab3 { + font-size:1.125em;; + line-height:1.5rem; + font-weight:500; + color:$cochlear; + background-color:$darkBlue; +} + +.tab4 { + font-size:1.125em;; + line-height:1.5rem; font-weight:400; - color: $darkBlue; + color:$cochlear; + background-color:$darkBlue; +} + +.tab5 { + font-size:1em; + line-height:1.5rem; + font-weight:500; + color:$purple; +} + +.link1 { + font-size:1em; + line-height:1.5rem; + font-weight:500; + color:$purple; +} + +.link1:hover { + text-decoration:underline; +} + +.highlighted { + background-color:#D8D8D8; +} + +.link2 { + font-size:1em; + line-height:1.5rem; + font-weight:400; + color:$purple; +} + +.link2:hover { + text-decoration:underline; +} + +.link3 { + font-size:1em; + line-height:1.5rem; + font-weight:400; + color:$grey; +} + +.link3:hover { + text-decoration:underline; +} + +.link4 { + font-size:1.5em; + line-height:2rem; + font-weight:400; + color:$cochlear; + text-decoration:underline; +} + +.link4:hover { + color:$lineColor1; + text-decoration:underline; } diff --git a/src/assets/components/_table.scss b/src/assets/components/_table.scss index ab468f93..a08abae2 100644 --- a/src/assets/components/_table.scss +++ b/src/assets/components/_table.scss @@ -18,6 +18,9 @@ padding-right: 1rem; word-break: normal } + a { + color: $purple; + } } .table-wrap { diff --git a/src/components/DropdownMultiselect/src/DropdownLabel.vue b/src/components/DropdownMultiselect/src/DropdownLabel.vue index fbe58564..39143fe9 100644 --- a/src/components/DropdownMultiselect/src/DropdownLabel.vue +++ b/src/components/DropdownMultiselect/src/DropdownLabel.vue @@ -98,6 +98,7 @@ h2 { display: flex; justify-content: space-between; margin-bottom: 0; + margin-top: 0; padding: 0.5rem 1rem; font-weight: 500; align-items: center; diff --git a/src/components/ListCard/src/ListCardItem.vue b/src/components/ListCard/src/ListCardItem.vue index 72c9db0f..62574745 100644 --- a/src/components/ListCard/src/ListCardItem.vue +++ b/src/components/ListCard/src/ListCardItem.vue @@ -9,7 +9,7 @@
-

+

{ @close-download-dialog="dialogVisible = false" >
-

Direct download

+

Direct download

You can download the raw files and metadata directly to your computer as a zip archive free of charge.

@@ -30,7 +30,7 @@ export const Primary = () => {

-

Download from AWS

+

Download from AWS

Raw files and metadata are stored in an AWS S3 Requester Pays bucket. You can learn more about downloading data from AWS on our