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

Main nav cleanup POC #1680

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Main nav cleanup POC #1680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36fa523
chore: adjust size back up
robert-bo-davis Aug 4, 2023
c2d5c48
Merge branch 'master' into bo/fix/sidebar_icons
robert-bo-davis Sep 23, 2023
e9cdc8a
chore: nav icon updated based
robert-bo-davis Sep 23, 2023
db09d84
chore: comments for dirty hacks
robert-bo-davis Sep 25, 2023
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
2 changes: 1 addition & 1 deletion plugin-hrm-form/src/components/resources/ReferrableResourceSideLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const ReferrableResourceSideLink: React.FC<Props> = ({ showLabel, activeView, on
onClick={onClick}
data-testid="referrable-resources-side-link"
>
<Template code="ReferrableResource-SideNav" />
<Template code="Resources" />
</SideLink>
);
};
Expand Down
6 changes: 2 additions & 4 deletions plugin-hrm-form/src/components/sideLinks/CaseListSideLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@
/* eslint-disable react/prop-types */
import React from 'react';
import { Template, SideLink, SideNavChildrenProps } from '@twilio/flex-ui';
import FolderOpenIcon from '@material-ui/icons/FolderOpen';
import FolderIcon from '@material-ui/icons/Folder';

type Props = SideNavChildrenProps & { showLabel: boolean; onClick: () => void };

