Skip to content

Commit 40afa98

Browse files
committed
Merge branch 'main' into backend_fixes
2 parents 31b34d9 + 0c90d2d commit 40afa98

8 files changed

Lines changed: 370 additions & 15 deletions

File tree

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
/node_modules
1212
.yarn/
1313

14+
# yarn berry cache (not tracked at repo root)
15+
/.yarn/cache
16+
/.yarn/install-state.gz
17+
/.yarn/unplugged
18+
/.yarn/build-state.yml
19+
1420
# profiling files
1521
chrome-profiler-events*.json
1622
speed-measure-plugin*.json

frontend/src/app/app.component.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@
4848
</mat-icon>
4949
<div matListItemTitle>Zapier</div>
5050
</a>
51+
<button type="button" mat-menu-item (click)="openSupportChat()"
52+
data-testid="support-chat-button-account-menu">
53+
<mat-icon fontSet="material-symbols-outlined">chat_bubble</mat-icon>
54+
<span>Chat with support</span>
55+
</button>
5156
<a mat-list-item href="https://docs.rocketadmin.com/" target="_blank">
5257
<mat-icon matListItemIcon class="connection-navigation__icon" fontSet="material-symbols-outlined">help</mat-icon>
5358
<div matListItemTitle>Help center</div>

frontend/src/app/app.component.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ export class AppComponent {
304304
user_hash: res.intercom_hash,
305305
user_id: res.id,
306306
email: res.email,
307+
hide_default_launcher: window.innerWidth > 600,
307308
});
308309

309310
if (this.isDemo)
@@ -345,6 +346,12 @@ export class AppComponent {
345346
this.isFeatureNotificationShown = false;
346347
}
347348

349+
openSupportChat() {
350+
if (typeof window.Intercom !== 'undefined') {
351+
window.Intercom('show');
352+
}
353+
}
354+
348355
setUserLoggedIn(state) {
349356
this.userLoggedIn = state;
350357
this.changeDetector.detectChanges();

frontend/src/app/components/connections-list/connections-list.component.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@
5656
margin-bottom: 0;
5757
}
5858

59+
@media (width <= 600px) {
60+
.pageTitleHeader .pageTitle__name {
61+
font-size: 20px !important;
62+
line-height: 1.2 !important;
63+
}
64+
}
65+
5966
.companyEditLink {
6067
position: absolute;
6168
top: 50%;

frontend/src/app/components/connections-list/demo-connections/demo-connections.component.css

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
width: 100%;
55
}
66

7+
@media (width <= 600px) {
8+
:host h1.mat-display-1 {
9+
font-size: 22px !important;
10+
line-height: 1.2 !important;
11+
margin-bottom: 20px;
12+
}
13+
}
14+
715
.section__label {
816
display: block;
917
font-size: 11px;
@@ -17,11 +25,18 @@
1725
.demoGrid {
1826
list-style: none;
1927
display: grid;
20-
grid-template-columns: repeat(3, 1fr);
28+
grid-template-columns: repeat(3, minmax(0, 1fr));
2129
gap: 12px;
2230
width: 100%;
2331
padding: 0;
2432
margin: 0;
33+
align-items: stretch;
34+
}
35+
36+
@media (601px <= width <= 1024px) {
37+
.demoGrid {
38+
grid-template-columns: repeat(2, minmax(0, 1fr));
39+
}
2540
}
2641

2742
@media (width <= 600px) {
@@ -36,6 +51,7 @@
3651
gap: 12px;
3752
border-radius: 8px;
3853
padding: 12px 16px;
54+
height: 100%;
3955
text-decoration: none;
4056
color: inherit;
4157
transition: box-shadow 200ms, background 200ms, border 200ms;
@@ -102,6 +118,12 @@
102118
min-width: 0;
103119
}
104120

121+
.demoCard__info strong {
122+
overflow: hidden;
123+
text-overflow: ellipsis;
124+
white-space: nowrap;
125+
}
126+
105127
.demoCard__type {
106128
font-size: 12px;
107129
margin-top: -2px;

0 commit comments

Comments
 (0)