Skip to content

Commit

Permalink
🛠 Fix broken calendar (#2131)
Browse files Browse the repository at this point in the history
  • Loading branch information
RomaricMourgues authored May 6, 2022
1 parent bc01338 commit 3a96966
Show file tree
Hide file tree
Showing 5 changed files with 515 additions and 2 deletions.
2 changes: 1 addition & 1 deletion twake/frontend/src/app/components/calendar/event/event.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Collections from 'app/deprecated/CollectionsV1/Collections/Collections.js
import Icon from 'components/icon/icon.js';
import CalendarService from 'app/deprecated/Apps/Calendar/Calendar.js';
import Languages from 'app/features/global/services/languages-service';
import UserListManager from 'components/user-list-manager/user-list-manager';
import UserListManager from 'components/user-list-manager-depreciated/user-list-manager';

import moment from 'moment';

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.user_bloc {
padding-top: 1px;
display: inline-block;
box-sizing: border-box;
color: #000;
height: 18px;
line-height: 16px;
font-size: 12px;
text-transform: capitalize;
border-radius: 9px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;

&.mini {
padding-right: 0px;
margin-right: 0px;
}

.userimage {
width: 18px;
height: 18px;
margin-top: -1px;
border-radius: 50%;
display: inline-block;
vertical-align: top;
background: #eee;
margin-right: 5px;
background-size: cover;
background-position: center;
}
}

.connexion_dot {
width: 6px;
height: 6px;
border-radius: var(--border-radius-base);
background: #29ce42;
margin-right: 2px;
vertical-align: top;
position: relative;
top: 7px;
display: inline-block;
margin-left: 2px;

&.grey {
background: #ccc;
}

&.red {
background: #f00;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
.userListManager {
& > .no-users {
line-height: 32px;
height: 32px;
}

&.collapsed {
& > .users-list .text,
.users-list .more {
display: none;
}
& > .users-list .icon {
margin-right: 0px;
}
& > .users-list .icon .user_head {
width: 25px;
height: 25px;
border-radius: 14px;
border: 2px solid var(--white);
box-sizing: border-box;

&.email {
color: #444;
text-align: center;
line-height: 22px;
font-weight: bold;
}
}
& > .users-list {
height: 24px;
padding: 0px;
display: inline-block;
margin-bottom: 0px;
vertical-align: top;
}
& > .users-list > div:not(:first-child) {
margin-left: -12px;
}
}

&.mini {
& > .menu .icon .user_head {
width: 16px;
height: 16px;
margin-top: 4px;
border-radius: var(--border-radius-base);

&.email {
color: #444;
text-align: center;
line-height: 14px;
font-weight: bold;
}
}
}

/*&:not(.collapsed) {
& > .menu {
margin: 0 8px !important;
}
}*/

& > .users-list .ant-row {
display: flex;
flex-flow: nowrap;

& > * {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
min-width: 0;
}

.icon {
margin-right: 8px;
.user_head {
width: 24px;
height: 24px;
border-radius: var(--border-radius-large);

&.email {
color: #444;
text-align: center;
line-height: 22px;
font-weight: bold;
}
}
}

.text {
flex: 1;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
line-height: 24px;
font-size: 14px;
}

.emoji-container {
margin-right: 5px;
top: 1px;
position: relative;
}
}

.more {
height: 24px;
.m-icon-small {
margin: 3px;
color: var(--black);
cursor: pointer;
}

&:hover {
.m-icon-small {
&.remove {
color: var(--red);
}
&.add {
color: var(--primary);
}
}
}
}
.add-user-input {
margin-top: 8px;
margin-bottom: 8px;
}
}
Loading

0 comments on commit 3a96966

Please sign in to comment.