Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix spacing and font size (#2199)

Browse Source 
* fix spacing and font size

* fix spacing reverted by linting

* fix styles and event propagation on updates tab

* fix login theme

* remove global font setting

* remove taiga theming for now

* move website button and bump shared and marketplace libs

---------

Co-authored-by: Matt Hill <matthewonthemoon@gmail.com>
This commit is contained in:
Lucy C
2023-03-10 11:24:58 -07:00
committed by GitHub
parent 181b44e117
commit 7c1e2bf96f
10 changed files with 71 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/angular.json
View File

@@ -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",

82
frontend/package-lock.json generated
View File

@@ -80,28 +80,6 @@
"webpack-bundle-analyzer": "^4.8.0"
}
},
"../patch-db/client": {
"name": "patch-db",
"version": "1.0.0",
"license": "MIT",
"dependencies": {
"sorted-btree": "1.5.0",
"uuid": "8.3.2"
},
"devDependencies": {
"@types/node": "16.4.13",
"@types/uuid": "8.3.1",
"husky": "^4.3.8",
"lint-staged": "^12.3.7",
"prettier": "^2.6.1",
"ts-node": "10.2.0",
"tslint": "6.1.3",
"typescript": "4.3.5"
},
"peerDependencies": {
"rxjs": ">=7.0.0"
}
},
"node_modules/@adobe/css-tools": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz",
@@ -9977,13 +9955,13 @@
}
},
"node_modules/ng-morph": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ng-morph/-/ng-morph-2.1.3.tgz",
"integrity": "sha512-bFeSMSn2ORgtYw4ZmwISJ/RGdZxi03IwODrnXB6FbTEvmyfuTCB7x0FyQsm8euNX43fTp3FZclCZpRmO8t5w8w==",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/ng-morph/-/ng-morph-2.1.0.tgz",
"integrity": "sha512-jn34Ter6HlY7E3yOoMhfk3cnUwjLlvcGTsAJ7jS0pZ3SAGi3hzqlf3oyUQO6fNfbFnydc33yNqQtUIrbHKCtNA==",
"optional": true,
"dependencies": {
"jsonc-parser": "3.0.0",
"minimatch": "3.0.5",
"minimatch": "3.0.4",
"multimatch": "5.0.0",
"ts-morph": "10.0.2"
},
@@ -10009,9 +9987,9 @@
"optional": true
},
"node_modules/ng-morph/node_modules/minimatch": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
"integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"optional": true,
"dependencies": {
"brace-expansion": "^1.1.7"
@@ -10955,8 +10933,17 @@
}
},
"node_modules/patch-db-client": {
"resolved": "../patch-db/client",
"link": true
"name": "patch-db",
"version": "1.0.0",
"resolved": "file:../patch-db/client",
"license": "MIT",
"dependencies": {
"sorted-btree": "1.5.0",
"uuid": "8.3.2"
},
"peerDependencies": {
"rxjs": ">=7.0.0"
}
},
"node_modules/path-browserify": {
"version": "1.0.1",
@@ -13267,6 +13254,11 @@
"node": ">= 10"
}
},
"node_modules/sorted-btree": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/sorted-btree/-/sorted-btree-1.5.0.tgz",
"integrity": "sha512-1KzY80r3VpwGLGN/9oWjReUml3czxKfLz4iMV8Ro9KAHCg9xt0HwTkcb20JR+sHCiR5WUJ6uMAbe/HB3gy1qYA=="
},
"node_modules/source-map": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
@@ -22452,12 +22444,13 @@
"dev": true
},
"ng-morph": {
"version": "https://registry.npmjs.org/ng-morph/-/ng-morph-2.1.3.tgz",
"integrity": "sha512-bFeSMSn2ORgtYw4ZmwISJ/RGdZxi03IwODrnXB6FbTEvmyfuTCB7x0FyQsm8euNX43fTp3FZclCZpRmO8t5w8w==",
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/ng-morph/-/ng-morph-2.1.0.tgz",
"integrity": "sha512-jn34Ter6HlY7E3yOoMhfk3cnUwjLlvcGTsAJ7jS0pZ3SAGi3hzqlf3oyUQO6fNfbFnydc33yNqQtUIrbHKCtNA==",
"optional": true,
"requires": {
"jsonc-parser": "3.0.0",
"minimatch": "3.0.5",
"minimatch": "3.0.4",
"multimatch": "5.0.0",
"ts-morph": "10.0.2"
},
@@ -22479,9 +22472,9 @@
"optional": true
},
"minimatch": {
"version": "3.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz",
"integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==",
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
@@ -23208,17 +23201,9 @@
"dev": true
},
"patch-db-client": {
"version": "file:../patch-db/client",
"version": "npm:patch-db@1.0.0",
"requires": {
"@types/node": "16.4.13",
"@types/uuid": "8.3.1",
"husky": "^4.3.8",
"lint-staged": "^12.3.7",
"prettier": "^2.6.1",
"sorted-btree": "1.5.0",
"ts-node": "10.2.0",
"tslint": "6.1.3",
"typescript": "4.3.5",
"uuid": "8.3.2"
}
},
@@ -24847,6 +24832,11 @@
"socks": "^2.6.2"
}
},
"sorted-btree": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/sorted-btree/-/sorted-btree-1.5.0.tgz",
"integrity": "sha512-1KzY80r3VpwGLGN/9oWjReUml3czxKfLz4iMV8Ro9KAHCg9xt0HwTkcb20JR+sHCiR5WUJ6uMAbe/HB3gy1qYA=="
},
"source-map": {
"version": "0.7.4",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",

2
frontend/projects/marketplace/package.json
View File

@@ -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",

16
frontend/projects/marketplace/src/pages/show/about/about.component.html
View File

@@ -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">
@@ -29,7 +23,7 @@
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
frontend/projects/setup-wizard/src/app/pages/home/home.page.html
View File

@@ -78,11 +78,7 @@
<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>

2
frontend/projects/shared/package.json
View File

@@ -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",

4
frontend/projects/ui/src/app/pages/login/login.page.html
View File

@@ -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"
@@ -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"

15
frontend/projects/ui/src/app/pages/updates/updates.page.html
View File

@@ -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>
@@ -40,7 +40,7 @@
<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">
@@ -49,8 +49,8 @@
/>
</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>
@@ -60,7 +60,7 @@
<ion-text color="success">
{{ pkg.manifest.version | displayEmver }}
</ion-text>
</h2>
</h3>
<p
*ngIf="marketplaceService.updateErrors[pkg.manifest.id] as error"
>
@@ -76,8 +76,8 @@
*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>
@@ -103,6 +103,7 @@
</ion-item>
<div class="ion-padding" slot="content">
<div class="notes">
<h4>What's new</h4>
<p
[innerHTML]="pkg.manifest['release-notes'] | markdown"
></p>

17
frontend/projects/ui/src/app/pages/updates/updates.page.scss
View File

@@ -5,6 +5,11 @@
.notes {
margin-left: 20px;
h4 {
font-size: 1rem;
font-weight: 600;
}
}
.header {
@@ -18,8 +23,6 @@
}
h1 {
font-size: 28px;
letter-spacing: 1px;
margin: 0 0 5px 0;
}
@@ -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;
}

3
frontend/projects/ui/src/app/pages/updates/updates.page.ts
View File

@@ -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 } : {}