const CaseListSideLink: React.FC<Props> = ({ showLabel, activeView, onClick }) => {
return (
<SideLink
showLabel={showLabel}
icon={<FolderOpenIcon />}
iconActive={<FolderIcon />}
icon="Folder"
// iconActive={<FolderIcon />}
isActive={activeView === 'case-list'}
onClick={onClick}
>
Expand Down
7 changes: 3 additions & 4 deletions plugin-hrm-form/src/components/sideLinks/StandaloneSearchSideLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,16 @@
/* eslint-disable react/prop-types */
import React from 'react';
import { Template, SideLink, SideNavChildrenProps } from '@twilio/flex-ui';
import SearchIcon from '@material-ui/icons/Search';

type Props = SideNavChildrenProps & { showLabel: boolean; onClick: () => void };

const StandaloneSearchSideLink: React.FC<Props> = ({ showLabel, activeView, onClick }) => {
return (
<SideLink
showLabel={showLabel}
icon={<SearchIcon />}
iconActive={<SearchIcon />}
isActive={activeView === 'standalone-search'}
icon="Search"
// iconActive="searchBold"
isActive={activeView === 'search'}
onClick={onClick}
>
<Template code="StandaloneSearch-SideNav" />
Expand Down
6 changes: 4 additions & 2 deletions plugin-hrm-form/src/components/toolkits/CounselorToolkitSideLink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import React, { useState } from 'react';
import { connect, ConnectedProps } from 'react-redux';
import { InformationIcon } from '@twilio-paste/icons/cjs/InformationIcon';
import { SideLink, SideNavChildrenProps } from '@twilio/flex-ui';
import { Template, SideLink, SideNavChildrenProps } from '@twilio/flex-ui';
import { HelplineEntry } from 'hrm-form-definitions';

import CounselorToolkitDialog from './CounselorToolkitDialog';
Expand Down Expand Up @@ -68,7 +68,9 @@ const CounselorToolkitSideLink: React.FC<Props> = ({ showLabel, definitionVersio
showLabel={showLabel}
icon={<InformationIcon decorative={false} title="Counselor Toolkit" />}
iconActive={<InformationIcon decorative={false} title="Counselor Toolkit" />}
/>
>
<Template code="Counselor Toolkit" />
</SideLink>
</div>
<CounselorToolkitDialog
anchorEl={anchorEl}
Expand Down
155 changes: 93 additions & 62 deletions plugin-hrm-form/src/styles/global-overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,134 +17,165 @@
body,
body p,
body span {
font-family: Open Sans;
font-family: Open Sans;
}

div.Twilio-ModalPopupWithEntryControl {
padding-top: 7px;
padding-bottom: 7px;
padding-top: 7px;
padding-bottom: 7px;
}
div.Twilio-SideNav-Container {
margin-right: 5px;
margin-right: 5px;
}
div.Twilio-MainHeader {
margin-bottom: 5px;
margin-bottom: 5px;
}
div.Twilio-MainHeader img {
margin-left: -12px;
margin-left: -12px;
}
div.Twilio-MainHeader div.Twilio-Icon {
color: rgb(18, 28, 45);
color: rgb(18, 28, 45);
}
div.Twilio-MainHeader button span {
color: rgb(18, 28, 45);
color: rgb(18, 28, 45);
}
div.Twilio-MainHeader button.MuiButton-root {
background-color: rgb(18, 28, 45);
border: none;
background-color: rgb(18, 28, 45);
border: none;
}
div.Twilio-SideNav-default > div:hover {
background-color: #e4e6e7;
background-color: #e4e6e7;
}

div.Twilio-MainHeader button.MuiButton-root span {
color: rgb(248, 250, 252);
background-color: rgb(18, 28, 45);
color: rgb(248, 250, 252);
background-color: rgb(18, 28, 45);
}
div.Twilio-SideNav button.Twilio-Side-Link {
border-radius: 5px;
margin-bottom: 2px;
/* Fixes offset/icon jumping caused by 1px border in active state */
margin-left: 1px;
}
/* Dirty hack to fix the icon centering when border active */
div.Twilio-Side-Link-IconContainer .Twilio-Icon {
margin-left: -4px;
}
div.Twilio-SideNav button.Twilio-Side-Link:active {
border-radius: 5px;
background-color: #606b85;
}
div.Twilio-SideNav button.Twilio-Side-Link--Active svg path {
color: rgb(18, 28, 45);
color: rgb(18, 28, 45);
}
div.Twilio-SideNav button.Twilio-Side-Link--Active {
margin-bottom: 2px;
border-radius: 5px;
border-style: dotted;
}

button.Twilio-TaskListFilter-TaskFilterButton {
margin-right: 10px;
margin-right: 10px;
}
button.Twilio-TaskListFilter-TaskFilterButton > div.Twilio-Icon-Filter {
margin-left: auto;
margin-left: auto;
}
button.Twilio-TaskListFilter-TaskFilterButton > div.Twilio-Icon-FilterUp {
margin-left: auto;
margin-left: auto;
}
div.Twilio-TaskListBaseItem::before {
width: 0;
width: 0;
}
button.Twilio-TaskCanvasHeader-EndButton {
border-radius: 4px;
font-size: 13px;
letter-spacing: 0px;
border-radius: 4px;
font-size: 13px;
letter-spacing: 0px;
}
button.Twilio-MessageInput-SendButton {
background: rgba(216, 27, 96, 0.8);
color: #f6f6f6;
background: rgba(216, 27, 96, 0.8);
color: #f6f6f6;
}
button.Twilio-MessageInput-SendButton:hover {
background-color: rgba(0, 0, 0, 0.2);
background-color: rgba(0, 0, 0, 0.2);
}

a.link-text-decoration-none { text-decoration: none; color: #1874e1; }
a.link-text-decoration-none:visited { text-decoration: none; color: #1874e1; }
a.link-text-decoration-none:hover { text-decoration: none; color: #1874e1; }
a.link-text-decoration-none:focus { text-decoration: none; color: #1874e1; }
a.link-text-decoration-none:active { text-decoration: none; color: #1874e1; }
a.link-text-decoration-none {
text-decoration: none;
color: #1874e1;
}
a.link-text-decoration-none:visited {
text-decoration: none;
color: #1874e1;
}
a.link-text-decoration-none:hover {
text-decoration: none;
color: #1874e1;
}
a.link-text-decoration-none:focus {
text-decoration: none;
color: #1874e1;
}
a.link-text-decoration-none:active {
text-decoration: none;
color: #1874e1;
}

.editingContact .hiddenWhenEditingContact {
display: none;
display: none;
}

.Twilio-View-case-list
.Twilio-View-search
{
background-color: #f6f6f6;
.Twilio-View-case-list .Twilio-View-search {
background-color: #f6f6f6;
}

.Twilio-View-referrable-resources
{
background-color: #ECEDF1;
.Twilio-View-referrable-resources {
background-color: #ecedf1;
}

.Twilio-SidePanel-Title.Twilio-SidePanel-TranscriptPlayer-Title {
text-transform: capitalize;
letter-spacing: inherit;
font-size: 14px;
text-transform: capitalize;
letter-spacing: inherit;
font-size: 14px;
}
button.Twilio-TaskCanvasHeader-EndButton {
padding: 3px 16px;
font-weight: 600;
min-width: auto;
padding: 3px 16px;
font-weight: 600;
min-width: auto;
}
button.Twilio-TaskCanvasHeader-EndButton:hover{
border: 1px solid #BAC0C2;
background-color: rgb(220, 84, 84);
button.Twilio-TaskCanvasHeader-EndButton:hover {
border: 1px solid #bac0c2;
background-color: rgb(220, 84, 84);
}
button.Twilio-TaskCanvasHeader-EndButton:active {
border: 2px solid black;
border: 2px solid black;
}

div.Twilio-ViewCollection{
background-color: #f6f6f6;
div.Twilio-ViewCollection {
background-color: #f6f6f6;
}

div.Twilio-Splitter div.Twilio-AgentDesktopView\.Panel2 {
border-left-width: 0px;
border-left-width: 0px;
}

/**
* Conferencing Dialog was hidden after @twilio/[email protected]
* The following overrides will fix this issue
*/
div.Twilio-TaskDetailsPanel-Buttons > div.Twilio-CallCanvasActions {
overflow-x: visible;
width: 100%;
justify-content: center;
}
div.Twilio-TaskDetailsPanel-Buttons > div.Twilio-CallCanvasActions {
overflow-x: visible;
width: 100%;
justify-content: center;
}

/**
* Teams View CSS Overrides:
* 1. Make first column wider (Agent column)
*/
.Twilio-WorkersDataTable th:not(:first-of-type) {
width: calc(14rem) !important;
}
.Twilio-WorkersDataTable th:not(:first-of-type) {
width: calc(14rem) !important;
}

.Twilio-WorkersDataTable th:first-of-type {
width: auto !important;
}

.Twilio-WorkersDataTable th:first-of-type {
width: auto !important;
}
Loading