Skip to content

Commit c1457e3

Browse files
authored
Merge pull request #1868 from amitpanwar789/feature/polaris_upgradation_v12
Feature/polaris upgradation v12
2 parents d1644ef + a624d9b commit c1457e3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+519
-278
lines changed
Loading

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/DateRangeFilter.jsx

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ function DateRangeFilter(props){
2424
sectioned={false}
2525
fullHeight
2626
activator={
27+
<div className="polaris-secondaryAction-button">
2728
<Button
2829
icon={CalendarIcon}
2930
onClick={() => setPopoverActive(!popoverActive)}
@@ -32,6 +33,7 @@ function DateRangeFilter(props){
3233
{func.getDateValue(initialDispatch)}
3334
</span>
3435
</Button>
36+
</div>
3537
}
3638
onClose={() => setPopoverActive(false)}
3739
>

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/FlyLayout.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function FlyLayout(props) {
1515
return (
1616
<div className={"flyLayout " + (show ? "show" : "")} style={{width: divWidth}}>
1717
<div className="innerFlyLayout">
18-
<Box borderColor="border-secondary" borderWidth="1" background="bg" width={divWidth} minHeight="100%">
18+
<Box borderColor="border-secondary" borderWidth="025" background="bg-surface" width={divWidth} minHeight="100%">
1919
{ loading ? <div style={{position: "absolute", right: "25vw" , top: "50vh"}}><Spinner size="large" /></div>:
2020
<BlockStack gap={"500"}>
2121
<Box padding={"400"} paddingBlockEnd={"0"} >

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/LearnPopoverComponent.jsx

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { ActionList, Box, Button, Icon, Popover, Text, BlockStack } from '@shopify/polaris'
22
import { PlayIcon, NoteIcon } from "@shopify/polaris-icons";
33
import React, { useState } from 'react'
4+
import '../../pages/observe/api_collections/apiCollections.css'
45

56
function LearnPopoverComponent({learnMoreObj}) {
67
const [popoverActive,setPopoverActive] = useState(false)
@@ -23,9 +24,11 @@ function LearnPopoverComponent({learnMoreObj}) {
2324
<Popover
2425
active={popoverActive}
2526
activator={(
26-
<Button onClick={() => setPopoverActive(!popoverActive)} disclosure>
27-
Learn
28-
</Button>
27+
<div className="polaris-secondaryAction-button">
28+
<Button variant="secondary" onClick={() => setPopoverActive(!popoverActive)} disclosure>
29+
Learn
30+
</Button>
31+
</div>
2932
)}
3033
autofocusTarget="first-node"
3134
onClose={() => { setPopoverActive(false) }}

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.css

+10-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@
1414
fill: #6D3BEF !important;
1515
}
1616

17-
.local_icon .Polaris-Icon__Svg {
18-
fill: #2C6ECB !important;
19-
}
17+
/* .Polaris-TopBar-Menu__Activator:not(:hover){
18+
background: transparent !important;
19+
} */
20+
21+
.Polaris-TopBar-Menu__Activator:hover{
22+
--border-gradient-bg-hover: var(--p-color-bg-fill-hover)!important;
23+
--border-gradient-border-hover: var(--p-color-border-gradient-hover)!important;
24+
--border-gradient-bg-selected: var(--p-color-button-gradient-bg-fill-selected)!important;
25+
--border-gradient-border-selected: var(--p-color-border-gradient-selected)!important;
26+
}

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export default function Header() {
110110
}
111111
}
112112
})
113-
113+
114114
function createNewAccount() {
115115
api.saveToAccount(newAccount).then(resp => {
116116
setShowCreateAccount(false)
@@ -165,6 +165,7 @@ export default function Header() {
165165
},
166166
]}
167167
initials={func.initials(username)}
168+
name={accounts[activeAccount]}
168169
open={isUserMenuOpen}
169170
onToggle={toggleIsUserMenuOpen}
170171
/>
@@ -227,8 +228,8 @@ export default function Header() {
227228
<SemiCircleProgress key={"progress"} progress={progress} size={60} height={55} width={75}/>
228229
</Button>
229230
<BlockStack gap={"0"}>
230-
<Text fontWeight="medium">Test run status</Text>
231-
<Text tone="subdued" variant="bodySm">{`${currentTestsObj.totalTestsQueued} tests queued`}</Text>
231+
<Text fontWeight="medium"><div style={{color: "#FFFFFF"}}>Test run status</div></Text>
232+
<Text variant="bodySm"><div style={{color: "#FFFFFF"}}>{`${currentTestsObj.totalTestsQueued} tests queued`}</div></Text>
232233
</BlockStack>
233234
</InlineStack> : null}
234235
<TopBar.Menu

apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css

+43-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)