Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix spacing and font size #2199

Merged
merged 7 commits into from Mar 10, 2023
Merged

fix spacing and font size #2199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3c53ec
fix spacing and font size
elvece Mar 10, 2023
5115aff
fix spacing reverted by linting
elvece Mar 10, 2023
07b0ec0
fix styles and event propagation on updates tab
elvece Mar 10, 2023
26f8053
fix login theme
elvece Mar 10, 2023
eabc017
remove global font setting
elvece Mar 10, 2023
9054c64
remove taiga theming for now
elvece Mar 10, 2023
fdc8b8f
move website button and bump shared and marketplace libs
MattDHill Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions frontend/angular.json
View file
Open in desktop
Expand Up @@ -43,8 +43,6 @@
}
],
"styles": [
"node_modules/@taiga-ui/core/styles/taiga-ui-theme.less",
"node_modules/@taiga-ui/core/styles/taiga-ui-fonts.less",
"projects/shared/styles/variables.scss",
"projects/shared/styles/global.scss",
"projects/shared/styles/shared.scss",
Expand Down
82 changes: 36 additions & 46 deletions frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/projects/marketplace/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@start9labs/marketplace",
"version": "0.3.9",
"version": "0.3.10",
"peerDependencies": {
"@angular/common": ">=13.2.0",
"@angular/core": ">=13.2.0",
Expand Down
16 changes: 5 additions & 11 deletions frontend/projects/marketplace/src/pages/show/about/about.component.html
View file
Open in desktop
@@ -1,22 +1,16 @@
<!-- release notes -->
<ion-item-divider>
New in {{ pkg.manifest.version | displayEmver }}
<ion-button
routerLink="notes"
class="all-notes"
fill="clear"
color="dark"
strong
>
Past Release Notes
<ion-icon slot="end" name="arrow-forward"></ion-icon>
</ion-button>
</ion-item-divider>
<ion-item lines="none" color="transparent">
<ion-label>
<div [innerHTML]="pkg.manifest['release-notes'] | markdown"></div>
</ion-label>
</ion-item>
<ion-button routerLink="notes" fill="clear" strong>
Past Release Notes
<ion-icon slot="end" name="arrow-forward"></ion-icon>
</ion-button>
<!-- description -->
<ion-item-divider>Description</ion-item-divider>
<ion-item lines="none" color="transparent">
Expand All @@ -29,7 +23,7 @@ <h2>{{ pkg.manifest.description.long }}</h2>
style="padding: 4px 0 10px 14px"
>
<ion-button [href]="url" target="_blank" rel="noreferrer" color="tertiary">
View marketing website
View website
<ion-icon slot="end" name="open-outline"></ion-icon>
</ion-button>
</div>
6 changes: 1 addition & 5 deletions frontend/projects/setup-wizard/src/app/pages/home/home.page.html
View file
Open in desktop
Expand Up @@ -78,11 +78,7 @@ <h2><ion-text color="danger">Recover</ion-text></h2>
<h2>
<ion-text color="success">Use Existing Drive</ion-text>
</h2>
<p>
Attach an existing embassyOS data drive (
<b>not</b>
a backup)
</p>
<p>Attach an existing embassyOS data drive (<b>not</b> a backup)</p>
</ion-label>
</ion-item>

Expand Down
2 changes: 1 addition & 1 deletion frontend/projects/shared/package.json
View file
Open in desktop
@@ -1,6 +1,6 @@
{
"name": "@start9labs/shared",
"version": "0.3.1",
"version": "0.3.2",
"peerDependencies": {
"@angular/common": ">=13.2.0",
"@angular/core": ">=13.2.0",
Expand Down
4 changes: 2 additions & 2 deletions frontend/projects/ui/src/app/pages/login/login.page.html
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
<ion-card-content class="ion-margin">
<form class="form" (submit)="submit()">
<ion-item-group>
<ion-item color="light">
<ion-item color="dark">
<ion-icon
slot="start"
name="key-outline"
Expand All @@ -25,7 +25,7 @@
[(ngModel)]="password"
(ionChange)="error = ''"
></ion-input>
<ion-button fill="clear" color="dark" (click)="toggleMask()">
<ion-button fill="clear" color="light" (click)="toggleMask()">
<ion-icon
slot="icon-only"
size="small"
Expand Down
15 changes: 8 additions & 7 deletions frontend/projects/ui/src/app/pages/updates/updates.page.html
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
<div class="header">
<div class="header_items">
<store-icon [url]="host.url" size="48px"></store-icon>
<div class="pl-1">
<div class="header_title pl-1">
<h1>{{ host.name }}</h1>
<p>{{ host.url }}</p>
</div>
Expand All @@ -40,7 +40,7 @@ <h1>{{ host.name }}</h1>
<ion-item slot="header">
<ion-col class="accordian-padding">
<ion-row
(click)="viewInMarketplace(local)"
(click)="viewInMarketplace($event, local)"
style="cursor: pointer"
>
<ion-thumbnail class="align-center">
Expand All @@ -49,8 +49,8 @@ <h1>{{ host.name }}</h1>
/>
</ion-thumbnail>
<ion-label class="pl-1">
<h1>{{ pkg.manifest.title }}</h1>
<h2 class="inline">
<h2>{{ pkg.manifest.title }}</h2>
<h3 class="inline">
<span>
{{ local.manifest.version | displayEmver }}
</span>
Expand All @@ -60,7 +60,7 @@ <h2 class="inline">
<ion-text color="success">
{{ pkg.manifest.version | displayEmver }}
</ion-text>
</h2>
</h3>
<p
*ngIf="marketplaceService.updateErrors[pkg.manifest.id] as error"
>
Expand All @@ -76,8 +76,8 @@ <h2 class="inline">
*ngIf="local.state === PackageState.Updating else notUpdating"
[current]="local['install-progress'] | installProgress"
[max]="100"
[radius]="15"
[stroke]="4"
[radius]="13"
[stroke]="3"
[rounded]="true"
color="var(--ion-color-primary)"
></round-progress>
Expand All @@ -103,6 +103,7 @@ <h2 class="inline">
</ion-item>
<div class="ion-padding" slot="content">
<div class="notes">
<h4>What's new</h4>
<p
[innerHTML]="pkg.manifest['release-notes'] | markdown"
></p>
Expand Down
17 changes: 15 additions & 2 deletions frontend/projects/ui/src/app/pages/updates/updates.page.scss
View file
Open in desktop
Expand Up @@ -5,6 +5,11 @@

.notes {
margin-left: 20px;

h4 {
font-size: 1rem;
font-weight: 600;
}
}

.header {
Expand All @@ -18,8 +23,6 @@
}

h1 {
font-size: 28px;
letter-spacing: 1px;
margin: 0 0 5px 0;
}

Expand Down Expand Up @@ -53,6 +56,16 @@ ion-item {
--background-hover: none;
}

ion-label {
h2 {
font-size: 1.2rem;
}

h3 {
font-size: 1rem;
}
}

.accordian-padding {
padding: 0.5rem;
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/projects/ui/src/app/pages/updates/updates.page.ts
View file
Open in desktop
Expand Up @@ -58,7 +58,8 @@ export class UpdatesPage {
private readonly alertCtrl: AlertController,
) {}

viewInMarketplace(pkg: PackageDataEntry) {
viewInMarketplace(event: Event, pkg: PackageDataEntry) {
event.stopPropagation()
const url = pkg.installed?.['marketplace-url']
const queryParams = url ? { url } : {}

Expand Down