From 928436ba3c36f96e70bfa5cf7fc798d26e945f55 Mon Sep 17 00:00:00 2001 From: razlandau Date: Tue, 12 Nov 2024 11:57:10 -0500 Subject: [PATCH 1/2] rerefactored toolbar --- src/css/breadcrumbs.css | 4 ++-- src/css/extensions/custom-dark.css | 7 ++++--- src/css/extensions/custom.css | 13 +++++++++++-- src/css/toolbar.css | 1 + src/img/heart.svg | 18 ++++++++++++++++++ src/js/vendor/custom.js | 2 +- src/partials/breadcrumbs.hbs | 4 ++-- src/partials/toolbar.hbs | 9 ++++++--- 8 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 src/img/heart.svg diff --git a/src/css/breadcrumbs.css b/src/css/breadcrumbs.css index 4102e9a..0acd829 100644 --- a/src/css/breadcrumbs.css +++ b/src/css/breadcrumbs.css @@ -1,7 +1,7 @@ .breadcrumbs { display: none; flex: 1 1; - padding: 0 0.5rem 0 0.75rem; + padding-right: 0.5rem; line-height: var(--nav-line-height); color: var(--breadcrumbs-font-color); } @@ -29,7 +29,7 @@ a + .breadcrumbs { margin: 0; } -.breadcrumbs li::after { +.breadcrumbs li::before { content: "/"; padding: 0 0.5rem; } diff --git a/src/css/extensions/custom-dark.css b/src/css/extensions/custom-dark.css index 4660ad4..2b98f1c 100644 --- a/src/css/extensions/custom-dark.css +++ b/src/css/extensions/custom-dark.css @@ -87,9 +87,10 @@ } */ .pencil { - /* - background-image: url(../img/pencil-filled.svg); - */ + fill: var(--color-athens-white); +} + +.heart { fill: var(--color-athens-white); } diff --git a/src/css/extensions/custom.css b/src/css/extensions/custom.css index ac1fbeb..bb28f09 100644 --- a/src/css/extensions/custom.css +++ b/src/css/extensions/custom.css @@ -246,8 +246,17 @@ background-repeat: no-repeat; height: 1rem; width: 1rem; + padding: 0 0.75rem; + vertical-align: text-bottom; +} + +.heart { + background-image: url(../img/heart.svg); + background-repeat: no-repeat; + height: 1rem; + width: 1rem; padding: 0 1em; - vertical-align: middle; + vertical-align: text-bottom; } .navbar-end .navbar-item .navbar-dropdown { @@ -274,7 +283,7 @@ } .edit-this-page:hover a { - color: var(--color-ultramarine-blue); + /* color: var(--color-ultramarine-blue); */ text-decoration: none; } diff --git a/src/css/toolbar.css b/src/css/toolbar.css index e52329b..4cbb0b5 100644 --- a/src/css/toolbar.css +++ b/src/css/toolbar.css @@ -66,6 +66,7 @@ @media screen and (min-width: 1024px) { .home-link { margin: calc(var(--toolbar-height) / 4); + margin-right: 0 } .edit-this-page { display: block; diff --git a/src/img/heart.svg b/src/img/heart.svg new file mode 100644 index 0000000..1f1f12b --- /dev/null +++ b/src/img/heart.svg @@ -0,0 +1,18 @@ + + + + + \ No newline at end of file diff --git a/src/js/vendor/custom.js b/src/js/vendor/custom.js index 481f0d0..e89a133 100644 --- a/src/js/vendor/custom.js +++ b/src/js/vendor/custom.js @@ -14,7 +14,7 @@ } for (var i = 0; i < images.length; i++) { - if (!(images[i].classList.contains('copy-icon') || images[i].classList.contains('pencil') || hasParentClass(images[i],'overview-box'))){ + if (!(images[i].classList.contains('copy-icon') || images[i].classList.contains('pencil') || images[i].classList.contains('heart') || hasParentClass(images[i],'overview-box'))){ images[i].setAttribute('data-zoomable', 'true') } } diff --git a/src/partials/breadcrumbs.hbs b/src/partials/breadcrumbs.hbs index 24b6fb0..8ad6e94 100644 --- a/src/partials/breadcrumbs.hbs +++ b/src/partials/breadcrumbs.hbs @@ -1,11 +1,11 @@