Skip to content

Commit 2ef7bfd

Browse files
cardosocardoso
committed
fix: avatar [skip ci]
1 parent a51cafd commit 2ef7bfd

3 files changed

Lines changed: 29 additions & 52 deletions

File tree

‎apps/meteor/index.css‎

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
1-
/* stylelint-disable */
2-
/* stylelint-disable */
3-
/* stylelint-disable */
4-
/* stylelint-disable */
5-
/* stylelint-disable */
6-
/* stylelint-disable */
7-
/* stylelint-disable */
8-
/* stylelint-disable */
9-
/* stylelint-disable */
10-
/* stylelint-disable */
11-
/* stylelint-disable */
121
/* General */
132
@font-face {
14-
font-family: 'fontello';
3+
font-family: fontello;
154
src: url('font/fontello.eot');
165
src: url('font/fontello.eot#iefix') format('embedded-opentype'), url('font/fontello.woff2') format('woff2'),
176
url('font/fontello.woff') format('woff'), url('font/fontello.ttf') format('truetype'),
@@ -21,7 +10,9 @@
2110
}
2211

2312
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
13+
2414
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
15+
2516
/*
2617
@media screen and (-webkit-min-device-pixel-ratio:0) {
2718
@font-face {
@@ -32,19 +23,19 @@
3223
*/
3324
[class^='icon-']:before,
3425
[class*=' icon-']:before {
35-
font-family: 'fontello';
26+
font-family: fontello;
3627
font-style: normal;
3728
font-weight: normal;
38-
speak: never;
39-
29+
speak-as: never;
4030
display: inline-block;
4131
text-decoration: inherit;
4232
width: 1em;
4333
margin-right: 0.2em;
4434
text-align: center;
35+
4536
/* opacity: .8; */
4637

47-
/* For safety - reset parent styles, that can break glyph codes*/
38+
/* For safety - reset parent styles, that can break glyph codes */
4839
font-variant: normal;
4940
text-transform: none;
5041

@@ -4046,7 +4037,7 @@
40464037
background-position: 100% 0%;
40474038
}
40484039

4049-
/* stylelint-disable */
4040+
40504041

40514042
.emojione-activity {
40524043
background-image: url('packages/emojione/activity-sprites.png');
@@ -6223,8 +6214,6 @@
62236214
background-position: 5.555555555555555% 100%;
62246215
}
62256216

6226-
/* stylelint-disable */
6227-
62286217
.emojione-objects {
62296218
background-image: url('packages/emojione/objects-sprites.png');
62306219

@@ -7482,8 +7471,6 @@
74827471
background-position: 78.57142857142857% 38.46153846153846%;
74837472
}
74847473

7485-
/* stylelint-disable */
7486-
74877474
.emojione-nature {
74887475
background-image: url('packages/emojione/nature-sprites.png');
74897476

@@ -8551,8 +8538,6 @@
85518538
background-position: 100% 58.333333333333336%;
85528539
}
85538540

8554-
/* stylelint-disable */
8555-
85568541
.emojione-food {
85578542
background-image: url('packages/emojione/food-sprites.png');
85588543

@@ -9188,8 +9173,6 @@
91889173
background-position: 100% 44.44444444444444%;
91899174
}
91909175

9191-
/* stylelint-disable */
9192-
91939176
.emojione-people {
91949177
background-image: url('packages/emojione/people-sprites.png');
91959178

@@ -17917,8 +17900,6 @@
1791717900
background-position: 97.22222222222223% 2.857142857142857%;
1791817901
}
1791917902

17920-
/* stylelint-disable */
17921-
1792217903
.emojione-regional {
1792317904
background-image: url('packages/emojione/regional-sprites.png');
1792417905

@@ -18080,8 +18061,6 @@
1808018061
background-position: 100% 0%;
1808118062
}
1808218063

18083-
/* stylelint-disable */
18084-
1808518064
.emojione-travel {
1808618065
background-image: url('packages/emojione/travel-sprites.png');
1808718066

@@ -18819,8 +18798,6 @@
1881918798
background-position: 100% 0%;
1882018799
}
1882118800

18822-
/* stylelint-disable */
18823-
1882418801
.emojione-flags {
1882518802
background-image: url('packages/emojione/flags-sprites.png');
1882618803

@@ -20434,8 +20411,6 @@
2043420411
background-position: 100% 73.33333333333333%;
2043520412
}
2043620413

