@openmrs/esm-implementer-tools-app 3.3.2-pre.31 → 3.3.2-pre.33

package/src/popup/popup.styles.scss

@@ -29,7 +29,15 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  border-bottom: 1px solid #a0a0a0;
   z-index: 2;
   background: #e0e0e0;
-  padding: 0.25rem;
+}
+
+.topBar :global(.bx--content-switcher-btn:first-child),
+.topBar :global(.bx--content-switcher-btn:last-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
 }

package/src/ui-editor/ui-editor.tsx

@@ -1,12 +1,12 @@
 import React from "react";
 import styles from "./styles.css";
+import Close16 from "@carbon/icons-react/es/close/16";
 import {
   getExtensionInternalStore,
   useStore,
   useStoreWithActions,
 } from "@openmrs/esm-framework/src/internal";
-import { Button } from "@carbon/react";
-import { Close } from "@carbon/react/icons";
+import { Button } from "carbon-components-react";
 import { Portal } from "./portal";
 import { ExtensionOverlay } from "./extension-overlay.component";
 import { ImplementerToolsStore, implementerToolsStore } from "../store";
@@ -79,7 +79,7 @@ export function ExitButton() {
       className={styles.exitButton}
       kind="danger"
       size="sm"
-      renderIcon={(props) => <Close {...props} size={16} />}
+      renderIcon={Close16}
       iconDescription="Exit UI Editor"
       tooltipPosition="left"
       onClick={toggleIsUIEditorEnabled}