self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2025-02-10 19:41:29 +02:00
Code Issues Releases Activity

2889 - Hiding images on share modal on personal (#2925)

Browse Source 
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
This commit is contained in:
Asaad Mahmood 2022-05-05 00:53:46 +05:00 committed by GitHub
parent 3ccebe8506
commit fb46097e72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 98 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mattermost-plugin/webapp/src/plugin.scss
View File

@ -13,7 +13,7 @@
background: rgba(var(--center-channel-color-rgb), 0.08);
div {
color: var(--link-color-rgb);
color: rgb(var(--link-color-rgb));
}
}
}

27
webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
View File

@ -126,9 +126,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Copy l
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -352,9 +349,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Copy l
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -578,9 +572,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Regene
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -1859,9 +1850,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard, and click switc
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -2108,9 +2096,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoardComponent and cli
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -2357,9 +2342,6 @@ exports[`src/components/shareBoard/shareBoard should match snapshot 1`] = `
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -2583,9 +2565,6 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -2809,9 +2788,6 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>
@ -3035,9 +3011,6 @@ exports[`src/components/shareBoard/shareBoard should match snapshot with sharing
<div
class="user-item__content"
>
<i
class="CompassIcon icon-mattermost user-item__img"
/>
<div
class="ml-3"
>

5
webapp/src/components/shareBoard/shareBoard.scss
View File

@ -139,7 +139,7 @@
.share-input {
height: 48px;
padding: 0 12px;
padding: 0 16px;
display: flex;
align-items: center;
position: relative;
@ -160,7 +160,8 @@
height: 100%;
border-radius: 4px;
border: 1px solid rgba(var(--center-channel-color-rgb), 0.16);
padding-left: 40px;
padding-left: 35px;
font-size: 16px;
&:focus {
border: 2px solid var(--button-bg);

11
webapp/src/components/shareBoard/teamPermissionsRow.tsx
View File

@ -15,6 +15,7 @@ import {useAppSelector} from '../../store/hooks'
import {getCurrentTeam} from '../../store/teams'
import {getCurrentBoard} from '../../store/boards'
import {Permission} from '../../constants'
import {Utils} from '../../utils'
import BoardPermissionGate from '../permissions/boardPermissionGate'
@ -41,10 +42,12 @@ const TeamPermissionsRow = (): JSX.Element => {
return (
<div className='user-item'>
<div className='user-item__content'>
<CompassIcon
icon='mattermost'
className='user-item__img'
/>
{Utils.isFocalboardPlugin() &&
<CompassIcon
icon='mattermost'
className='user-item__img'
/>
}
<div className='ml-3'><strong>{intl.formatMessage({id: 'ShareBoard.teamPermissionsText', defaultMessage: 'Everyone at {teamName} Team'}, {teamName: team?.title})}</strong></div>
</div>
<div>

10
webapp/src/components/shareBoard/userPermissionsRow.tsx
View File

@ -40,10 +40,12 @@ const UserPermissionsRow = (props: Props): JSX.Element => {
return (
<div className='user-item'>
<div className='user-item__content'>
<img
src={Utils.getProfilePicture(user.id)}
className='user-item__img'
/>
{Utils.isFocalboardPlugin() &&
<img
src={Utils.getProfilePicture(user.id)}
className='user-item__img'
/>
}
<div className='ml-3'>
<strong>{user.username}</strong>
<strong className='ml-2 text-light'>{`@${user.username}`}</strong>

78
webapp/src/styles/_modifiers.scss Normal file
View File

@ -0,0 +1,78 @@
@charset 'UTF-8';
$positions: 't b l r';
$positions: 't'top,
'b'bottom,
'l'left,
'r'right;
@for $i from 0 through 20 {
@each $label,
$position in $positions {
.p#{$label}-#{$i} {
padding-#{$position}: #{$i*4}px !important;
}
}
@each $label,
$position in $positions {
.m#{$label}-#{$i} {
margin-#{$position}: #{$i*4}px !important;
}
}
.m-#{$i} {
margin: #{$i*4}px !important;
}
.p-#{$i} {
padding: #{$i*4}px !important;
}
.px-#{$i} {
padding: 0 #{$i*4}px 0 #{$i*4}px !important;
}
.py-#{$i} {
padding: #{$i*4}px 0 #{$i*4}px 0 !important;
}
.h-#{$i} {
height: #{$i*4}px !important;
}
}
.d-block {
display: block;
}
.w-full {
width: 100%;
}
.a11y--focused {
border-radius: 4px;
box-shadow: 0 0 1px 3px rgba(var(--link-color-rgb), 0.5), 0 0 0 1px var(--link-color);
}
.pos-relative {
position: relative;
}
.hidden-label {
position: absolute;
overflow: hidden;
width: 1px;
height: 1px;
padding: 0;
border: 0;
margin: -1px;
}
.overflow--visible {
overflow: visible;
}
.bg--white {
background: var(--center-channel-bg);
}

3
webapp/src/styles/main.scss
View File

@ -1,4 +1,5 @@
@import 'typography';
@import 'modifiers';
html {
height: 100%;
@ -59,7 +60,7 @@ html {
a {
text-decoration: none;
color: var(--link-color-rgb);
color: rgb(var(--link-color-rgb));
}
hr {

2
webapp/src/theme.ts
View File

@ -50,7 +50,7 @@ export const defaultTheme = {
sidebarTextActiveBorder: '93, 137, 243',
sidebarWhiteLogo: 'true',
link: '#0000ee',
link: '93, 137, 234',
linkVisited: '#551a8b',
propDefault: '#fff',