diff --git a/assets/scss/blocks/copy.scss b/assets/scss/blocks/copy.scss index 4c55ca21c..e3441d4f8 100644 --- a/assets/scss/blocks/copy.scss +++ b/assets/scss/blocks/copy.scss @@ -5,6 +5,7 @@ @include type-style('expressive-heading-05'); margin-bottom: $layout-03; color: $cool-gray-80; + max-width: 8 * $column-size-large; @include mq($from: medium, $until: large) { @include type-style('expressive-heading-03'); diff --git a/assets/scss/layout.scss b/assets/scss/layout.scss index eec7e7276..347c48052 100644 --- a/assets/scss/layout.scss +++ b/assets/scss/layout.scss @@ -42,7 +42,7 @@ body { } &_theme_light { - background-color: $ui-background; + background-color: $white; } &_theme_dark { diff --git a/components/events/EventCard.vue b/components/events/EventCard.vue index c7f4a8ce2..1a6bdec53 100644 --- a/components/events/EventCard.vue +++ b/components/events/EventCard.vue @@ -6,16 +6,25 @@ :tags="types" :to="to" cta-label="Join the event" + :segment="segment" + :vertical-layout="verticalLayout" > +
+ +
-

+

{{ location }}

-

+

+

+ + {{ institution }} +

@@ -23,15 +32,19 @@ @@ -45,14 +58,19 @@ export default class EventCard extends Vue { margin-bottom: $layout-01; } - &__location, &__date { + &__description { + margin-bottom: $spacing-06; + } + + &__detail { @include type-style('body-long-01'); display: flex; align-items: center; - } - - &__location { margin-bottom: $spacing-03; + + &:last-child { + margin-bottom: initial; + } } &__icon { diff --git a/components/events/event/HelpfulResourcesSection.vue b/components/events/event/HelpfulResourcesSection.vue new file mode 100644 index 000000000..28f6678ac --- /dev/null +++ b/components/events/event/HelpfulResourcesSection.vue @@ -0,0 +1,46 @@ + + + + + diff --git a/components/events/seminar-series/PastSeminarSeriesSection.vue b/components/events/seminar-series/PastSeminarSeriesSection.vue new file mode 100644 index 000000000..c95da7e61 --- /dev/null +++ b/components/events/seminar-series/PastSeminarSeriesSection.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/components/events/seminar-series/SeminarSeriesDataTable.vue b/components/events/seminar-series/SeminarSeriesDataTable.vue new file mode 100644 index 000000000..8e72018d3 --- /dev/null +++ b/components/events/seminar-series/SeminarSeriesDataTable.vue @@ -0,0 +1,101 @@ + + + + + + + diff --git a/components/events/seminar-series/SeminarSeriesHeader.vue b/components/events/seminar-series/SeminarSeriesHeader.vue new file mode 100644 index 000000000..e2a76cfb7 --- /dev/null +++ b/components/events/seminar-series/SeminarSeriesHeader.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/components/events/seminar-series/UpcomingSeminarSeriesSection.vue b/components/events/seminar-series/UpcomingSeminarSeriesSection.vue new file mode 100644 index 000000000..4be3f0bd3 --- /dev/null +++ b/components/events/seminar-series/UpcomingSeminarSeriesSection.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/components/events/seminar-series/WhatIsThisEventSection.vue b/components/events/seminar-series/WhatIsThisEventSection.vue new file mode 100644 index 000000000..eaba5ad5f --- /dev/null +++ b/components/events/seminar-series/WhatIsThisEventSection.vue @@ -0,0 +1,52 @@ + + + + + diff --git a/components/layouts/PageFooter/FooterSection.vue b/components/layouts/PageFooter/FooterSection.vue index 1f5c56a46..bdc2e23ad 100644 --- a/components/layouts/PageFooter/FooterSection.vue +++ b/components/layouts/PageFooter/FooterSection.vue @@ -10,15 +10,15 @@ - + {{ element.label }} diff --git a/components/layouts/TheMenu/index.vue b/components/layouts/TheMenu/index.vue index bd3b6de29..11826094d 100644 --- a/components/layouts/TheMenu/index.vue +++ b/components/layouts/TheMenu/index.vue @@ -121,8 +121,6 @@ export default class TheMenu extends Mixins(MenuMixin) { @import '~carbon-components/scss/globals/scss/typography'; .menu { - background-color: $white; - &__main-level { --link-color: #{$gray-80}; } diff --git a/components/learn/TheCarefulExplanationForBeginners.vue b/components/learn/TheCarefulExplanationForBeginners.vue index dff842dac..c70c668c9 100644 --- a/components/learn/TheCarefulExplanationForBeginners.vue +++ b/components/learn/TheCarefulExplanationForBeginners.vue @@ -1,12 +1,7 @@