Skip to content

Commit 30eb036

Browse files
Merge pull request #464 from AdamWillford/react
Mikey's zIndex fix
2 parents 6c1fc8d + 4718b14 commit 30eb036

File tree

20 files changed

+39
-39
lines changed

20 files changed

+39
-39
lines changed

src/views/email-exchange/administration/ContactsList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { faUser, faBars } from '@fortawesome/free-solid-svg-icons'
1818
import { Link } from 'react-router-dom'
1919

2020
const dropdown = (row, rowIndex, formatExtraData) => (
21-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
21+
<CDropdown>
2222
<CDropdownToggle size="sm" color="link">
2323
<FontAwesomeIcon icon={faBars} />
2424
</CDropdownToggle>

src/views/email-exchange/administration/MailboxesList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import { faUser, faCog, faBars } from '@fortawesome/free-solid-svg-icons'
1717
import { Link } from 'react-router-dom'
1818

1919
const dropdown = (row, rowIndex, formatExtraData) => (
20-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
20+
<CDropdown>
2121
<CDropdownToggle size="sm" color="link">
2222
<FontAwesomeIcon icon={faBars} />
2323
</CDropdownToggle>
24-
<CDropdownMenu>
24+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2525
<CDropdownItem href="#">
2626
<Link
2727
className="dropdown-item"

src/views/email-exchange/administration/ViewMobileDevices.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import { faUser, faBars } from '@fortawesome/free-solid-svg-icons'
1818
import { Link } from 'react-router-dom'
1919

2020
const dropdown = (row, rowIndex, formatExtraData) => (
21-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
21+
<CDropdown>
2222
<CDropdownToggle size="sm" color="link">
2323
<FontAwesomeIcon icon={faBars} />
2424
</CDropdownToggle>
25-
<CDropdownMenu>
25+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2626
<CDropdownItem href="#">
2727
<Link className="dropdown-item" to={`/email/administration/edit-contact`}>
2828
<FontAwesomeIcon icon={faUser} className="me-2" />

src/views/endpoint/MEM/MEMListPolicies.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
1818

1919
const dropdown = (row, rowIndex, formatExtraData) => {
2020
return (
21-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
21+
<CDropdown>
2222
<CDropdownToggle size="sm" color="link">
2323
<FontAwesomeIcon icon={faBars} />
2424
</CDropdownToggle>
25-
<CDropdownMenu>
25+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2626
<CDropdownItem href="#">
2727
<Link className="dropdown-item" to={`/endpoint/MEM/edit-policy`}>
2828
<FontAwesomeIcon icon={faUser} className="me-2" />

src/views/endpoint/MEM/MEMListPolicyTemplate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
1616

1717
const dropdown = (row, index, column) => {
1818
return (
19-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
19+
<CDropdown>
2020
<CDropdownToggle size="sm" variant="ghost" color="primary">
2121
<FontAwesomeIcon icon={faBars} />
2222
</CDropdownToggle>
23-
<CDropdownMenu>
23+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2424
<CDropdownItem href="#">Delete Template</CDropdownItem>
2525
</CDropdownMenu>
2626
</CDropdown>

src/views/endpoint/applications/ApplicationsList.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
1818

1919
const dropdown = (row, rowIndex, formatExtraData) => {
2020
return (
21-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
21+
<CDropdown>
2222
<CDropdownToggle size="sm" color="link">
2323
<FontAwesomeIcon icon={faBars} />
2424
</CDropdownToggle>
25-
<CDropdownMenu>
25+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2626
<CDropdownItem href="#">
2727
<Link className="dropdown-item" to={`/endpoint/MEM/EditMEMApplication`}>
2828
<FontAwesomeIcon icon={faUser} className="me-2" />

src/views/endpoint/autopilot/AutopilotListDevices.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
1717

1818
const dropdown = (row, rowIndex, formatExtraData) => {
1919
return (
20-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
20+
<CDropdown>
2121
<CDropdownToggle size="sm" color="link">
2222
<FontAwesomeIcon icon={faBars} />
2323
</CDropdownToggle>
24-
<CDropdownMenu>
24+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2525
<CDropdownItem href="#">Delete Device</CDropdownItem>
2626
</CDropdownMenu>
2727
</CDropdown>

src/views/endpoint/autopilot/AutopilotListProfiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
1919

2020
const dropdown = (row, rowIndex, formatExtraData) => {
2121
return (
22-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
22+
<CDropdown>
2323
<CDropdownToggle size="sm" color="link">
2424
<FontAwesomeIcon icon={faBars} />
2525
</CDropdownToggle>
26-
<CDropdownMenu>
26+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2727
<CDropdownItem href="#">
2828
<Link className="dropdown-item" to={`/endpoint/autopilot/AutopilotEditProfile}`}>
2929
<FontAwesomeIcon icon={faUser} className="me-2" />

src/views/endpoint/autopilot/AutopilotListStatusPages.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
1919

2020
const dropdown = (row, rowIndex, formatExtraData) => {
2121
return (
22-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
22+
<CDropdown>
2323
<CDropdownToggle size="sm" color="link">
2424
<FontAwesomeIcon icon={faBars} />
2525
</CDropdownToggle>
26-
<CDropdownMenu>
26+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2727
<CDropdownItem href="#">
2828
<Link className="dropdown-item" to={`/endpoint/autopilot/AutopilotEditStatusPage}`}>
2929
<FontAwesomeIcon icon={faUser} className="me-2" />

src/views/endpoint/defender/ListDefender.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import { cellBooleanFormatter } from '../../../components/cipp'
1919

2020
const dropdown = (row, rowIndex, formatExtraData) => {
2121
return (
22-
<CDropdown style={{ position: 'fixed', zIndex: 1000 }}>
22+
<CDropdown>
2323
<CDropdownToggle size="sm" color="link">
2424
<FontAwesomeIcon icon={faBars} />
2525
</CDropdownToggle>
26-
<CDropdownMenu>
26+
<CDropdownMenu style={{ position: 'fixed', right: 0, zIndex: 1000 }}>
2727
<CDropdownItem href="#">View Device</CDropdownItem>
2828
<CDropdownItem href="#">Execute Quick Scan</CDropdownItem>
2929
<CDropdownItem href="#">Execute Full Scan</CDropdownItem>

0 commit comments

Comments
 (0)