Skip to content

Commit a475bd4

Browse files
Romaric MourguesLabels Bot
authored andcommitted
🛠 Fix broken calendar (#2131)
1 parent 87947fb commit a475bd4

File tree

5 files changed

+515
-2
lines changed

5 files changed

+515
-2
lines changed

twake/frontend/src/app/components/calendar/event/event.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js
44
import Icon from 'components/icon/icon.js';
55
import CalendarService from 'app/deprecated/Apps/Calendar/Calendar.js';
66
import Languages from 'app/features/global/services/languages-service';
7-
import UserListManager from 'components/user-list-manager/user-list-manager';
7+
import UserListManager from 'components/user-list-manager-depreciated/user-list-manager';
88

99
import moment from 'moment';
1010

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
.user_bloc {
2+
padding-top: 1px;
3+
display: inline-block;
4+
box-sizing: border-box;
5+
color: #000;
6+
height: 18px;
7+
line-height: 16px;
8+
font-size: 12px;
9+
text-transform: capitalize;
10+
border-radius: 9px;
11+
text-overflow: ellipsis;
12+
white-space: nowrap;
13+
overflow: hidden;
14+
15+
&.mini {
16+
padding-right: 0px;
17+
margin-right: 0px;
18+
}
19+
20+
.userimage {
21+
width: 18px;
22+
height: 18px;
23+
margin-top: -1px;
24+
border-radius: 50%;
25+
display: inline-block;
26+
vertical-align: top;
27+
background: #eee;
28+
margin-right: 5px;
29+
background-size: cover;
30+
background-position: center;
31+
}
32+
}
33+
34+
.connexion_dot {
35+
width: 6px;
36+
height: 6px;
37+
border-radius: var(--border-radius-base);
38+
background: #29ce42;
39+
margin-right: 2px;
40+
vertical-align: top;
41+
position: relative;
42+
top: 7px;
43+
display: inline-block;
44+
margin-left: 2px;
45+
46+
&.grey {
47+
background: #ccc;
48+
}
49+
50+
&.red {
51+
background: #f00;
52+
}
53+
}
Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
.userListManager {
2+
& > .no-users {
3+
line-height: 32px;
4+
height: 32px;
5+
}
6+
7+
&.collapsed {
8+
& > .users-list .text,
9+
.users-list .more {
10+
display: none;
11+
}
12+
& > .users-list .icon {
13+
margin-right: 0px;
14+
}
15+
& > .users-list .icon .user_head {
16+
width: 25px;
17+
height: 25px;
18+
border-radius: 14px;
19+
border: 2px solid var(--white);
20+
box-sizing: border-box;
21+
22+
&.email {
23+
color: #444;
24+
text-align: center;
25+
line-height: 22px;
26+
font-weight: bold;
27+
}
28+
}
29+
& > .users-list {
30+
height: 24px;
31+
padding: 0px;
32+
display: inline-block;
33+
margin-bottom: 0px;
34+
vertical-align: top;
35+
}
36+
& > .users-list > div:not(:first-child) {
37+
margin-left: -12px;
38+
}
39+
}
40+
41+
&.mini {
42+
& > .menu .icon .user_head {
43+
width: 16px;
44+
height: 16px;
45+
margin-top: 4px;
46+
border-radius: var(--border-radius-base);
47+
48+
&.email {
49+
color: #444;
50+
text-align: center;
51+
line-height: 14px;
52+
font-weight: bold;
53+
}
54+
}
55+
}
56+
57+
/*&:not(.collapsed) {
58+
& > .menu {
59+
margin: 0 8px !important;
60+
}
61+
}*/
62+
63+
& > .users-list .ant-row {
64+
display: flex;
65+
flex-flow: nowrap;
66+
67+
& > * {
68+
white-space: nowrap;
69+
overflow: hidden;
70+
text-overflow: ellipsis;
71+
min-width: 0;
72+
}
73+
74+
.icon {
75+
margin-right: 8px;
76+
.user_head {
77+
width: 24px;
78+
height: 24px;
79+
border-radius: var(--border-radius-large);
80+
81+
&.email {
82+
color: #444;
83+
text-align: center;
84+
line-height: 22px;
85+
font-weight: bold;
86+
}
87+
}
88+
}
89+
90+
.text {
91+
flex: 1;
92+
text-overflow: ellipsis;
93+
overflow: hidden;
94+
white-space: nowrap;
95+
line-height: 24px;
96+
font-size: 14px;
97+
}
98+
99+
.emoji-container {
100+
margin-right: 5px;
101+
top: 1px;
102+
position: relative;
103+
}
104+
}
105+
106+
.more {
107+
height: 24px;
108+
.m-icon-small {
109+
margin: 3px;
110+
color: var(--black);
111+
cursor: pointer;
112+
}
113+
114+
&:hover {
115+
.m-icon-small {
116+
&.remove {
117+
color: var(--red);
118+
}
119+
&.add {
120+
color: var(--primary);
121+
}
122+
}
123+
}
124+
}
125+
.add-user-input {
126+
margin-top: 8px;
127+
margin-bottom: 8px;
128+
}
129+
}

0 commit comments

Comments
 (0)