bfg-common 1.6.22 → 1.6.24

package/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/TimeFormat.vue

@@ -12,13 +12,12 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 import type { UI_I_RadioItem } from '~/components/common/layout/theHeader/userMenu/lib/models/interfaces'
 import type { UI_T_TimeValue } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/models/types'
 import { formatOptionsFunc } from '~/components/common/layout/theHeader/userMenu/modals/preferences/timeFormat/lib/config/formatOptions'
-import type { UI_T_Project } from '~/lib/models/types'
 
 const timeFormat = defineModel<UI_T_TimeValue>('timeFormat')
 const props = defineProps<{
-  project: UI_T_Project
   newView: boolean
 }>()
+
 const currentComponent = computed(() =>
   props.newView
     ? defineAsyncComponent(() => import('./New.vue'))
@@ -29,14 +28,11 @@ const localization = computed<UI_I_Localization>(() => useLocal())
 
 const config = useRuntimeConfig()
 
-/* TODO SC-2104 */
 const description = computed<string>(() =>
-  props.project === 'sphere'
-    ? localization.value.common.timeFormatDesc1
-    : localization.value.common.timeFormatDesc.replaceAll(
-        '{trademark}',
-        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-      )
+  localization.value.common.timeFormatDesc.replaceAll(
+    '{trademark}',
+    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+  )
 )
 
 const formatOptions = readonly<UI_I_RadioItem[]>(

package/components/common/layout/theHeader/userMenu/modals/preferences/view/Old.vue

@@ -15,9 +15,13 @@
       />
     </div>
 
-    <div class="flex-align-center second-description">
+    <div class="description second-description">
+      {{ localization.myPreferences.showNotificationDescription }}
+    </div>
+
+    <div class="flex-align-center">
       <label for="show-notification">{{
-        localization.myPreferences.showNotificationDescription
+        localization.myPreferences.showNotification
       }}</label>
       <input
         id="show-notification"
@@ -59,10 +63,10 @@ window.tools = new Proxy(
 <style lang="scss" scoped>
 .description {
   margin-bottom: 10px;
-}
 
-.second-description {
-  margin-top: 20px;
+  &.second-description {
+    margin-top: 20px;
+  }
 }
 
 label {

package/components/common/layout/theHeader/userMenu/modals/preferences/view/View.vue

@@ -30,13 +30,10 @@ const currentComponent = computed(() =>
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-/* TODO SC-2104 */
-const description = computed<string>(() =>
-  props.project === 'sphere'
-    ? localization.value.common.viewDesc1
-    : localization.value.common.viewDesc.replaceAll(
-        '{trademark}',
-        String(config.public[`TRADEMARK_${useEnvLanguage()}`])
-      )
-)
+const description = computed<string>(() => {
+  return localization.value.common.viewDesc.replaceAll(
+    '{trademark}',
+    String(config.public[`TRADEMARK_${useEnvLanguage()}`])
+  )
+})
 </script>

package/components/common/mainNavigationPanel/MainNavigationPanelNew.vue

@@ -143,7 +143,7 @@ const localization = computed<UI_I_Localization>(() => useLocal())
   &.pinned {
     .nav-context {
       position: relative;
-      z-index: calc(var(--z-fixed) + 2);
+      z-index: calc(var(--z-default) + 1);
     }
   }
   &:not(.pinned) {
@@ -177,8 +177,6 @@ const localization = computed<UI_I_Localization>(() => useLocal())
       }
     }
     &:not(.collapsed) {
-      min-width: 240px;
-
       :deep(.tooltip-container-hover) {
         display: none;
       }