Skip to content

Commit

Permalink
Various UI updates on permissions (mattermost-community#2765)
Browse files Browse the repository at this point in the history
  • Loading branch information
asaadmahmood authored Apr 13, 2022
1 parent 539aee6 commit ec39401
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 18 deletions.
19 changes: 13 additions & 6 deletions webapp/src/components/boardsSwitcher/boardsSwitcher.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,29 @@
display: flex;
flex-direction: row;
background-color: rgba(var(--sidebar-text-rgb), 0.08);
color: rgba(var(--sidebar-text-rgb), 0.56);
flex: 1;
padding: 6px;
padding: 6px 8px;
gap: 6px;
border-radius: 4px;
cursor: pointer;
height: 28px;
align-items: center;
font-size: 12px;

&:hover {
background: rgba(var(--sidebar-text-rgb), 0.16);
color: var(--sidebar-text);
}
}

.CompassIcon.icon-magnify.CompassIcon {
font-size: 16px;
}

.add-board-icon {
margin-left: 8px;
padding-top: 4px;
cursor: pointer;
font-size: 16px;
width: 16px;
margin-left: 4px;
width: 28px;
height: 28px;
}
}
11 changes: 7 additions & 4 deletions webapp/src/components/boardsSwitcher/boardsSwitcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import BoardSwitcherDialog from '../boardsSwitcherDialog/boardSwitcherDialog'
import {Utils} from '../../utils'
import {Constants} from '../../constants'

import IconButton from '../../widgets/buttons/iconButton'

type Props = {
onBoardTemplateSelectorOpen?: () => void,
}
Expand Down Expand Up @@ -63,12 +65,13 @@ const BoardsSwitcher = (props: Props): JSX.Element => {

{
Utils.isFocalboardPlugin() &&
<span
<IconButton
size='small'
inverted={true}
className='add-board-icon'
onClick={props.onBoardTemplateSelectorOpen}
>
<AddIcon/>
</span>
icon={<AddIcon/>}
/>
}

{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
color: #484848;
}

.toolbar {
padding: 4px;
}

span {
display: inline-block;
height: 100%;
Expand Down
21 changes: 16 additions & 5 deletions webapp/src/components/searchDialog/searchDialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,18 +119,29 @@

.MagnifyIcon {
position: absolute;
left: 4px;
font-size: 22px;
top: 6px;
left: 10px;
font-size: 18px;
top: 10px;
width: 20px;
height: 20px;
opacity: 0.48;
}

.searchQuery {
height: 40px;
font-size: 14px;
border-radius: 4px;
border: 2px solid rgb(var(--button-bg-rgb));
padding: 0 33px;
border: 1px solid rgba(var(--center-channel-color-rgb), 0.16);
background: var(--center-channel-bg);
color: var(--center-channel-color);
padding: 0 34px;
flex: 1;
transition: border 0.15s ease-in;

&:focus {
padding: 0 33px;
border: 2px solid var(--button-bg);
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion webapp/src/components/searchDialog/searchDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const SearchDialog = (props: Props): JSX.Element => {
<div className='BoardSwitcherDialogBody'>
<div className='head'>
<h3 className='text-heading4'>{props.title}</h3>
<h5 className='text-heading1'>{props.subTitle}</h5>
<h5>{props.subTitle}</h5>
<div className='queryWrapper'>
<Search/>
<input
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/widgets/buttons/iconButton.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

&:hover {
color: rgba(var(--sidebar-text-rgb), 1);
background-color: rgba(var(--button-bg-rgb), 0.08);
background-color: rgba(var(--sidebar-text-rgb), 0.08);
}

&:active {
color: rgba(var(--sidebar-text-rgb), 1);
background-color: rgba(var(--button-bg-rgb), 0.16);
background-color: rgba(var(--sidebar-text-rgb), 0.16);
}
}

Expand Down

0 comments on commit ec39401

Please sign in to comment.