diff --git a/packages/fe/assets/scss/main.scss b/packages/fe/assets/scss/main.scss
index cdebed5d..4ea193f5 100644
--- a/packages/fe/assets/scss/main.scss
+++ b/packages/fe/assets/scss/main.scss
@@ -220,6 +220,7 @@ h6, .h6 {
line-height: 1.3;
font-weight: 500;
text-transform: none;
+ margin-bottom: toRem(18);
}
h1, .h1 {
@@ -319,31 +320,6 @@ p, .p1 {
}
.markdown {
- h1, h2, h3, p, ul, ol, pre {
- + h2, + h3 {
- margin-top: 3.75rem;
- }
- }
- h1, h2, h3 {
- &:not(:last-child) {
- margin-bottom: 1rem;
- }
- + ul, + ol {
- margin-top: 2rem;
- }
- }
- p {
- &:not(:last-child) {
- margin-bottom: 1rem;
- }
- }
- a {
- color: darkorange;
- font-weight: 600;
- &:hover {
- text-decoration: underline;
- }
- }
pre,
code {
font-family: $font_Code;
diff --git a/packages/fe/assets/scss/variables.scss b/packages/fe/assets/scss/variables.scss
index da3dae79..2a3683ce 100644
--- a/packages/fe/assets/scss/variables.scss
+++ b/packages/fe/assets/scss/variables.scss
@@ -28,6 +28,10 @@ $athensGray: #E7E9ED;
$capeCod: #3C4748;
$grayNurse2: #E0E7E0;
$dodgerBlue: #3DA2FF;
+$blue: #001AFF;
+$neptune: #74C3B5;
+$iron: #DDDFE3;
+
// ----------------------------------------------------------------- Breakpoints
$breakpoint_Tiny: 25.9375rem; // 415px
@@ -57,7 +61,7 @@ $duration: 300ms;
width: 2.1875rem;
height: 2.1875rem;
border-radius: 50%;
- border: solid 1px #DDDFE3;
+ border: solid 1px $iron;
display: flex;
flex-direction: column;
justify-content: center;
@@ -102,7 +106,7 @@ $duration: 300ms;
}
@mixin focusBoxShadow {
- box-shadow: 0 0 0 5px rgba(0, 123, 255, 0.5);
+ box-shadow: 0 0 0 5px rgba($dodgerBlue, 0.5) !important;
}
@mixin focusBoxShadowSmall {
@@ -249,6 +253,13 @@ $duration: 300ms;
@return math.div($px-vw * 100vw, $base-vw);
}
+@mixin truncate($rowCount) {
+ display: -webkit-box;
+ -webkit-line-clamp: $rowCount;
+ -webkit-box-orient: vertical;
+ overflow: hidden;
+}
+
// ------------------------------------------------------------------- Animation
@mixin animation($animate...) {
$max: length($animate);
diff --git a/packages/fe/components/block-builder.vue b/packages/fe/components/block-builder.vue
index ca408819..37965d70 100644
--- a/packages/fe/components/block-builder.vue
+++ b/packages/fe/components/block-builder.vue
@@ -70,6 +70,7 @@ import TextBlock from '@/components/blocks/text-block'
import ImageBlock from '@/components/blocks/image-block'
import MarkdownBlock from '@/components/blocks/markdown-block'
import CategorySliderBlock from '@/components/blocks/category-slider-block'
+import CardListBlock from '@/components/blocks/card-list-block'
import CategoryTicker from '@/components/category-ticker'
import BlockBuilder from '@/components/block-builder'
@@ -83,7 +84,8 @@ export default {
BlockBuilder,
MarkdownBlock,
CategorySliderBlock,
- CategoryTicker
+ CategoryTicker,
+ CardListBlock
},
props: {
diff --git a/packages/fe/components/blocks/card-list-block.vue b/packages/fe/components/blocks/card-list-block.vue
new file mode 100644
index 00000000..666990b4
--- /dev/null
+++ b/packages/fe/components/blocks/card-list-block.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
diff --git a/packages/fe/components/blocks/category-slider-block.vue b/packages/fe/components/blocks/category-slider-block.vue
index 491c7031..c96f0c04 100644
--- a/packages/fe/components/blocks/category-slider-block.vue
+++ b/packages/fe/components/blocks/category-slider-block.vue
@@ -45,9 +45,9 @@
:style="{ 'background-image': `url('/images/categories/${slide.label.replaceAll(' ', '-')}.jpg')` }">
-
+
+
diff --git a/packages/fe/components/breadcrumbs.vue b/packages/fe/components/breadcrumbs.vue
index b23f47a5..8c59d942 100644
--- a/packages/fe/components/breadcrumbs.vue
+++ b/packages/fe/components/breadcrumbs.vue
@@ -7,7 +7,6 @@
v-if="link.url"
:key="`link-${index}`"
:button="link"
- tabindex="0"
class="breadcrumb link">
@@ -46,7 +45,8 @@ export default {
data () {
return {
- links: false
+ links: false,
+ hidden: false
}
},
@@ -60,9 +60,6 @@ export default {
return this.siteContent.general.breadcrumbs_mapping
}
return false
- },
- hidden () {
- return this.links.length < 2
}
},
@@ -90,9 +87,11 @@ export default {
url: '/',
text: breadcrumbs.index
}]
+ this.hidden = true
items.forEach((item, i) => {
const routeName = items.slice(0, i + 1).join('-')
if (breadcrumbs.hasOwnProperty(routeName)) {
+ this.hidden = false
const url = `/${items.slice(0, i + 1).join('/')}`
if (i !== items.length - 1 && routeName !== 'dataset') {
links.push({ type: 'default', url, text: breadcrumbs[routeName] })
@@ -101,6 +100,7 @@ export default {
}
} else {
if (this.dataset) {
+ // single dataset
links.push({ text: this.dataset.name })
}
}
@@ -130,11 +130,6 @@ export default {
.breadcrumb {
white-space: nowrap;
- &.link {
- &:hover {
- text-decoration: underline;
- }
- }
}
.link,
diff --git a/packages/fe/components/buttons/button-filters.vue b/packages/fe/components/buttons/button-filters.vue
index e547d581..d7d9a7eb 100644
--- a/packages/fe/components/buttons/button-filters.vue
+++ b/packages/fe/components/buttons/button-filters.vue
@@ -9,8 +9,8 @@
-
-
+
+
@@ -56,7 +56,7 @@ export default {
diff --git a/packages/fe/components/buttons/button-nav.vue b/packages/fe/components/buttons/button-nav.vue
index 69d8fc29..0654c34a 100644
--- a/packages/fe/components/buttons/button-nav.vue
+++ b/packages/fe/components/buttons/button-nav.vue
@@ -1,7 +1,6 @@