loop/loop-plugin-achievements
14
0
Fork 0
Code Pull Requests 1 Releases Activity

LP-5613 #2

Open
dmitrii.pichenikin wants to merge 37 commits from LP-5613 into dev
pull from: LP-5613
merge into: loop:dev
Conversation 2 Commits 37 Files Changed 77 +33 -3
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14186baadb - Show all commits

25
webapp/src/components/rhs/all_badges.scss
View File

@ -60,16 +60,35 @@
&__tabs { &__tabs {
display: flex; display: flex;
gap: 0; gap: 0;
flex-shrink: 1;
min-width: 0;
overflow-x: auto;
-webkit-overflow-scrolling: touch;
padding-bottom: 2px;
&::-webkit-scrollbar {
height: 3px;
}
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
background: rgba(var(--center-channel-color-rgb, 61, 60, 64), 0.2);
border-radius: 3px;
}
} }
&__tab { &__tab {
background: none; background: none;
border: none; border: none;
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
padding: 4px 12px; padding: 4px 8px;
font-size: 13px; font-size: 13px;
font-weight: 600; font-weight: 600;
cursor: pointer; cursor: pointer;
white-space: nowrap;
color: rgba(var(--center-channel-color-rgb, 61, 60, 64), 0.64); color: rgba(var(--center-channel-color-rgb, 61, 60, 64), 0.64);
&:hover { &:hover {
@ -122,10 +141,12 @@
color: var(--button-color, #fff); color: var(--button-color, #fff);
border: none; border: none;
border-radius: 4px; border-radius: 4px;
padding: 4px 12px; padding: 4px 10px;
font-size: 12px; font-size: 12px;
font-weight: 600; font-weight: 600;
cursor: pointer; cursor: pointer;
white-space: nowrap;
flex-shrink: 0;
&:hover { &:hover {
opacity: 0.88; opacity: 0.88;

11
webapp/src/components/rhs/index.tsx
View File

@ -52,7 +52,7 @@ const RHS: React.FC = () => {
}); });
}, []); }, []);
const showTabs = currentView === RHS_STATE_ALL || currentView === RHS_STATE_TYPES; const showTabs = currentView === RHS_STATE_MY || currentView === RHS_STATE_ALL || currentView === RHS_STATE_TYPES;
const handleCreateBadge = useCallback(() => { const handleCreateBadge = useCallback(() => {
dispatch(openCreateBadgeModal()); dispatch(openCreateBadgeModal());
@ -70,6 +70,15 @@ const RHS: React.FC = () => {
return ( return (
<div className='AllBadges__header'> <div className='AllBadges__header'>
<div className='AllBadges__tabs'> <div className='AllBadges__tabs'>
<button
className={'AllBadges__tab' + (currentView === RHS_STATE_MY ? ' AllBadges__tab--active' : '')}
onClick={() => dispatch(setRHSView(RHS_STATE_MY))}
>
<FormattedMessage
id='badges.rhs.my_badges'
defaultMessage='Мои'
/>
</button>
<button <button
className={'AllBadges__tab' + (currentView === RHS_STATE_ALL ? ' AllBadges__tab--active' : '')} className={'AllBadges__tab' + (currentView === RHS_STATE_ALL ? ' AllBadges__tab--active' : '')}
onClick={() => dispatch(setRHSView(RHS_STATE_ALL))} onClick={() => dispatch(setRHSView(RHS_STATE_ALL))}