Change Admin icon and make Dashboard filter panel color consistent (#7190)

* Change Admin icon and make Dashboard filter panel color consistent

* Fix the button in not found page

* change to current color
This commit is contained in:
Ashish Gupta 2022-09-03 18:56:06 +05:30 committed by GitHub
parent af6192774d
commit 6ebaa23bc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 10 deletions

View File

@ -0,0 +1,12 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_13758_29473)">
<path d="M8.00049 9C9.37898 9 10.5005 7.87849 10.5005 6.5C10.5005 5.12151 9.37898 4 8.00049 4C6.622 4 5.50049 5.12151 5.50049 6.5C5.50049 7.87849 6.622 9 8.00049 9ZM8.00049 4.5895C9.05393 4.5895 9.91099 5.44656 9.91099 6.5C9.91099 7.55344 9.05393 8.4105 8.00049 8.4105C6.94705 8.4105 6.08999 7.55344 6.08999 6.5C6.08999 5.44656 6.94705 4.5895 8.00049 4.5895Z" fill="currentColor" stroke="currentColor" stroke-width="0.3"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.10565 9.96699L3.83231 10.6901L4.32513 10.1984L3.59931 9.46352L4.3914 8.64657C4.50045 8.53428 4.51907 8.36388 4.43613 8.23254C4.39805 8.17154 4.36152 8.07461 4.34671 8.03529L4.34623 8.03403C4.33703 8.00841 4.32847 7.98167 4.31996 7.95424C4.29973 7.89037 4.27822 7.8242 4.24839 7.75756C4.19317 7.63525 4.07013 7.55653 3.93397 7.55681L2.79791 7.54022L2.80277 5.46714L3.94479 5.46408C4.1074 5.46143 4.24283 5.35556 4.28061 5.20353C4.308 5.09525 4.33247 5.03776 4.35093 4.9996L4.3876 4.91186C4.39042 4.90498 4.39319 4.89812 4.39595 4.89128C4.41096 4.85402 4.42568 4.8175 4.44674 4.78353C4.53027 4.65001 4.51041 4.47814 4.39906 4.36724L3.58117 3.53451L5.03173 2.08102L5.84795 2.89365C5.96237 3.00718 6.14219 3.02714 6.2789 2.93924C6.30585 2.92241 6.33711 2.90984 6.36794 2.89745C6.37312 2.89537 6.37828 2.89329 6.38341 2.8912C6.41893 2.8767 6.45399 2.8616 6.48725 2.84599C6.50488 2.8399 6.52327 2.83403 6.54196 2.82806C6.54563 2.82689 6.54931 2.82571 6.553 2.82453C6.61778 2.80426 6.68416 2.78251 6.75125 2.75254C6.87505 2.69671 6.95456 2.57473 6.95422 2.44072L6.96178 1.28165L9.02168 1.29566L9.02433 2.43867C9.02454 2.59327 9.13146 2.72826 9.28345 2.76535C9.38972 2.79152 9.44656 2.81623 9.48511 2.83472L9.57219 2.87102C9.57926 2.87395 9.58633 2.87682 9.59337 2.87968C9.63065 2.89481 9.66725 2.90967 9.70113 2.93077C9.83842 3.01612 10.0177 2.99504 10.1322 2.88021L10.9482 2.06339L12.3939 3.53101L11.5818 4.34797C11.4707 4.46046 11.4507 4.63263 11.5346 4.76532C11.5515 4.79263 11.5641 4.82362 11.5765 4.8541C11.5792 4.86059 11.5818 4.86705 11.5845 4.87345C11.5988 4.90924 11.6136 4.94376 11.6291 4.97648C11.6357 4.99536 11.6419 5.01534 11.6482 5.03556C11.6491 5.03857 11.65 5.04158 11.651 5.0446C11.6711 5.10782 11.692 5.17375 11.7217 5.23974C11.7766 5.3628 11.9 5.44178 12.0363 5.44147L13.1782 5.43844C13.1849 5.43855 13.2032 5.45622 13.2127 5.48971L13.2074 7.53099L12.0656 7.53402C11.904 7.53649 11.7675 7.64255 11.7298 7.79458C11.7024 7.90286 11.6779 7.96034 11.6595 7.99866L11.623 8.08553C11.6199 8.09293 11.6169 8.10033 11.6139 8.1077C11.5989 8.14488 11.5841 8.18147 11.5631 8.21535C11.4801 8.34894 11.5003 8.52023 11.6113 8.63086L12.4292 9.46359L11.7769 10.1174L12.2856 10.5777L12.9207 9.9386C13.0533 9.80558 13.127 9.62229 13.1237 9.43538C13.1205 9.25013 13.0448 9.07986 12.9199 8.96439L12.2705 8.31813L12.2856 8.28042C12.2961 8.25909 12.3063 8.23646 12.316 8.21291L13.2051 8.21085C13.3953 8.20915 13.5717 8.13868 13.7034 8.00872C13.836 7.8774 13.9081 7.70063 13.9078 7.50978L13.9023 5.4528C13.9025 5.43607 13.9011 5.41946 13.8987 5.40304C13.8414 5.02917 13.5395 4.75782 13.1803 4.75861L12.2842 4.76112C12.2798 4.74812 12.275 4.73551 12.2701 4.72292C12.2664 4.71182 12.2618 4.70171 12.2566 4.69154C12.251 4.67992 12.2455 4.66746 12.24 4.65465L12.886 4.00508C13.018 3.87183 13.0918 3.68818 13.0883 3.5013C13.0845 3.31634 13.0088 3.14623 12.8852 3.03237L11.441 1.58503C11.3067 1.45091 11.1202 1.3767 10.9292 1.38141C10.7447 1.38593 10.5674 1.46466 10.4528 1.58892L9.81317 2.23277L9.78477 2.221C9.76234 2.20998 9.73859 2.19921 9.71357 2.189L9.71144 1.29008C9.71042 0.900046 9.40206 0.59514 9.00924 0.596275L6.96364 0.602051C6.77331 0.603092 6.59671 0.674442 6.46575 0.804446C6.33348 0.935705 6.2613 1.11198 6.26131 1.30338L6.26375 2.20394C6.25179 2.20784 6.23993 2.21223 6.22842 2.21673C6.21703 2.22086 6.20594 2.22578 6.19545 2.2311C6.1931 2.23221 6.19073 2.23334 6.18836 2.23447C6.18184 2.23757 6.17526 2.2407 6.16865 2.24366L5.5229 1.60111C5.3886 1.46715 5.20215 1.39294 5.01113 1.39765C4.82665 1.4025 4.6493 1.4809 4.53472 1.605L3.08828 3.06044C2.95625 3.19385 2.88249 3.37733 2.88594 3.56421C2.88976 3.74934 2.96549 3.91945 3.08989 4.03417L3.73901 4.68013L3.72396 4.71817C3.71352 4.73949 3.70333 4.76213 3.69381 4.78564L2.80399 4.78783C2.61394 4.78848 2.43709 4.86038 2.3057 4.99081C2.17357 5.12187 2.10148 5.29864 2.10203 5.48926L2.10748 7.52923C2.09868 7.71838 2.16593 7.89731 2.29767 8.0331C2.42596 8.16514 2.60523 8.24034 2.78904 8.24017L3.68546 8.23761C3.68986 8.25028 3.69421 8.26263 3.69899 8.27456C3.7078 8.29805 3.71744 8.32325 3.72831 8.34956L3.10465 8.99281C2.97219 9.12579 2.8984 9.30911 2.90186 9.49599C2.90501 9.68124 2.9808 9.85168 3.10565 9.96699Z" fill="currentColor" stroke="currentColor" stroke-width="0.2"/>
<path d="M11.0645 9.40147C10.7376 9.31524 10.3778 9.35683 10.0777 9.51558C9.43206 9.85703 8.73613 10.0302 8.00932 10.0302C7.28252 10.0302 6.58663 9.85703 5.94094 9.51558C5.64081 9.35688 5.28109 9.31528 4.95412 9.40151C3.50949 9.78231 2.50049 11.0928 2.50049 12.5883V13.677C2.50049 14.6808 3.31716 15.4974 4.32091 15.4974H11.6976C12.7014 15.4974 13.5181 14.6808 13.5181 13.677V12.5883C13.5182 11.0927 12.5092 9.78226 11.0645 9.40147ZM12.828 13.6769C12.828 14.3001 12.3209 14.8072 11.6977 14.8072H4.32095C3.69772 14.8072 3.19071 14.3001 3.19071 13.6769V12.5883C3.19071 11.4058 3.98824 10.3698 5.13007 10.0688C5.1852 10.0543 5.24221 10.0472 5.29935 10.0472C5.40964 10.0472 5.5203 10.0738 5.61835 10.1256C6.36448 10.5202 7.16891 10.7203 8.00937 10.7203C8.84982 10.7203 9.6543 10.5202 10.4004 10.1256C10.5492 10.047 10.7271 10.0262 10.8886 10.0688C12.0304 10.3698 12.828 11.4058 12.828 12.5883V13.6769Z" fill="currentColor" stroke="currentColor" stroke-width="0.3"/>
</g>
<defs>
<clipPath id="clip0_13758_29473">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.8538 0.500001H1.14606C0.904295 0.499555 0.68265 0.63132 0.572132 0.841164C0.460089 1.05383 0.479754 1.30993 0.622894 1.50416L5.64483 8.40593C5.6465 8.40831 5.64833 8.41054 5.65001 8.41292C5.83248 8.65325 5.93111 8.9443 5.93172 9.24352V14.8705C5.93065 15.0372 5.99772 15.1972 6.11815 15.3154C6.23857 15.4337 6.40229 15.5 6.57302 15.5C6.65991 15.5 6.74574 15.483 6.82592 15.4506L9.64786 14.4008C9.90075 14.3256 10.0686 14.0928 10.0686 13.8125V9.24352C10.069 8.94444 10.1678 8.65325 10.3501 8.41292C10.3518 8.41054 10.3536 8.40831 10.3553 8.40593L15.3771 1.50386C15.5202 1.30978 15.5399 1.05383 15.4279 0.841164C15.3174 0.63132 15.0957 0.499555 14.8538 0.500001V0.500001ZM9.72088 7.96185C9.44039 8.33321 9.28871 8.78219 9.2878 9.24352V13.72L6.7122 14.678V9.24352C6.71129 8.78219 6.55961 8.33321 6.27897 7.96185L1.40353 1.26145H14.5965L9.72088 7.96185Z" fill="#7147E8" stroke="#7147E8" stroke-width="0.3"/>
</svg>

