From 0b939884508ef14691c8f0abcaf55c3c73ef8b03 Mon Sep 17 00:00:00 2001 From: Lucy Cifferello <12953208+elvece@users.noreply.github.com> Date: Fri, 5 Apr 2024 09:26:32 -0400 Subject: [PATCH] feedback fixes --- .../src/components/menu/menu.component.scss | 1 + .../src/pages/list/item/item.component.html | 2 +- .../src/pages/list/item/item.component.scss | 6 +-- .../src/pages/list/item/item.module.ts | 4 +- .../release-notes.component.scss | 4 +- .../src/pages/show/about/about.component.html | 12 +---- .../src/pages/show/about/about.component.scss | 19 +------ .../src/pages/show/hero/hero.component.ts | 18 ++++--- .../components/ticker/ticker.component.scss | 1 + .../src/components/ticker/ticker.component.ts | 1 - web/projects/shared/styles/shared.scss | 12 ++--- .../components/controls.component.ts | 20 +++---- .../components/notification.component.ts | 1 + .../marketplace/components/tile.component.ts | 5 ++ .../marketplace/marketplace.component.ts | 5 +- .../marketplace/modals/preview.component.ts | 54 ++++++++++++------- 16 files changed, 80 insertions(+), 85 deletions(-) diff --git a/web/projects/marketplace/src/components/menu/menu.component.scss b/web/projects/marketplace/src/components/menu/menu.component.scss index 9a60cc953..3730d65df 100644 --- a/web/projects/marketplace/src/components/menu/menu.component.scss +++ b/web/projects/marketplace/src/components/menu/menu.component.scss @@ -65,6 +65,7 @@ header { color: rgb(244 244 245); text-align: center; margin-bottom: 0.75rem; + pointer-events: none; } } diff --git a/web/projects/marketplace/src/pages/list/item/item.component.html b/web/projects/marketplace/src/pages/list/item/item.component.html index 3b07610df..eb88b4ee8 100644 --- a/web/projects/marketplace/src/pages/list/item/item.component.html +++ b/web/projects/marketplace/src/pages/list/item/item.component.html @@ -12,7 +12,7 @@ alt="{{ pkg.manifest.title }} Icon" />
- + {{ pkg.manifest.title }} diff --git a/web/projects/marketplace/src/pages/list/item/item.component.scss b/web/projects/marketplace/src/pages/list/item/item.component.scss index 445bef2c9..8c9c137c6 100644 --- a/web/projects/marketplace/src/pages/list/item/item.component.scss +++ b/web/projects/marketplace/src/pages/list/item/item.component.scss @@ -66,14 +66,11 @@ mix-blend-mode: plus-lighter; &-title { + display: inline-block; font-size: 1.5rem; line-height: 2rem; margin-bottom: 0.25rem; font-weight: 400; - overflow: hidden; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; } &-description { @@ -85,5 +82,6 @@ display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; + pointer-events: none; } } diff --git a/web/projects/marketplace/src/pages/list/item/item.module.ts b/web/projects/marketplace/src/pages/list/item/item.module.ts index c466ac2af..1a11b7f77 100644 --- a/web/projects/marketplace/src/pages/list/item/item.module.ts +++ b/web/projects/marketplace/src/pages/list/item/item.module.ts @@ -1,12 +1,12 @@ import { CommonModule } from '@angular/common' import { NgModule } from '@angular/core' import { RouterModule } from '@angular/router' -import { SharedPipesModule } from '@start9labs/shared' +import { SharedPipesModule, TickerModule } from '@start9labs/shared' import { ItemComponent } from './item.component' @NgModule({ declarations: [ItemComponent], exports: [ItemComponent], - imports: [CommonModule, RouterModule, SharedPipesModule], + imports: [CommonModule, RouterModule, SharedPipesModule, TickerModule], }) export class ItemModule {} diff --git a/web/projects/marketplace/src/pages/release-notes/release-notes.component.scss b/web/projects/marketplace/src/pages/release-notes/release-notes.component.scss index b923967fb..8851bb5b3 100644 --- a/web/projects/marketplace/src/pages/release-notes/release-notes.component.scss +++ b/web/projects/marketplace/src/pages/release-notes/release-notes.component.scss @@ -19,12 +19,14 @@ h3 { font-size: 1.2rem; margin-bottom: 1.25rem; + pointer-events: none; } } - + &-notes { flex-wrap: wrap; margin-top: 0.25rem; + pointer-events: none; } button { diff --git a/web/projects/marketplace/src/pages/show/about/about.component.html b/web/projects/marketplace/src/pages/show/about/about.component.html index 170ca7f37..6761e3194 100644 --- a/web/projects/marketplace/src/pages/show/about/about.component.html +++ b/web/projects/marketplace/src/pages/show/about/about.component.html @@ -4,16 +4,6 @@

{{ pkg.manifest.description.long }}

- -
-

Intended to replace:

- -
- +
diff --git a/web/projects/marketplace/src/pages/show/about/about.component.scss b/web/projects/marketplace/src/pages/show/about/about.component.scss index 498f59b83..ff4d7fcfd 100644 --- a/web/projects/marketplace/src/pages/show/about/about.component.scss +++ b/web/projects/marketplace/src/pages/show/about/about.component.scss @@ -14,23 +14,6 @@ font-size: 1rem; line-height: 1.5rem; margin-bottom: 0.75rem; + pointer-events: none; } -} - -.tag-margin-full { - margin-left: 0.375rem; - margin-top: 0.5rem; -} - -.tag-margin-empty { - margin-top: 0.5rem; -} - -.replaces { - margin: 1.5rem 0 1rem 0; - font-family: 'Montserrat'; - font-size: 0.75rem; - font-weight: 300; - letter-spacing: .06rem; - text-transform: uppercase; } \ No newline at end of file diff --git a/web/projects/marketplace/src/pages/show/hero/hero.component.ts b/web/projects/marketplace/src/pages/show/hero/hero.component.ts index ac6afc0cf..c9141ae16 100644 --- a/web/projects/marketplace/src/pages/show/hero/hero.component.ts +++ b/web/projects/marketplace/src/pages/show/hero/hero.component.ts @@ -1,6 +1,6 @@ import { CommonModule } from '@angular/common' import { ChangeDetectionStrategy, Component, Input } from '@angular/core' -import { SharedPipesModule } from '@start9labs/shared' +import { SharedPipesModule, TickerModule } from '@start9labs/shared' import { MarketplacePkg } from '../../../types' @Component({ @@ -24,7 +24,7 @@ import { MarketplacePkg } from '../../../types'
-

+

{{ pkg.manifest.title }}

@@ -63,6 +63,7 @@ import { MarketplacePkg } from '../../../types' @media (min-width: 376px) { min-height: 26vh; } + @media (min-width: 768px) { min-height: 14rem; } @@ -87,14 +88,15 @@ import { MarketplacePkg } from '../../../types' mix-blend-mode: plus-lighter; z-index: 1; + @media (min-width: 768px) { + max-width: 22rem; + } + h2 { font-size: 2rem; line-height: 3rem; font-weight: 400; - overflow: hidden; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 1; + display: inline-block; margin-left: -1px; } @@ -102,12 +104,14 @@ import { MarketplacePkg } from '../../../types' font-size: 1.1rem; font-weight: 400; margin-bottom: 1rem; + pointer-events: none; } p { font-size: 1rem; line-height: 1.5rem; font-weight: 300; + pointer-events: none; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; @@ -153,7 +157,7 @@ import { MarketplacePkg } from '../../../types' ], changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, - imports: [CommonModule, SharedPipesModule], + imports: [CommonModule, SharedPipesModule, TickerModule], }) export class MarketplacePackageHeroComponent { @Input({ required: true }) diff --git a/web/projects/shared/src/components/ticker/ticker.component.scss b/web/projects/shared/src/components/ticker/ticker.component.scss index 0c1fbd505..7944cb37e 100644 --- a/web/projects/shared/src/components/ticker/ticker.component.scss +++ b/web/projects/shared/src/components/ticker/ticker.component.scss @@ -8,5 +8,6 @@ &:hover { text-indent: var(--indent, 0); text-overflow: clip; + cursor: all-scroll; } } diff --git a/web/projects/shared/src/components/ticker/ticker.component.ts b/web/projects/shared/src/components/ticker/ticker.component.ts index f330e0be1..84326cc25 100644 --- a/web/projects/shared/src/components/ticker/ticker.component.ts +++ b/web/projects/shared/src/components/ticker/ticker.component.ts @@ -21,7 +21,6 @@ export class TickerComponent { @HostListener('mouseenter') onMouseEnter() { const { scrollWidth, clientWidth } = this.elementRef.nativeElement - this.indent = Math.ceil(clientWidth - scrollWidth) } } diff --git a/web/projects/shared/styles/shared.scss b/web/projects/shared/styles/shared.scss index c8b8d4bf8..d5ad4716b 100644 --- a/web/projects/shared/styles/shared.scss +++ b/web/projects/shared/styles/shared.scss @@ -319,7 +319,7 @@ ion-modal { a { cursor: pointer; - color: aqua; + color: inherit; text-decoration: none; } @@ -334,7 +334,7 @@ a { .background-border { border-radius: 0.75rem; background-image: linear-gradient( - to bottom left, + to top left, rgb(161 161 170 / 0.75), #52525b ); @@ -366,6 +366,7 @@ a { text-transform: uppercase; letter-spacing: .06rem; margin-bottom: 1rem; + pointer-events: none; } .buttons { @@ -376,11 +377,6 @@ a { } } -a { - color: inherit; - text-decoration: inherit; -} - h1, h2, h3, @@ -389,4 +385,4 @@ h5, h6, hr { margin: 0; -} +} \ No newline at end of file diff --git a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts index bdba855d7..ecfbaa98e 100644 --- a/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts +++ b/web/projects/ui/src/app/apps/portal/routes/system/marketplace/components/controls.component.ts @@ -37,14 +37,6 @@ import { ToManifestPipe } from 'src/app/apps/portal/pipes/to-manifest' selector: 'marketplace-controls', template: ` @if (localPkg) { - @if ( localPkg.stateInfo.state === 'installed' && (localPkg | toManifest); as localManifest @@ -54,7 +46,7 @@ import { ToManifestPipe } from 'src/app/apps/portal/pipes/to-manifest' } @else {