diff --git a/changes/issue-2638-restyle-button b/changes/issue-2638-restyle-button new file mode 100644 index 0000000000..f2193364c2 --- /dev/null +++ b/changes/issue-2638-restyle-button @@ -0,0 +1,2 @@ +* Restyle UI for filter-by-software and filter-by-policy buttons on manage hosts page to localize +clear filter click to "x" icon \ No newline at end of file diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx index 111154eadb..63d1795e85 100644 --- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx +++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx @@ -77,7 +77,7 @@ import AddHostModal from "./components/AddHostModal"; import EditColumnsIcon from "../../../../assets/images/icon-edit-columns-16x16@2x.png"; import PencilIcon from "../../../../assets/images/icon-pencil-14x14@2x.png"; import TrashIcon from "../../../../assets/images/icon-trash-14x14@2x.png"; -import CloseIcon from "../../../../assets/images/icon-action-close-16x15@2x.png"; +import CloseIcon from "../../../../assets/images/icon-close-vibrant-blue-16x16@2x.png"; import PolicyIcon from "../../../../assets/images/icon-policy-fleet-black-12x12@2x.png"; interface IManageHostsProps { @@ -902,27 +902,24 @@ const ManageHostsPage = ({ ); const renderPoliciesFilterBlock = () => { - const buttonText = ( - <> - Policy - {policy?.query_name} - Remove policy filter - - ); return (
- +
+ Policy + {policy?.query_name} + +
); }; @@ -933,37 +930,39 @@ const ManageHostsPage = ({ const buttonText = name && version ? `${name} ${version}` : ""; return (
- +
- + + + {`Hosts with ${name}`},
+ {`${version} installed`} +
+
+ ); } diff --git a/frontend/pages/hosts/ManageHostsPage/_styles.scss b/frontend/pages/hosts/ManageHostsPage/_styles.scss index 6ed942bec8..35c0822ad7 100644 --- a/frontend/pages/hosts/ManageHostsPage/_styles.scss +++ b/frontend/pages/hosts/ManageHostsPage/_styles.scss @@ -172,26 +172,48 @@ } } + &__policies-filter-name-card, + &__software-filter-name-card { + display: inline-flex; + align-items: center; + padding: 6px 12px; + border: 1px solid $ui-fleet-black-25; + border-radius: 4px; + box-shadow: none; + margin-left: $pad-medium; + color: $core-fleet-black; + font-size: $xx-small; + font-weight: $bold; + cursor: default; + + img { + width: 12px; + height: 12px; + margin-right: 6px; + } + + button { + height: auto; + padding: 0px; + border: none; + margin-left: $pad-small; + + img { + padding: 0px; + margin: 0px; + } + } + } + + &__software-filter-name-card { + margin-left: 0px; + } + &__enroll-hosts { padding: $pad-small; margin-right: $pad-small; } - &__software-filter-block { - .button--small-text-icon { - margin-left: 0; - padding-left: 12px; - } - .software-filter-button { - display: inline-flex; - align-items: center; - } - .software-filter-tooltip { - display: inline-flex; - align-items: center; - } - } - .issues__header, .host-issue { img {