mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 08:58:41 +00:00
UI: Fix issue where org logo may be uncentered on DUP (#10976)
## Addresses #10790 Adjusted markup of the org logo on the device user page to match those on the host details page, and have them reference the same styles for consistency (which fixes this bug) **Before:**  **After:**  ## Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/` - [x] Manual QA for all new/changed functionality --------- Co-authored-by: Jacob Shandling <jacob@fleetdm.com>
This commit is contained in:
parent
57db0cd479
commit
ce77a3e879
4 changed files with 19 additions and 14 deletions
1
changes/10790-uneven-org-logo
Normal file
1
changes/10790-uneven-org-logo
Normal file
|
|
@ -0,0 +1 @@
|
|||
- Fixed an issue where custom org logos might be displayed off-center
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding-left: 2px;
|
||||
}
|
||||
|
||||
.site-nav-list {
|
||||
|
|
@ -72,6 +73,10 @@
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
&__logo-wrapper {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&__logo {
|
||||
text-align: center;
|
||||
display: flex;
|
||||
|
|
@ -86,7 +91,7 @@
|
|||
background-color: $site-nav-on-hover;
|
||||
|
||||
&::after {
|
||||
content: '';
|
||||
content: "";
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
|
|
|||
|
|
@ -441,11 +441,15 @@ const DeviceUserPage = ({
|
|||
|
||||
return (
|
||||
<div className="app-wrap">
|
||||
<nav className="site-nav">
|
||||
<div className="site-nav-container">
|
||||
<nav className="site-nav-container">
|
||||
<div className="site-nav-content">
|
||||
<ul className="site-nav-list">
|
||||
<li className={`site-nav-item--logo`} key={`nav-item`}>
|
||||
<OrgLogoIcon className="logo" src={orgLogoURL || FleetIcon} />
|
||||
<li className="site-nav-item dup-org-logo" key="dup-org-logo">
|
||||
<div className="site-nav-item__logo-wrapper">
|
||||
<div className="site-nav-item__logo">
|
||||
<OrgLogoIcon className="logo" src={orgLogoURL || FleetIcon} />
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
.site-nav {
|
||||
height: 50px;
|
||||
}
|
||||
.site-nav-item--logo {
|
||||
text-align: center;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-width: 64px;
|
||||
max-width: 140px;
|
||||
transform: scale(0.5);
|
||||
}
|
||||
}
|
||||
.enroll-mdm-modal {
|
||||
width: 800px;
|
||||
|
|
@ -423,3 +414,7 @@
|
|||
width: $col-md;
|
||||
}
|
||||
}
|
||||
|
||||
.dup-org-logo {
|
||||
cursor: default;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue