diff --git a/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.html b/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.html index 33c66c87c..5c3f6ee22 100644 --- a/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.html +++ b/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.html @@ -23,32 +23,14 @@ - - -
-
- +
+
+
-
- - diff --git a/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.scss b/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.scss index d73a4655c..ec37070f6 100644 --- a/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.scss +++ b/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.scss @@ -52,68 +52,32 @@ margin: 9px; } -.launch-button-opaque { - position: absolute; - z-index: 1; - --border-radius: 100px; - width: 42px; - height: 42px; - right: -5px; - top: -5px; - --background: #2b2a2b //linear-gradient(120deg, rgb(35, 178, 251, 0.7), transparent); - box-shadow: 0 0 4px 2px rgb(91 200 255); - border-radius: 100px; -} - -.launch-button-transparent { - // position: absolute; - // z-index: 1; - // --border-radius: 100px; - // width: 42px; - // height: 42px; - // right: -5px; - // top: -5px; - // --background: linear-gradient(200deg, rgb(35, 178, 251, 1), rgb(35, 178, 251, 0.25)); - position: absolute; - /* z-index: 1; */ - --border-radius: 0px; - width: 45px; - /* height: 42px; */ - height: 100%; - right: -5px; - --box-shadow: none; - /* top: -5px; */ - border-style: outset; - border-width: 0px 0px 0px 0px; - border-color: #2a2a2a; - margin: 0px; - --background: linear-gradient(200deg, rgb(35, 178, 251, 1), rgb(35, 178, 251, 0.25)); -} - .launch-button-triangle { - // position: absolute; - // --border-radius: 0px; width: 0px; height: 0px; right: 0px; - // --box-shadow: none; - /* top: -5px; */ - // border-style: outset; - // border-width: 0px 0px 0px 0px; - // border-color: #2a2a2a; margin: 0px; - // --background: linear-gradient(200deg, rgb(35, 178, 251, 1), rgb(35, 178, 251, 0.25)); + border-style: solid; - border-width: 0 72px 73px 0; - border-color: blue; - /* border-width: 40px 80px 40px 0; */ - border-color: transparent #007bff transparent transparent; + border-width: 22px; + border-color: rgb(70 193 255 / 75%) rgb(70 193 255 / 75%) transparent transparent; + &:hover { + border-color: rgb(70 193 255) rgb(70 193 255) transparent transparent; + } + ion-icon { + position: absolute; + right: 6px; + top: 6px; + color: white; + } } -.launch-button-off { - --background: transparent; - --box-shadow: none; +.disabled { + pointer-events: none; border-color: transparent; + &:hover { + border-color: transparent; + } ion-icon { color: var(--ion-color-medium); } @@ -121,21 +85,7 @@ .launch-container { position: absolute; - // --border-radius: 0px; - width: 55%; - height: 55%; right: 0px; top: 0px; - // --box-shadow: none; - /* top: -5px; */ - // border-style: outset; - // border-width: 0px 0px 0px 0px; - // border-color: #2a2a2a; margin: 0px; - // --background: linear-gradient(200deg, rgb(35, 178, 251, 1), rgb(35, 178, 251, 0.25)); - // border-style: solid; - // border-width: 0 72px 73px 0; - // border-color: blue; - /* border-width: 40px 80px 40px 0; */ - // border-color: transparent #007bff transparent transparent; } \ No newline at end of file diff --git a/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.ts b/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.ts index 9b858098e..5ef1a916d 100644 --- a/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.ts +++ b/ui/src/app/pages/apps-routes/app-installed-list/app-installed-list.page.ts @@ -99,7 +99,9 @@ export class AppInstalledListPage extends Cleanup { } - async launchUiTab (address: string) { + async launchUiTab (address: string, event: Event) { + event.preventDefault() + event.stopPropagation() address = address.startsWith('http') ? address : `http://${address}` return window.open(address, '_blank') } diff --git a/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.scss b/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.scss index 69148cf00..0a5c0d9df 100644 --- a/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.scss +++ b/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.scss @@ -15,7 +15,6 @@ } .top-plate { - // margin-top: 20px; background: var(--ion-item-background); margin: 20px 10px; border-radius: 10px; diff --git a/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.ts b/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.ts index 0e32c75ae..2cf5822cd 100644 --- a/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.ts +++ b/ui/src/app/pages/apps-routes/app-installed-show/app-installed-show.page.ts @@ -102,7 +102,7 @@ export class AppInstalledShowPage extends Cleanup { } } - async launchUiTab () { + async launchUiTab (e) { let uiAddress = this.app.torAddress.getValue() uiAddress = uiAddress.startsWith('http') ? uiAddress : `http://${uiAddress}` return window.open(uiAddress, '_blank')