From f13595fad3dc4b78124cfcadebcc49c55efac0be Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Tue, 14 Nov 2023 17:32:01 +0100 Subject: [PATCH] Move image styles from componets to base. --- assets/sass/_zen.scss | 75 ------------------- assets/sass/base/_base.scss | 1 + .../_image.scss => base/images/_images.scss} | 6 ++ assets/sass/styles.scss | 1 - 4 files changed, 7 insertions(+), 76 deletions(-) rename assets/sass/{components/image/_image.scss => base/images/_images.scss} (95%) diff --git a/assets/sass/_zen.scss b/assets/sass/_zen.scss index bfd2daa..fd4ee93 100644 --- a/assets/sass/_zen.scss +++ b/assets/sass/_zen.scss @@ -97,81 +97,6 @@ article { text-align: end; } -// Figure and image. - -figure, -img { - &.image { - --padding: .75rem; - - @include respond-to(s) { - &.center { - margin-inline: auto; - } - - &.left { - padding-inline-end: var(--padding); - padding-block-end: var(--padding); - margin: 0; - float: left; - clear: both; - } - - &.right { - padding-inline-start: var(--padding); - padding-block-end: var(--padding); - margin: 0; - float: right; - clear: both; - } - } - } -} - -figure { - &.image { - --padding: .75rem; - - figcaption { - padding-block-start: var(--padding); - - @include respond-to(s) { - display: table-caption; - caption-side: bottom; - padding-block-start: 0; - } - - p { - margin: 0; - } - } - - @include respond-to(s) { - display: table; - - &.left { - figcaption { - padding-inline-end: var(--padding); - padding-block-end: var(--padding); - } - } - - &.right { - figcaption { - padding-inline-start: var(--padding); - padding-block-end: var(--padding); - } - } - } - } - - &.podcast { - audio { - width: 95%; - } - } -} - // Navigation .main-menu { diff --git a/assets/sass/base/_base.scss b/assets/sass/base/_base.scss index e5b9f29..0b863c5 100644 --- a/assets/sass/base/_base.scss +++ b/assets/sass/base/_base.scss @@ -5,5 +5,6 @@ @import 'forms/forms'; @import 'grouping/grouping'; @import 'headings/headings'; +@import 'images/images'; @import 'links/links'; @import 'tables/tables'; diff --git a/assets/sass/components/image/_image.scss b/assets/sass/base/images/_images.scss similarity index 95% rename from assets/sass/components/image/_image.scss rename to assets/sass/base/images/_images.scss index 9e71a77..d06a3fd 100644 --- a/assets/sass/components/image/_image.scss +++ b/assets/sass/base/images/_images.scss @@ -65,4 +65,10 @@ figure { } } } + + &.podcast { + audio { + width: 95%; + } + } } diff --git a/assets/sass/styles.scss b/assets/sass/styles.scss index 3432310..2bbce84 100644 --- a/assets/sass/styles.scss +++ b/assets/sass/styles.scss @@ -48,7 +48,6 @@ @import 'components/hidden/hidden'; @import 'components/highlight-mark/highlight-mark'; @import 'components/icon-inline/icon-inline'; -@import 'components/image/image'; @import 'components/language-selector/language-selector'; @import 'components/list-straight-left/list-straight-left'; @import 'components/messages/messages';