From 697bfef8612a2bcdc40d52b42c2387081f10862c Mon Sep 17 00:00:00 2001 From: Liraz Yehezkel Date: Wed, 30 Mar 2022 17:03:21 +0300 Subject: [PATCH 1/2] TLS icon position --- .../TrafficViewer/EntryListItem/EntryListItem.module.sass | 4 +++- .../components/TrafficViewer/EntryListItem/EntryListItem.tsx | 4 +--- ui-common/src/components/UI/Protocol.tsx | 2 +- ui-common/src/components/UI/style/StatusCode.module.sass | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.module.sass b/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.module.sass index 334fa0033..b137bb415 100644 --- a/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.module.sass +++ b/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.module.sass @@ -66,8 +66,10 @@ margin-top: -60px .capture img - height: 20px + height: 14px z-index: 1000 + margin-top: 12px + margin-left: -2px .endpointServiceContainer display: flex diff --git a/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.tsx b/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.tsx index e55b90fe0..8bc7f0b10 100644 --- a/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.tsx +++ b/ui-common/src/components/TrafficViewer/EntryListItem/EntryListItem.tsx @@ -140,8 +140,6 @@ export const EntryItem: React.FC = ({entry, style, headingMode}) => const isStatusCodeEnabled = ((entry.proto.name === "http" && "status" in entry) || entry.status !== 0); - let endpointServiceContainer = "10px"; - if (!isStatusCodeEnabled) endpointServiceContainer = "20px"; return
= ({entry, style, headingMode}) => {isStatusCodeEnabled &&
} -
+
= ({protocol, horizontal}) => { backgroundColor: protocol.backgroundColor, color: protocol.foregroundColor, fontSize: protocol.fontSize, - marginRight: "-20px", + marginRight: "-6px", }} title={protocol.longName} > diff --git a/ui-common/src/components/UI/style/StatusCode.module.sass b/ui-common/src/components/UI/style/StatusCode.module.sass index c9af8a775..4faa4344c 100644 --- a/ui-common/src/components/UI/style/StatusCode.module.sass +++ b/ui-common/src/components/UI/style/StatusCode.module.sass @@ -9,7 +9,7 @@ text-align: center line-height: 22px font-weight: 600 - margin-left: 8px + margin-left: 3px .neutral background: gray From ac94554d2fcf400ec5c1752f65f61dac74557829 Mon Sep 17 00:00:00 2001 From: Liraz Yehezkel Date: Wed, 30 Mar 2022 17:14:56 +0300 Subject: [PATCH 2/2] common versions --- ui-common/package.json | 4 ++-- ui/package.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui-common/package.json b/ui-common/package.json index 4ca4729f7..b0eedc50f 100644 --- a/ui-common/package.json +++ b/ui-common/package.json @@ -1,6 +1,6 @@ { "name": "@up9/mizu-common", - "version": "1.0.144", + "version": "1.0.147", "description": "Made with create-react-library", "author": "", "license": "MIT", @@ -90,4 +90,4 @@ "files": [ "dist" ] -} \ No newline at end of file +} diff --git a/ui/package.json b/ui/package.json index 9a23aedc6..4d997bc0f 100644 --- a/ui/package.json +++ b/ui/package.json @@ -13,7 +13,7 @@ "@types/jest": "^26.0.22", "@types/node": "^12.20.10", "@uiw/react-textarea-code-editor": "^1.4.12", - "@up9/mizu-common": "1.0.144", + "@up9/mizu-common": "1.0.147", "axios": "^0.25.0", "core-js": "^3.20.2", "craco-babel-loader": "^1.0.3", @@ -75,4 +75,4 @@ "last 1 safari version" ] } -} \ No newline at end of file +}