After

Width:  |  Height:  |  Size: 1019 B

View File

@ -159,10 +159,10 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
tag="button"
variant="link"
onClick={() => setFieldListVisible((visible) => !visible)}>
<span className="tw-font-medium tw-text-grey">
<span className="tw-font-medium tw-text-primary">
{feedFilterList.find((f) => f.value === feedFilter)?.name}
</span>
<DropDownIcon />
<DropDownIcon style={{ color: '#7147E8' }} />
</Button>
{fieldListVisible && (
<DropDownList
@ -183,15 +183,20 @@ const ActivityFeedList: FC<ActivityFeedListProp> = ({
tag="button"
variant="link"
onClick={() => setShowThreadTypeList((visible) => !visible)}>
<SVGIcons alt="filter" icon={Icons.FILTERS} width="14px" />
<span className="tw-font-medium tw-text-grey tw-ml-1">
<SVGIcons
alt="filter"
className="tw-text-primary"
icon={Icons.FILTER_PRIMARY}
width="14px"
/>
<span className="tw-font-medium tw-text-primary tw-ml-1">
{
threadFilterList.find(
(f) => f.value === (threadType ?? 'ALL')
)?.name
}
</span>
<DropDownIcon />
<DropDownIcon style={{ color: '#7147E8' }} />
</Button>
{showThreadTypeList && (
<DropDownList

View File

@ -11,11 +11,11 @@
* limitations under the License.
*/
import { Button } from 'antd';
import React from 'react';
import { Link } from 'react-router-dom';
import notFoundImage from '../../assets/img/404-image.png';
import notFoundNumber from '../../assets/svg/404-number.svg';
import { Button } from '../../components/buttons/Button/Button';
import { ROUTES } from '../../constants/constants';
const PageNotFound = () => {
@ -35,14 +35,14 @@ const PageNotFound = () => {
<p className="tw-text-lg tw-text-grey-muted-muted">
The page you are looking for is not available
</p>
<div className="tw-text-center tw-mt-16" data-testid="route-links">
<div className="tw-text-center tw-mt-10" data-testid="route-links">
<Link to={ROUTES.HOME}>
<Button className="tw-mr-5" theme="primary">
<Button className="tw-mr-5" type="primary">
Go To Homepage
</Button>
</Link>
<Link to={ROUTES.EXPLORE}>
<Button className="tw-opacity-40" theme="primary">
<Button ghost type="primary">
Explore
</Button>
</Link>

View File

@ -14,6 +14,7 @@
import { ItemType } from 'antd/lib/menu/hooks/useItems';
import { camelCase } from 'lodash';
import React, { ReactNode } from 'react';
import { ReactComponent as AdminIcon } from '../../src/assets/svg/admin.svg';
import { ReactComponent as AllActivityIcon } from '../../src/assets/svg/all-activity.svg';
import { ReactComponent as BotIcon } from '../../src/assets/svg/bot-profile.svg';
import { ReactComponent as DashboardIcon } from '../../src/assets/svg/dashboard-grey.svg';
@ -78,7 +79,7 @@ export const getGlobalSettingsMenuWithPermission = (
ResourceEntity.USER,
permissions
),
icon: <UsersIcon className="side-panel-icons" />,
icon: <AdminIcon className="side-panel-icons" />,
},
],
},

View File

@ -21,6 +21,7 @@ import IconOkta from '../assets/img/icon-okta.png';
import IconWelcomePopper from '../assets/img/welcome-popper-icon.png';
import IconCommentPlus from '../assets/svg/add-chat.svg';
import IconAddReaction from '../assets/svg/add-reaction-emoji.svg';
import IconAdmin from '../assets/svg/admin.svg';
import IconAlertBell from '../assets/svg/alert-bell.svg';
import IconAllActivity from '../assets/svg/all-activity.svg';
import IconAnnouncementsBlack from '../assets/svg/announcements-black.svg';
@ -63,6 +64,7 @@ import IconExternalLinkGrey from '../assets/svg/external-link-grey.svg';
import IconExternalLinkWhite from '../assets/svg/external-link-white.svg';
import IconExternalLink from '../assets/svg/external-link.svg';
import IconFailBadge from '../assets/svg/fail-badge.svg';
import IconFilterPrimary from '../assets/svg/filter-primary.svg';
import IconFitView from '../assets/svg/fitview.svg';
import IconForeignKey from '../assets/svg/foriegnKey.svg';
import IconGithubStar from '../assets/svg/github-star.svg';
@ -357,6 +359,8 @@ export const Icons = {
ALL_ACTIVITY: 'all-activity',
OPEN_LOCK: 'open-lock',
CLOSED_LOCK: 'closed-lock',
FILTER_PRIMARY: 'filter-primary',
ADMIN: 'admin',
};
const SVGIcons: FunctionComponent<Props> = ({
@ -1037,6 +1041,10 @@ const SVGIcons: FunctionComponent<Props> = ({
case Icons.ALL_ACTIVITY:
IconComponent = IconAllActivity;
break;
case Icons.FILTER_PRIMARY:
IconComponent = IconFilterPrimary;
break;
case Icons.OPEN_LOCK:
@ -1049,6 +1057,11 @@ const SVGIcons: FunctionComponent<Props> = ({
break;
case Icons.ADMIN:
IconComponent = IconAdmin;
break;
default:
IconComponent = null;