Make chronograf admin table dropdowns appear like plaintext until hover
parent
a487bbe080
commit
e82fdf44b8
|
@ -31,7 +31,13 @@ const OrgTableRow = ({
|
||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr className={isSelected ? 'selected' : null}>
|
<tr
|
||||||
|
className={
|
||||||
|
isSelected
|
||||||
|
? 'chronograf-admin-table--user selected'
|
||||||
|
: 'chronograf-admin-table--user'
|
||||||
|
}
|
||||||
|
>
|
||||||
<td
|
<td
|
||||||
onClick={onToggleUserSelected(user)}
|
onClick={onToggleUserSelected(user)}
|
||||||
className="chronograf-admin-table--check-col chronograf-admin-table--selectable"
|
className="chronograf-admin-table--check-col chronograf-admin-table--selectable"
|
||||||
|
|
|
@ -79,8 +79,12 @@ class ChronografUsersTable extends Component {
|
||||||
/>
|
/>
|
||||||
</th>
|
</th>
|
||||||
<th>Username</th>
|
<th>Username</th>
|
||||||
<th style={{width: colOrg}}>Organization</th>
|
<th style={{width: colOrg}} className="align-with-col-text">
|
||||||
<th style={{width: colRole}}>Role</th>
|
Organization
|
||||||
|
</th>
|
||||||
|
<th style={{width: colRole}} className="align-with-col-text">
|
||||||
|
Role
|
||||||
|
</th>
|
||||||
<Authorized requiredRole={SUPERADMIN_ROLE}>
|
<Authorized requiredRole={SUPERADMIN_ROLE}>
|
||||||
<th style={{width: colSuperAdmin}} className="text-center">
|
<th style={{width: colSuperAdmin}} className="text-center">
|
||||||
SuperAdmin
|
SuperAdmin
|
||||||
|
|
|
@ -24,7 +24,13 @@ const UsersTableRow = ({
|
||||||
const isSelected = selectedUsers.find(u => isSameUser(user, u))
|
const isSelected = selectedUsers.find(u => isSameUser(user, u))
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr className={isSelected ? 'selected' : null}>
|
<tr
|
||||||
|
className={
|
||||||
|
isSelected
|
||||||
|
? 'chronograf-admin-table--user selected'
|
||||||
|
: 'chronograf-admin-table--user'
|
||||||
|
}
|
||||||
|
>
|
||||||
<td
|
<td
|
||||||
onClick={onToggleUserSelected(user)}
|
onClick={onToggleUserSelected(user)}
|
||||||
className="chronograf-admin-table--check-col chronograf-admin-table--selectable"
|
className="chronograf-admin-table--check-col chronograf-admin-table--selectable"
|
||||||
|
|
|
@ -204,6 +204,12 @@ table.table.chronograf-admin-table .dropdown {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.chronograf-user--org {
|
||||||
|
padding-left: 7px;
|
||||||
|
}
|
||||||
|
table.table.chronograf-admin-table thead tr th.align-with-col-text {
|
||||||
|
padding-left: 15px;
|
||||||
|
}
|
||||||
.user-checkbox {
|
.user-checkbox {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
@ -295,6 +301,37 @@ table.table.chronograf-admin-table tbody tr td.chronograf-admin-table--selectabl
|
||||||
.super-admin-toggle .dropdown-toggle {
|
.super-admin-toggle .dropdown-toggle {
|
||||||
width: 70px;
|
width: 70px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Make dropdowns in admin table appear as plaintext until hover */
|
||||||
|
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--user td div.dropdown div.btn.dropdown-toggle {
|
||||||
|
transition: none;
|
||||||
|
background-color: $g3-castle;
|
||||||
|
color: $g13-mist;
|
||||||
|
|
||||||
|
> .caret {opacity: 0;}
|
||||||
|
}
|
||||||
|
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--user.selected td div.dropdown div.btn.dropdown-toggle {
|
||||||
|
background-color: $g5-pepper;
|
||||||
|
}
|
||||||
|
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--user:hover td div.dropdown div.btn.dropdown-toggle {
|
||||||
|
background-color: $c-pool;
|
||||||
|
color: $g20-white;
|
||||||
|
|
||||||
|
> .caret {opacity: 1;}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: $c-laser;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--user td div.dropdown.open div.btn.dropdown-toggle,
|
||||||
|
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--user td div.dropdown.open div.btn.dropdown-toggle:hover {
|
||||||
|
background-color: $c-hydrogen;
|
||||||
|
color: $g20-white;
|
||||||
|
|
||||||
|
> .caret {opacity: 1;}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Styles for new user row */
|
||||||
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--new-user {
|
table.table.chronograf-admin-table tbody tr.chronograf-admin-table--new-user {
|
||||||
background-color: $g4-onyx;
|
background-color: $g4-onyx;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue