diff --git a/css/base.css b/css/base.css index 94e249f3..7833957a 100644 --- a/css/base.css +++ b/css/base.css @@ -12,7 +12,7 @@ background: var(--surface-1); color: var(--text-1); font-family: var(--font-sans); - line-height: 1.5; + line-height: var(--font-lineheight-3); } /* Headings use the serif token (Adelle). Drupal core inserts

@@ -21,7 +21,15 @@ component or utility if a specific UI surface needs the sans family. */ h1, h2, h3, h4, h5, h6 { font-family: var(--font-serif); + line-height: var(--font-lineheight-1); + margin-block: var(--size-3); } + h1 { font-size: var(--font-size-6); } + h2 { font-size: var(--font-size-5); } + h3 { font-size: var(--font-size-4); } + h4 { font-size: var(--font-size-3); } + h5 { font-size: var(--font-size-2); } + h6 { font-size: var(--font-size-1); } a { color: var(--brand); diff --git a/css/components/breadcrumb.css b/css/components/breadcrumb.css index 8ba8352b..9d1694c3 100644 --- a/css/components/breadcrumb.css +++ b/css/components/breadcrumb.css @@ -1,33 +1,50 @@ -@layer components { - /** * @file * Styles for breadcrumbs. + * + * Markup from templates/navigation/breadcrumb.html.twig: + * + * The current page is the last
  • and is not a link. */ +@layer components { -.breadcrumb { - padding-bottom: 0.5em; -} -.breadcrumb ol { - margin: 0; - padding: 0; -} -[dir="rtl"] .breadcrumb ol { - /* This is required to win over specificity of [dir="rtl"] ol */ - margin-right: 0; -} -.breadcrumb li { - display: inline; - margin: 0; - padding: 0; - list-style-type: none; -} -/* IE8 does not support :not() and :last-child. */ -.breadcrumb li::before { - content: " \BB "; -} -.breadcrumb li:first-child::before { - content: none; -} + .breadcrumb { + padding-bottom: 0.5em; + font-size: 0.875em; + color: var(--text-2); + } + .breadcrumb ol { + margin: 0; + padding: 0; + } + [dir="rtl"] .breadcrumb ol { + /* Wins over specificity of [dir="rtl"] ol. */ + margin-right: 0; + } + .breadcrumb li { + display: inline; + margin: 0; + padding: 0; + list-style-type: none; + } + .breadcrumb li::before { + margin-inline: var(--size-2); + content: "\BB"; + color: var(--text-2); + } + .breadcrumb li:first-child::before { + content: none; + } + .breadcrumb a { + color: var(--text-2); + text-decoration: none; + } + .breadcrumb a:hover { + color: var(--upei-red); + text-decoration: underline; + } + .breadcrumb li:last-child { + color: var(--text-1); + } } diff --git a/css/components/button.css b/css/components/button.css index e20abecd..ec7d8769 100644 --- a/css/components/button.css +++ b/css/components/button.css @@ -1,19 +1,92 @@ -@layer components { - /** * @file * Visual styles for buttons. + * + * Drupal applies .button — and typically .button--primary for the main + * action — automatically to ,