diff --git a/src/commonMain/resources/index.css b/src/commonMain/resources/index.css index 589bad3..b4a095e 100644 --- a/src/commonMain/resources/index.css +++ b/src/commonMain/resources/index.css @@ -147,11 +147,19 @@ button { } .experience-section { +<<<<<<< HEAD + padding-top: 24px; +======= padding-top: 40px; +>>>>>>> origin/master display: inline-flex; flex-direction: column; } +.categories + .experience-section { + padding-top: 132px; +} + .experience-list { padding-top: 24px; display: inline-flex; @@ -267,10 +275,33 @@ button { } .experience-info { - padding: 0 16px; - margin-top: auto; - white-space: pre-line; - line-height: 1.6; + list-style: none; + padding: 16px 16px 0 16px; + margin: 0; +} + +.experience-bullet { + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 8px; + padding: 3px 0; +} + +.experience-bullet p { + margin: 0; + font-size: 15px; + line-height: 1.45; +} + +.bullet-icon { + flex-shrink: 0; + width: 18px; + height: 18px; + margin-top: 3px; + background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none'%3E%3Cpath d='M12 3C7.5 3.2 4.2 6.1 3.1 10.5C2.3 13.8 3.5 17.2 6 19.5C8.8 22 12.8 22.5 16 21C19.5 19.3 21.5 15.8 21 12C20.4 7.5 16.8 3.5 12 3Z' fill='%2324A6DF' stroke='%231B8FC2' stroke-width='1' stroke-linecap='round' stroke-linejoin='round'/%3E%3Cpath d='M8.5 12.5L11 15L16 9' stroke='white' stroke-width='2.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E"); + background-size: contain; + background-repeat: no-repeat; } .date-range { @@ -458,7 +489,11 @@ button { } .content { +<<<<<<< HEAD + padding: 0 3vw; +======= padding: 0 20px; +>>>>>>> origin/master display: flex; flex-direction: column; } diff --git a/src/jsMain/kotlin/codes/miley/frontend/widget/ExperienceCell.kt b/src/jsMain/kotlin/codes/miley/frontend/widget/ExperienceCell.kt index 1eecd4f..ca63de8 100644 --- a/src/jsMain/kotlin/codes/miley/frontend/widget/ExperienceCell.kt +++ b/src/jsMain/kotlin/codes/miley/frontend/widget/ExperienceCell.kt @@ -4,6 +4,7 @@ import codes.miley.model.Experience import dev.fritz2.core.RenderContext import dev.fritz2.core.src + private val Experience.dateRanges: List get() = timespans.map { (startYear, endYear) -> when { @@ -64,7 +65,14 @@ fun RenderContext.experienceCell( experienceGallery(media) } - p("experience-info") { +summary } + ul("experience-info") { + summary.split("•").map { it.trim() }.filter { it.isNotBlank() }.forEach { point -> + li("experience-bullet") { + span("bullet-icon") { } + p { +point } + } + } + } } } }