From c39b7705bee0dd7297b9b802113e06289c5b23a7 Mon Sep 17 00:00:00 2001 From: Franzz Date: Mon, 27 Apr 2026 23:15:24 +0200 Subject: [PATCH] Fix FA auto width --- src/components/project.vue | 2 +- src/components/projectPopup.vue | 2 +- src/components/projectPost.vue | 14 ++++++++------ src/components/projectRelTime.vue | 4 ++-- src/components/spotIcon.vue | 21 ++++++++++----------- src/components/spotIconStack.vue | 2 +- src/styles/_fa.scss | 12 +++++++----- src/styles/_page.project.feed.scss | 12 +++++------- src/styles/_page.project.panel.scss | 1 + src/styles/_page.project.settings.scss | 4 ++-- src/styles/_var.scss | 1 + 11 files changed, 39 insertions(+), 36 deletions(-) diff --git a/src/components/project.vue b/src/components/project.vue index 501679b..dc28a2d 100644 --- a/src/components/project.vue +++ b/src/components/project.vue @@ -669,7 +669,7 @@ export default { diff --git a/src/components/projectPopup.vue b/src/components/projectPopup.vue index 931270b..1171e6a 100644 --- a/src/components/projectPopup.vue +++ b/src/components/projectPopup.vue @@ -37,7 +37,7 @@ export default {

- +

diff --git a/src/components/projectPost.vue b/src/components/projectPost.vue index 6aca12a..d9cac98 100644 --- a/src/components/projectPost.vue +++ b/src/components/projectPost.vue @@ -95,9 +95,11 @@ this.hash.items = [this.hash.items[0], this.options.type, this.options.id_message]; }, openMarkerPopup() { + this.mouseOverDrill = true; if(this.map.isMarkerVisible(this.lngLat)) this.map.openMarkerPopup(this.options.id_message); }, closeMarkerPopup() { + this.mouseOverDrill = false; if(!this.popupRequested) this.map.closeMarkerPopup(); this.popupRequested = false; }, @@ -145,9 +147,9 @@

- + - +
@@ -158,15 +160,15 @@
-
+

- +

- +

- + diff --git a/src/components/projectRelTime.vue b/src/components/projectRelTime.vue index c2de024..fedce30 100644 --- a/src/components/projectRelTime.vue +++ b/src/components/projectRelTime.vue @@ -11,7 +11,7 @@ export default { offset: String, classes: String, icon: String, - iconClasses: String + margin: String, }, inject: ['lang'], computed: { @@ -23,6 +23,6 @@ export default { diff --git a/src/components/spotIcon.vue b/src/components/spotIcon.vue index 59c3e9e..c25f059 100644 --- a/src/components/spotIcon.vue +++ b/src/components/spotIcon.vue @@ -8,13 +8,12 @@ export default { }, props: { icon: String, - fixedWidth: Boolean, - rotation: [Number, String], + width: String, size: String, classes: String, title: String, text: String, - margin: Boolean, + margin: String, textClasses: String, transform: String }, @@ -23,12 +22,15 @@ export default { return [ 'spot-icon', this.icon, - ...(this.classes || '').split(/\s+/).filter(Boolean), - ...(this.margin || this.hasText ? ['push'] : []) + ...(this.classes || '').split(/\s+/), + this.margin?'margin-'+this.margin:null || this.hasText?'margin-right':null ].filter(Boolean).join(' '); }, resolvedFixedWidth() { - return this.fixedWidth || null; + return (this.width == 'fixed') || null; + }, + resolvedAutoWidth() { + return (this.width == 'auto') || null; }, hasText() { return this.text && this.text != ''; @@ -36,9 +38,6 @@ export default { iconDefinition() { return getIcon(this.icon); }, - resolvedRotation() { - return this.rotation || null; - }, resolvedSize() { return this.size || null; }, @@ -51,8 +50,8 @@ export default { diff --git a/src/components/spotIconStack.vue b/src/components/spotIconStack.vue index 00952e7..7302edd 100644 --- a/src/components/spotIconStack.vue +++ b/src/components/spotIconStack.vue @@ -27,7 +27,7 @@ export default { return this.mergeClasses('sub', this.iconSubClasses); }, iconSubTransformValue() { - return this.mergeClasses('shrink-8 up-2', this.iconSubTransform); + return this.mergeClasses('shrink-9 up-2', this.iconSubTransform); } }, methods: { diff --git a/src/styles/_fa.scss b/src/styles/_fa.scss index 32fb3e0..2062d6b 100644 --- a/src/styles/_fa.scss +++ b/src/styles/_fa.scss @@ -1,9 +1,11 @@ +@use "var"; + .spot-icon { - &.push { - margin-right: 0.3rem; + &.margin-right { + margin-right: var.$text-spacing; } - &.push-left { - margin-left: 0.3rem; + &.margin-left { + margin-left: var.$text-spacing; } -} +} \ No newline at end of file diff --git a/src/styles/_page.project.feed.scss b/src/styles/_page.project.feed.scss index d01305d..6c42aca 100644 --- a/src/styles/_page.project.feed.scss +++ b/src/styles/_page.project.feed.scss @@ -58,16 +58,17 @@ } .header { + display: flex; + align-items: center; padding: 0 var.$block-spacing; position: relative; div { - display: inline-block; font-size: 0.8em; padding: var.$elem-spacing 0px; &.index { - width: 25%; + flex: 0 0 auto; .link { padding: 0; @@ -76,7 +77,7 @@ } &.time { - width: 75%; + flex: 1 1 auto; text-align: right; font-style: italic; } @@ -158,10 +159,7 @@ color: color.$message-bg; border-radius: var.$block-radius 0 0 var.$block-radius; padding: var.$elem-spacing; - - &.push { - margin-right: 0; - } + margin-right: 0; } .temperature { diff --git a/src/styles/_page.project.panel.scss b/src/styles/_page.project.panel.scss index 4a568de..7b35c5a 100644 --- a/src/styles/_page.project.panel.scss +++ b/src/styles/_page.project.panel.scss @@ -186,6 +186,7 @@ $panel-actual-width: min($panel-width, #{$panel-width-max}); span { font-size: 1.3em; line-height: calc(var.$block-spacing / 1.3); + vertical-align: center; } } diff --git a/src/styles/_page.project.settings.scss b/src/styles/_page.project.settings.scss index a7ac1a6..1a9f476 100644 --- a/src/styles/_page.project.settings.scss +++ b/src/styles/_page.project.settings.scss @@ -56,7 +56,7 @@ background: color.$default-bg; border-radius: 0 0 3px 3px; font-size: 0.7em; - padding: 0.3rem; + padding: var.$text-spacing; text-align: center; color: color.$default; @@ -97,7 +97,7 @@ } label { - margin-left: .3rem; + margin-left: var.$text-spacing; @extend .clickable; @include common.no-text-overflow(); } diff --git a/src/styles/_var.scss b/src/styles/_var.scss index f497c93..51de454 100644 --- a/src/styles/_var.scss +++ b/src/styles/_var.scss @@ -1,5 +1,6 @@ //Feed width $elem-spacing: 0.5rem; +$text-spacing: 0.3em; $block-spacing: 1rem; $block-radius: 3px; $block-shadow: 3px;