Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chore: Remove unused templates and bump fuselage #27606

Merged
merged 5 commits into from
Dec 22, 2022
Merged

Chore: Remove unused templates and bump fuselage #27606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28c8b4d
chore
ggazzo Dec 22, 2022
dc777fa
undo message-parser
ggazzo Dec 22, 2022
00c8e44
fix
ggazzo Dec 22, 2022
911eb4e
eof
ggazzo Dec 22, 2022
f454a17
Merge branch 'develop' into chore/delete-unused-templates
ggazzo Dec 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
282 changes: 14 additions & 268 deletions apps/meteor/app/theme/client/imports/components/message-box.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,99 +6,29 @@

font-size: var(--message-box-text-size);

&--embedded {
padding: 24px 12px 12px;
}

&__toolbar-formatting {
position: absolute;
left: 0;

&__toolbar-formatting-item {
display: flex;

width: 100%;
height: 24px;

justify-content: center;

&-item {
display: flex;

min-width: 16px;
margin: 0 4px;
min-width: 16px;
margin: 0 4px;

transition: color 0.1s;
transition: color 0.1s;

color: var(--message-box-markdown-color);
align-items: center;
justify-content: center;

&:hover,
&:focus,
&.active {
color: var(--message-box-markdown-hover-color);
}
}

&-link {
color: currentColor;

font-size: 0.75rem;
}
color: var(--message-box-markdown-color);
align-items: center;
justify-content: center;

&-icon {
font-size: 1rem;
fill: currentColor;
&:hover,
&:focus,
&.active {
color: var(--message-box-markdown-hover-color);
}
}

&__activity {
position: absolute;
top: 4px;
left: 0;

margin-left: 24px;

color: var(--message-box-user-activity-color);

font-size: var(--message-box-user-activity-text-size);

&-user {
color: var(--message-box-user-activity-user-color);

font-weight: bold;
}

&::after {
display: inline-block;
overflow: hidden;
&__toolbar-formatting-link {
color: currentColor;

width: 0;

content: '\2026'; /* ascii code for the ellipsis character */
animation: ellipsis steps(4, end) 1.5s infinite;
vertical-align: bottom;
}
}

&__container {
display: flex;

padding: 0.5rem 0.75rem;

cursor: text;

transition: background-color 0.3s;

border-width: var(--message-box-container-border-width);
border-color: var(--message-box-container-border-color);
border-radius: var(--message-box-container-border-radius);

align-items: center;

&.editing {
background-color: var(--rcx-color-status-background-warning-2, var(--message-box-editing-color));
}
font-size: 0.75rem;
}

&__textarea {
Expand Down Expand Up @@ -127,41 +57,6 @@
}
}

&__icon {
display: flex;

flex: auto 0 0;

width: 50px;
height: 21px;

cursor: pointer;

color: var(--message-box-color);
align-items: center;
justify-content: center;

& .rc-input__icon-svg {
font-size: 1.4rem;
}

& .rc-input__icon-svg--plus {
transition: transform 0.1s linear;
}
}

&__action-menu {
position: relative;

&.active .rc-input__icon-svg--plus {
transform: rotate(45deg);
}
}

& [data-small] {
display: none;
}

&__audio-message {
display: flex;

Expand Down Expand Up @@ -242,153 +137,4 @@
}
}
}

&__join {
display: flex;

margin: 0 -0.25rem;
align-items: center;
flex-wrap: nowrap;
}

&__join-code {
flex: 0 0 10rem;

margin: 0 0.25rem;
}

&__join-button {
flex: 0;

margin: -1rem 0.15rem;
}

&__take-it-button {
margin: 0 0.5rem;
}

&__resume-it-button {
margin: 0 0.5rem;
}

&__join-it-button {
margin: 0 0.5rem;
}

&__cannot-send {
display: flex;
justify-content: space-between;
}
}

@media (width <= 500px) {
.rc-message-box {
margin-top: 1rem;
padding: 0 1.25rem;

&__activity {
top: -1rem;

margin-left: 1rem;
}

&__toolbar-formatting {
display: none;
}

&__container {
display: flex;

padding: var(--default-small-padding);
padding-bottom: calc(var(--default-small-padding) - 8px);

border-width: 0;
border-top-width: 1px;
flex-wrap: wrap;
justify-content: space-between;
}

& [data-desktop] {
display: none;
}

& [data-small] {
display: flex;
}

&__textarea {
flex: 1 0 100%;

margin-block-end: 8px;
order: 1;
}

&__action {
margin: 5px 10px;

font-size: 20px;
}

& [disabled] {
opacity: 0.4;
}

& .emoji-picker-icon {
width: initial;
padding-right: 10px;
order: 2;
}

&__action-label {
display: flex;
flex-direction: row;
flex: 1 1 auto;

font-size: 20px;
order: 3;
}

&__audio-message-container {
order: 4;
}

&__send {
flex: 0;

font-size: 20px;
order: 5;
}

[role='toolbar'] {
order: 6;
}
}

.js-message-action {
cursor: pointer;
}
}

.rc-popover--message-box {
& .rc-popover__divider {
display: none;
}

& .rc-popover__title {
text-transform: none;

color: var(--message-box-popover-title-text-color);

font-size: var(--message-box-popover-title-text-size);

&:not(:first-child) {
margin-top: var(--popover-column-padding);
}
}
}

.rtl .rc-message-box__activity {
right: 0;

margin-right: 24px;
}
18 changes: 6 additions & 12 deletions apps/meteor/client/sidebar/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,17 @@ const Sidebar = () => {

return (
<>
<Box
id='sidebar-region'
className={[
'rcx-sidebar',
'sidebar--main',
`sidebar--${sidebarViewMode}`,
sidebarHideAvatar && 'sidebar--hide-avatar',
!sidebar.isCollapsed && isMobile && 'opened',
sideBarStyle,
].filter(Boolean)}
>
<Box id='sidebar-region' className={['rcx-sidebar', !sidebar.isCollapsed && isMobile && 'opened', sideBarStyle].filter(Boolean)}>
<Box
display='flex'
flexDirection='column'
height='100%'
is='nav'
className='rcx-sidebar--template'
className={[
'rcx-sidebar--main',
`rcx-sidebar rcx-sidebar--${sidebarViewMode}`,
sidebarHideAvatar && 'rcx-sidebar--hide-avatar',
].filter(Boolean)}
role='navigation'
data-qa-opened={sidebar.isCollapsed ? 'false' : 'true'}
>
Expand Down
Loading