Skip to content

Commit c8183a0

Browse files
committed
Merge branch 'ft/bento' of https://github.com/openmcp-project/ui-frontend into ft/bento
2 parents 7fd9475 + 7c0dfc5 commit c8183a0

File tree

9 files changed

+21
-9
lines changed

9 files changed

+21
-9
lines changed

index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
<head>
55
<meta charset="UTF-8" />
6-
<link rel="icon" type="image/svg+xml" href="/logo.png" />
6+
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>MCP</title>
8+
<title>ManagedControlPlane UI</title>
99
</head>
1010

1111
<body>
73.9 KB
Loading

public/co-logo-orchestrating.png

-67.7 KB
Loading

public/favicon.ico

14.7 KB
Binary file not shown.

public/locales/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
},
409409
"GitOpsHint": {
410410
"title": "Flux",
411-
"subtitle": "Persist desired state in code repsitories",
411+
"subtitle": "Persist desired state in code repositories",
412412
"activeStatus": "Active v",
413413
"progressAvailable": "Available",
414414
"noResources": "No Resources",
@@ -423,7 +423,7 @@
423423
"serviceAccounts": "Service Accounts"
424424
},
425425
"ESOHint": {
426-
"title": "ESO",
426+
"title": "External Secrets",
427427
"subtitle": "Secure secrets with rotation",
428428
"activeStatus": "Active v",
429429
"progressAvailable": "Available",

public/logo.png

-251 KB
Loading

src/components/BentoGrid/MultiPercentageBar/MultiPercentageBar.module.css

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,25 @@
8989
width: var(--bar-width);
9090
max-width: var(--bar-max-width);
9191
background-color: var(--background-color);
92-
border-radius: var(--border-radius);
92+
border-radius: 0;
9393
padding: 2px;
9494
overflow: hidden;
9595
}
96+
.barContainer > :first-child {
97+
border-top-left-radius: var(--border-radius);
98+
border-bottom-left-radius: var(--border-radius);
99+
}
100+
.barContainer > :last-child {
101+
border-top-right-radius: var(--border-radius);
102+
border-bottom-right-radius: var(--border-radius);
103+
}
104+
96105

97106
/* Individual segments */
98107
.segment {
99108
flex: var(--segment-percentage);
100109
min-width: 10px;
101110
background-color: var(--segment-color);
102-
border-radius: var(--border-radius);
103111
height: var(--bar-height);
104112
position: relative;
105113
overflow: hidden;

src/components/Core/ShellBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ export function ShellBarComponent() {
4444
startButton={
4545
<div className={styles.container}>
4646
<div className={styles.logoWrapper}>
47-
<img src="/logo.png" alt="MCP" className={styles.logo} />
48-
<span className={styles.logoText}>MCP</span>
47+
<img src="/logo.png" alt="ManagedControlPlane" className={styles.logo} />
48+
<span className={styles.logoText}>ManagedControlPlane UI</span>
4949
</div>
5050
</div>
5151
}

src/views/Login.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ export default function LoginView() {
2929
>
3030
<Card style={{ width: 'fit-content' }}>
3131
<div style={{ margin: '1rem' }}>
32-
<img className="logo" src="/co-logo-orchestrating.png" alt="Logo" />
32+
<picture>
33+
<source srcset="co-logo-orchestrating.png" media="(prefers-color-scheme: light)"/>
34+
<source srcset="co-logo-orchestrating-dark.png" media="(prefers-color-scheme: dark)"/>
35+
<img className="logo" src="/co-logo-orchestrating.png" alt="Logo" />
36+
</picture>
3337
<div className="headline">{t('Login.welcomeMessage')}</div>
3438
<Text>{t('Login.description')}</Text>
3539
<Text>

0 commit comments

Comments
 (0)