20437-
/* stylelint-disable */
20438-
2043920414
.emojione-modifier {
2044020415
background-image: url('packages/emojione/modifier-sprites.png');
2044120416

@@ -37143,14 +37118,14 @@ blockquote:last-child::before {
3714337118
}
3714437119

3714537120
.code-mirror-box .CodeMirror {
37146-
/* stylelint-disable-line */
37121+
3714737122
border-width: var(--input-border-width);
3714837123
border-color: var(--input-border-color);
3714937124
border-radius: var(--input-border-radius);
3715037125
}
3715137126

3715237127
.code-mirror-box.code-mirror-box-fullscreen .CodeMirror {
37153-
/* stylelint-disable-line */
37128+
3715437129
display: -webkit-box;
3715537130
display: -ms-flexbox;
3715637131
display: flex;
@@ -37164,7 +37139,7 @@ blockquote:last-child::before {
3716437139
}
3716537140

3716637141
.code-mirror-box.code-mirror-box-fullscreen .CodeMirror .CodeMirror-scroll {
37167-
/* stylelint-disable-line */
37142+
3716837143
-webkit-box-flex: 1;
3716937144
-ms-flex-positive: 1;
3717037145
flex-grow: 1;
@@ -37553,7 +37528,6 @@ textarea {
3755337528
font-family: 'fontello';
3755437529
font-style: normal;
3755537530
font-weight: normal;
37556-
speak: never;
3755737531

3755837532
display: inline-block;
3755937533
text-decoration: inherit;
@@ -44929,7 +44903,8 @@ a:where(:active):where(:not(.rcx-button)) {
4492944903
display: -webkit-box;
4493044904
overflow: hidden;
4493144905
-webkit-box-orient: vertical;
44932-
-webkit-line-clamp: 2
44906+
-webkit-line-clamp: 2;
44907+
line-clamp: 2;
4493344908
}
4493444909

4493544910
.rcx-message-generic-preview__footer {
@@ -45344,16 +45319,19 @@ a:where(:active):where(:not(.rcx-button)) {
4534445319
overflow: hidden;
4534545320
word-break: break-word;
4534645321
-webkit-box-orient: vertical;
45347-
-webkit-line-clamp: 2
45322+
-webkit-line-clamp: 2;
45323+
line-clamp: 2;
4534845324
}
4534945325

4535045326
.rcx-message-body--clamp-2 {
45351-
-webkit-line-clamp: 2
45327+
-webkit-line-clamp: 2;
45328+
line-clamp: 2;
4535245329
}
4535345330

4535445331
.rcx-message-body--clamp-3,
4535545332
.rcx-message-body--clamp-4 {
45356-
-webkit-line-clamp: 3
45333+
-webkit-line-clamp: 3;
45334+
line-clamp: 3;
4535745335
}
4535845336

4535945337
.rcx-message-body blockquote {
@@ -49075,7 +49053,8 @@ a:where(:active):where(:not(.rcx-button)) {
4907549053
display: -webkit-box;
4907649054
overflow: hidden;
4907749055
-webkit-box-orient: vertical;
49078-
-webkit-line-clamp: 2
49056+
-webkit-line-clamp: 2;
49057+
line-clamp: 2;
4907949058
}
4908049059

4908149060
.rcx-message-generic-preview__footer {

‎apps/meteor/index.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<head>
22
<title>happy-chat</title>
33
<meta name="viewport" content="width=device-width, initial-scale=1.0">
4-
<link rel="stylesheet" href="index.css" />
4+
<link rel="manifest" href="./public/manifest.webapp" />
5+
<link rel="stylesheet" href="./index.css" />
56
</head>
67

78
<body>
89
<div id="react-root"></div>
9-
<script type="module" src="client/main.ts"></script>
10+
<script type="module" src="./client/main.ts"></script>
1011
</body>

‎apps/meteor/vite.config.ts‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ ${exportLines}
190190
return files;
191191
}
192192

193-
function collectPackageEntries(manifestData: { manifest: any }) {
193+
function collectPackageEntries(manifestData: { manifest: {where: string, type: string, path: string}[] }) {
194194
const manifestEntries = manifestData && Array.isArray(manifestData.manifest) ? manifestData.manifest : [];
195195
const fromManifest = manifestEntries.filter(
196196
(entry) => entry.where === 'client' && entry.type === 'js' && entry.path.startsWith('packages/'),
@@ -324,7 +324,7 @@ ${exportLines}
324324
if (!node || node.type !== 'CallExpression') {
325325
return false;
326326
}
327-
const {callee} = node;
327+
const { callee } = node;
328328
return (
329329
callee &&
330330
callee.type === 'MemberExpression' &&
@@ -667,7 +667,7 @@ ${loadStatements}
667667
}
668668

669669
export default defineConfig({
670-
appType: 'spa',
670+
appType: 'spa',
671671
plugins: [
672672
meteorPackagesPlugin(),
673673
react({
@@ -690,7 +690,7 @@ export default defineConfig({
690690
'@rocket.chat/ui-client': path.resolve('../../packages/ui-client/src/index.ts'),
691691
'@rocket.chat/gazzodown': path.resolve('../../packages/gazzodown/src/index.ts'),
692692
'@rocket.chat/favicon': path.resolve('../../packages/favicon/src/index.ts'),
693-
'@rocket.chat/message-types': path.resolve('../../packages/message-types/src/index.ts'),
693+
'@rocket.chat/message-types': path.resolve('../../packages/message-types/src/index.ts'),
694694
// Fuselage packages used in the Meteor app
695695
// '@rocket.chat/fuselage-hooks': path.resolve('../../../fuselage/packages/fuselage-hooks/src/index.ts'),
696696
// '@rocket.chat/layout': path.resolve('../../../fuselage/packages/layout/src/index.ts'),
@@ -711,10 +711,7 @@ export default defineConfig({
711711
allowedHosts: ['localhost', '127.0.0.1'],
712712
proxy: {
713713
'/api': { target: 'http://localhost:3000', changeOrigin: true },
714-
// '/home/api': { target: 'http://localhost:3000', changeOrigin: true, rewrite: (path) => path.replace(/^\/home/, '') },
715-
// '/setup-wizard/api': { target: 'http://localhost:3000', changeOrigin: true, rewrite: (path) => path.replace(/^\/setup-wizard/, '') },
716-
// '/setup-wizard/4/api': { target: 'http://localhost:3000', changeOrigin: true, rewrite: (path) => path.replace(/^\/setup-wizard\/4/, '') },
717-
// '/setup-wizard/3/api': { target: 'http://localhost:3000', changeOrigin: true, rewrite: (path) => path.replace(/^\/setup-wizard\/3/, '') },
714+
'/avatar': { target: 'http://localhost:3000', changeOrigin: true },
718715
'/sockjs': { target: 'ws://localhost:3000', ws: true, rewriteWsOrigin: true },
719716
'/sockjs/info': { target: 'http://localhost:3000', changeOrigin: true },
720717
},

0 commit comments

Comments
 (0)