Skip to content

Commit cc48f9c

Browse files
authored
Merge pull request #186 from calibreapp/realign-provider-defaults
💅 Realign RLCL defaults with provider's latest defaults
2 parents 72f4aae + 06c5acb commit cc48f9c

7 files changed

Lines changed: 47 additions & 49 deletions

File tree

src/components/Drift/index.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const styles: {
1414
fontSize: 16,
1515
display: 'flex',
1616
alignItems: 'flex-end',
17-
padding: '.75rem',
17+
padding: '12px',
1818
flexDirection: 'column'
1919
},
2020
button: {
@@ -24,8 +24,8 @@ const styles: {
2424
alignItems: 'center',
2525
fill: '#fff',
2626
cursor: 'pointer',
27-
height: 52,
28-
width: 52,
27+
height: '56px',
28+
width: '56px',
2929
borderRadius: '.3125rem',
3030
boxShadow: '0 2px 6px 0 rgba(0,0,0,.4)',
3131
overflow: 'hidden',
@@ -56,9 +56,7 @@ const Drift = ({
5656
const [positionStyles, setPositionStyles] = useState<CSSProperties>({
5757
zIndex: 2147483648,
5858
position: 'fixed',
59-
display: 'block',
60-
height: '60px !important',
61-
width: '76px !important'
59+
display: 'block'
6260
})
6361

6462
useEffect(() => {
@@ -96,8 +94,8 @@ const Drift = ({
9694
>
9795
{icon === 'A' ? (
9896
<svg
99-
width="20"
100-
height="20"
97+
width="24"
98+
height="24"
10199
viewBox="0 0 20 20"
102100
focusable="false"
103101
aria-hidden="true"
@@ -106,10 +104,9 @@ const Drift = ({
106104
}}
107105
>
108106
<path
107+
fill="#FFFFFF"
109108
d="M4.583 14.894l-3.256 3.78c-.7.813-1.26.598-1.25-.46a10689.413 10689.413 0 0 1 .035-4.775V4.816a3.89 3.89 0 0 1 3.88-3.89h12.064a3.885 3.885 0 0 1 3.882 3.89v6.185a3.89 3.89 0 0 1-3.882 3.89H4.583z"
110-
fill="rgb(255, 255, 255)"
111-
fillRule="evenodd"
112-
/>
109+
></path>
113110
</svg>
114111
) : icon === 'B' ? (
115112
<svg

src/components/HelpScout/index.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ interface Props extends ProviderProps {
166166
}
167167

168168
const HelpScout = ({
169-
color = '#976ad4',
170-
icon = 'beacon',
169+
color = '#527ceb',
170+
icon = 'message',
171171
zIndex = '1050',
172-
horizontalPosition = 'left',
172+
horizontalPosition = 'right',
173173
containerClass = ClassNames.container
174174
}: Props): JSX.Element | null => {
175175
const [state, loadChat] = useChat({ loadWhenIdle: true })
@@ -181,17 +181,17 @@ const HelpScout = ({
181181

182182
useEffect(() => {
183183
setPositionStyles({
184-
bottom: windowHeight < 740 ? '10px' : '40px',
184+
bottom: windowHeight <= 740 ? '10px' : '40px',
185185
right:
186186
horizontalPosition === 'left'
187187
? 'auto'
188-
: windowHeight < 740
188+
: windowHeight <= 740
189189
? '20px'
190190
: '40px',
191191
left:
192192
horizontalPosition === 'right'
193193
? 'auto'
194-
: windowHeight < 740
194+
: windowHeight <= 740
195195
? '20px'
196196
: '40px'
197197
})

src/components/Intercom/index.tsx

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,18 @@ const Intercom = ({
149149
>
150150
<svg
151151
focusable="false"
152-
viewBox="0 0 16 14"
153-
width="28"
154-
height="25"
155-
style={{ width: '16px' }}
152+
width="24"
153+
height="24"
154+
viewBox="0 0 24 24"
155+
fill="none"
156+
xmlns="http://www.w3.org/2000/svg"
156157
>
157158
<path
158-
fill="rgb(255, 255, 255)"
159159
fillRule="evenodd"
160160
clipRule="evenodd"
161-
d="M.116 4.884l1.768-1.768L8 9.232l6.116-6.116 1.768 1.768L8 12.768.116 4.884z"
162-
/>
161+
d="M18.601 8.39897C18.269 8.06702 17.7309 8.06702 17.3989 8.39897L12 13.7979L6.60099 8.39897C6.26904 8.06702 5.73086 8.06702 5.39891 8.39897C5.06696 8.73091 5.06696 9.2691 5.39891 9.60105L11.3989 15.601C11.7309 15.933 12.269 15.933 12.601 15.601L18.601 9.60105C18.9329 9.2691 18.9329 8.73091 18.601 8.39897Z"
162+
fill="white"
163+
></path>
163164
</svg>
164165
</div>
165166
</div>

src/components/Messenger/index.tsx

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,24 @@ const Widget = ({
9292
onClick={() => loadChat({ open: true })}
9393
onMouseEnter={() => loadChat({ open: false })}
9494
>
95-
<svg width="60px" height="60px" viewBox="0 0 60 60">
96-
<svg x="0" y="0" width="60px" height="60px">
97-
<g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
98-
<g>
99-
<circle fill={color ? color : '#0084FF'} cx="30" cy="30" r="30" />
100-
<svg x="10" y="10">
101-
<g transform="translate(0.000000, -10.000000)" fill="#FFFFFF">
102-
<g id="logo" transform="translate(0.000000, 10.000000)">
103-
<path d="M20,0 C31.2666,0 40,8.2528 40,19.4 C40,30.5472 31.2666,38.8 20,38.8 C17.9763,38.8 16.0348,38.5327 14.2106,38.0311 C13.856,37.9335 13.4789,37.9612 13.1424,38.1098 L9.1727,39.8621 C8.1343,40.3205 6.9621,39.5819 6.9273,38.4474 L6.8184,34.8894 C6.805,34.4513 6.6078,34.0414 6.2811,33.7492 C2.3896,30.2691 0,25.2307 0,19.4 C0,8.2528 8.7334,0 20,0 Z M7.99009,25.07344 C7.42629,25.96794 8.52579,26.97594 9.36809,26.33674 L15.67879,21.54734 C16.10569,21.22334 16.69559,21.22164 17.12429,21.54314 L21.79709,25.04774 C23.19919,26.09944 25.20039,25.73014 26.13499,24.24744 L32.00999,14.92654 C32.57369,14.03204 31.47419,13.02404 30.63189,13.66324 L24.32119,18.45264 C23.89429,18.77664 23.30439,18.77834 22.87569,18.45674 L18.20299,14.95224 C16.80079,13.90064 14.79959,14.26984 13.86509,15.75264 L7.99009,25.07344 Z" />
104-
</g>
105-
</g>
106-
</svg>
107-
</g>
108-
</g>
95+
<div
96+
style={{
97+
width: '60px',
98+
height: '60px',
99+
backgroundColor: color ? color : '#0A7CFF',
100+
display: 'flex',
101+
justifyContent: 'center',
102+
alignItems: 'center',
103+
borderRadius: '60px'
104+
}}
105+
>
106+
<svg width="36" height="36" viewBox="0 0 36 36">
107+
<path
108+
fill="white"
109+
d="M1 17.99C1 8.51488 8.42339 1.5 18 1.5C27.5766 1.5 35 8.51488 35 17.99C35 27.4651 27.5766 34.48 18 34.48C16.2799 34.48 14.6296 34.2528 13.079 33.8264C12.7776 33.7435 12.4571 33.767 12.171 33.8933L8.79679 35.3828C7.91415 35.7724 6.91779 35.1446 6.88821 34.1803L6.79564 31.156C6.78425 30.7836 6.61663 30.4352 6.33893 30.1868C3.03116 27.2287 1 22.9461 1 17.99ZM12.7854 14.8897L7.79161 22.8124C7.31238 23.5727 8.24695 24.4295 8.96291 23.8862L14.327 19.8152C14.6899 19.5398 15.1913 19.5384 15.5557 19.8116L19.5276 22.7905C20.7193 23.6845 22.4204 23.3706 23.2148 22.1103L28.2085 14.1875C28.6877 13.4272 27.7531 12.5704 27.0371 13.1137L21.673 17.1847C21.3102 17.4601 20.8088 17.4616 20.4444 17.1882L16.4726 14.2094C15.2807 13.3155 13.5797 13.6293 12.7854 14.8897Z"
110+
></path>
109111
</svg>
110-
</svg>
112+
</div>
111113
</div>
112114
)
113115
}

src/components/Userlike/index.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const styles: {
3131
border: '0'
3232
},
3333
icon: {
34-
fontSize: '36px'
34+
fontSize: '40px'
3535
}
3636
}
3737

@@ -48,8 +48,8 @@ const Userlike = ({
4848
color = 'white',
4949
backgroundColor = '#0d8cff',
5050
position = 'right',
51-
vOffset = '24px',
52-
hOffset = '24px',
51+
vOffset = 'calc(0% + 20px)',
52+
hOffset = 'calc(0% + 24px)',
5353
style = 'round',
5454
containerClass = ClassNames.container
5555
}: Props): JSX.Element | null => {
@@ -88,16 +88,14 @@ const Userlike = ({
8888
<svg
8989
width="1em"
9090
height="1em"
91-
viewBox="0 0 36 36"
91+
viewBox="0 0 40 40"
9292
fill="none"
9393
style={{ ...styles.icon, color }}
9494
>
9595
<path
96-
fillRule="evenodd"
97-
clipRule="evenodd"
98-
d="M18 36c2.893 0 5.626-.682 8.047-1.895h5.11a2 2 0 002-2v-4.393A17.916 17.916 0 0036 18c0-9.941-8.059-18-18-18S0 8.059 0 18s8.059 18 18 18zM9.5 22a1.5 1.5 0 000 3h17a1.5 1.5 0 000-3h-17zm1.5-4a1.5 1.5 0 011.5-1.5h14a1.5 1.5 0 010 3h-14A1.5 1.5 0 0111 18zm-1.5-7a1.5 1.5 0 000 3h17a1.5 1.5 0 000-3h-17z"
96+
d="M37.4 30.7c-.1-.5 0-.9.2-1.4 1.5-2.8 2.3-6 2.3-9.4C40 9 31 0 20 0 9 0 0 9 0 20s9 20 20 20c3.3 0 6.5-.9 9.4-2.3.4-.2.9-.3 1.4-.2l6.8 1.3c.7.1 1.3-.5 1.2-1.2l-1.4-6.9zM21 29h-8c-1.1 0-2-.9-2-2s.9-2 2-2h8c1.1 0 2 .9 2 2s-.9 2-2 2zm6-7H13c-1.1 0-2-.9-2-2s.9-2 2-2h14c1.1 0 2 .9 2 2s-.9 2-2 2zm0-7H13c-1.1 0-2-.9-2-2s.9-2 2-2h14c1.1 0 2 .9 2 2s-.9 2-2 2z"
9997
fill="currentColor"
100-
/>
98+
></path>
10199
</svg>
102100
</button>
103101
</div>

website/pages/helpscout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const Page: NextPage = () => (
2525
<ExampleLinks />
2626
</div>
2727
</div>
28-
<HelpScout color="#527ceb" />
28+
<HelpScout />
2929
</Layout>
3030
</LiveChatLoaderProvider>
3131
)

website/pages/userlike.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const Page: NextPage = () => (
2525
<ExampleLinks />
2626
</div>
2727
</div>
28-
<Userlike vOffset="47px" hOffset="49px" />
28+
<Userlike />
2929
</Layout>
3030
</LiveChatLoaderProvider>
3131
)

0 commit comments

Comments
 (0)