diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js index 36ea5c9cd9..fad1e624df 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/header/Headers.js @@ -110,7 +110,7 @@ export default function Header() { } } }) - + function createNewAccount() { api.saveToAccount(newAccount).then(resp => { setShowCreateAccount(false) @@ -165,7 +165,7 @@ export default function Header() { }, ]} initials={func.initials(username)} - name={username} + name={accounts[activeAccount]} open={isUserMenuOpen} onToggle={toggleIsUserMenuOpen} /> diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css index 2a197cd484..ba89c69533 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/layouts/leftnav/LeftNav.css @@ -41,4 +41,16 @@ content: url(data:image/svg+xml,%3Csvg%20width%3D%2221%22%20height%3D%2228%22%20viewBox%3D%220%200%2021%2028%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%0A%3Cpath%20d%3D%22M9%2024.75C9%2024.3358%209.33579%2024%209.75%2024V24C10.1642%2024%2010.5%2024.3358%2010.5%2024.75V28H9V24.75Z%22%20fill%3D%22%23B5B5B5%22%2F%3E%0A%3C%2Fsvg%3E) !important; left: var(--p-space-200) !important; opacity: 1 !important; +} + +.Polaris-Navigation, .Polaris-Navigation__PrimaryNavigation:hover{ + border-top-left-radius: var(--p-border-radius-300) !important; +} +.Polaris-Frame.Polaris-Frame--hasNav.Polaris-Frame--hasTopBar, .Polaris-Frame__Navigation { + background-color: black; + background-clip: padding-box; +} + +.editor-navbar { + scrollbar-width: none; } \ No newline at end of file diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SearchField.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SearchField.jsx index 843dec80fd..b49c009068 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SearchField.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/components/shared/SearchField.jsx @@ -5,7 +5,7 @@ import React, { useState } from 'react' function SearchField(props) { const [searchValue, setSearchValue] = useState("") - const SearchIcon = ( + const SearchFieldIcon = ( @@ -23,7 +23,7 @@ function SearchField(props) { return ( } topBar={
} logo={logo} > - + diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/issues/transform.js b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/issues/transform.js index a599916c6d..c29a44a473 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/issues/transform.js +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/issues/transform.js @@ -30,7 +30,7 @@ const transform = { {urls.map((ele,index)=>{ - const borderStyle = index < (urls.length - 1) ? {borderBlockEndWidth : 1} : {} + const borderStyle = index < (urls.length - 1) ? {borderBlockEndWidth : "025"} : {} return ( diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx index e0cb1d7e46..4c05c7e1fd 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/settings/Settings.jsx @@ -35,7 +35,7 @@ const Settings = () => { return ( } topBar={}> - + diff --git a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.jsx b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.jsx index 92ca21c648..3685345d07 100644 --- a/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.jsx +++ b/apps/dashboard/web/polaris_web/web/src/apps/dashboard/pages/test_editor/TestEditor.jsx @@ -159,7 +159,7 @@ const TestEditor = () => { } navigation={ addCustomTest(e)}/> } > - + diff --git a/apps/dashboard/web/polaris_web/web/src/util/func.js b/apps/dashboard/web/polaris_web/web/src/util/func.js index da455e0207..0a39ecb420 100644 --- a/apps/dashboard/web/polaris_web/web/src/util/func.js +++ b/apps/dashboard/web/polaris_web/web/src/util/func.js @@ -20,6 +20,8 @@ import { MobileIcon, CalendarTimeIcon, IdentityCardFilledIcon, + CheckCircleIcon, + XCircleIcon } from "@shopify/polaris-icons"; import { saveAs } from 'file-saver' import inventoryApi from "../apps/dashboard/pages/observe/api" @@ -30,8 +32,6 @@ import homeFunctions from '../apps/dashboard/pages/home/module'; import {themes} from '@shopify/polaris-tokens'; import PersistStore from '../apps/main/PersistStore'; -import { circle_cancel, circle_tick_minor } from "@/apps/dashboard/components/icons"; - const iconsUsedMap = { CalendarIcon,ClockIcon,AlertCircleIcon,DatabaseIcon, LockIcon, KeyIcon, ProfileIcon, PasskeyIcon, EmailIcon, CreditCardIcon, IdentityCardIcon, LocationIcon,PhoneIcon, FileIcon, ImageIcon, BankIcon, HashtagIcon, @@ -290,12 +290,14 @@ prettifyEpoch(epoch) { case "STOPPED": return{ tooltipContent: "Error occurred while running the test.", - icon: circle_cancel, + icon: XCircleIcon, + icon:"critical" } case "COMPLETED": return { tooltipContent: "Test has been completed.", - icon: circle_tick_minor + icon: CheckCircleIcon, + color:"success" } default: return {