projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
237fbc7
)
21224: css tweaks Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii.com>
author
Lisa Knox <lisaknox83@gmail.com>
Tue, 26 Mar 2024 16:29:47 +0000
(12:29 -0400)
committer
Lisa Knox <lisaknox83@gmail.com>
Tue, 26 Mar 2024 16:29:47 +0000
(12:29 -0400)
services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
patch
|
blob
|
history
services/workbench2/src/views-components/project-details-card/project-details-card.tsx
patch
|
blob
|
history
diff --git
a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 69c9dfc5efca250944b9fdfcdd645f63e51dbdf0..ceefb34a2ed3d3e845b071b183958493be788b57 100644
(file)
--- a/
services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
+++ b/
services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
@@
-45,18
+45,16
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
display: "flex",
flexDirection: "row",
width: 0,
display: "flex",
flexDirection: "row",
width: 0,
- height: '2.
7
rem',
+ height: '2.
5
rem',
padding: 0,
padding: 0,
- marginBottom: '-0.5rem',
transition: `width ${WIDTH_TRANSITION}ms`,
overflow: 'hidden',
},
transition: {
display: "flex",
flexDirection: "row",
transition: `width ${WIDTH_TRANSITION}ms`,
overflow: 'hidden',
},
transition: {
display: "flex",
flexDirection: "row",
- height: '2.
7
rem',
+ height: '2.
5
rem',
padding: 0,
padding: 0,
- marginBottom: '-0.5rem',
overflow: 'hidden',
transition: `width ${WIDTH_TRANSITION}ms`,
},
overflow: 'hidden',
transition: `width ${WIDTH_TRANSITION}ms`,
},
@@
-144,7
+142,7
@@
export const MultiselectToolbar = connect(
<React.Fragment>
<Toolbar
className={isTransitioning ? classes.transition: classes.root}
<React.Fragment>
<Toolbar
className={isTransitioning ? classes.transition: classes.root}
- style={{ width: `${(actions.length * 2.5) +
3
}rem`}}
+ style={{ width: `${(actions.length * 2.5) +
2
}rem`}}
data-cy='multiselect-toolbar'
>
{actions.length ? (
data-cy='multiselect-toolbar'
>
{actions.length ? (
diff --git
a/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
b/services/workbench2/src/views-components/project-details-card/project-details-card.tsx
index 61aa0be519413ba6b5da590ab039a96631f5e0ba..8a3c2da4c92e7d3ccd1a284146447ca7b85e4d2d 100644
(file)
--- a/
services/workbench2/src/views-components/project-details-card/project-details-card.tsx
+++ b/
services/workbench2/src/views-components/project-details-card/project-details-card.tsx
@@
-24,6
+24,8
@@
import { Dispatch } from 'redux';
import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
import { ExpandChevronRight } from 'components/expand-chevron-right/expand-chevron-right';
import { MultiselectToolbar } from 'components/multiselect-toolbar/MultiselectToolbar';
import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
import { ExpandChevronRight } from 'components/expand-chevron-right/expand-chevron-right';
import { MultiselectToolbar } from 'components/multiselect-toolbar/MultiselectToolbar';
+import { setSelectedResourceUuid } from 'store/selected-resource/selected-resource-actions';
+import { deselectAllOthers } from 'store/multiselect/multiselect-actions';
type CssRules =
| 'root'
type CssRules =
| 'root'
@@
-39,7
+41,6
@@
type CssRules =
| 'faveIcon'
| 'frozenIcon'
| 'accountStatusSection'
| 'faveIcon'
| 'frozenIcon'
| 'accountStatusSection'
- | 'toolbarSection'
| 'tag'
| 'description';
| 'tag'
| 'description';
@@
-49,13
+50,10
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
marginBottom: '1rem',
flex: '0 0 auto',
padding: 0,
marginBottom: '1rem',
flex: '0 0 auto',
padding: 0,
-
border: '2px solid transparent
',
+
minHeight: '3rem
',
},
showMore: {
cursor: 'pointer',
},
showMore: {
cursor: 'pointer',
- background: 'linear-gradient(to right, black, transparent)',
- backgroundClip: 'text',
- color: 'transparent',
},
noDescription: {
color: theme.palette.grey['600'],
},
noDescription: {
color: theme.palette.grey['600'],
@@
-64,6
+62,7
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
userNameContainer: {
display: 'flex',
alignItems: 'center',
userNameContainer: {
display: 'flex',
alignItems: 'center',
+ minHeight: '2.7rem',
},
cardHeaderContainer: {
width: '100%',
},
cardHeaderContainer: {
width: '100%',
@@
-72,8
+71,8
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
justifyContent: 'space-between',
},
cardHeader: {
justifyContent: 'space-between',
},
cardHeader: {
- minWidth: '
4
0rem',
- padding: '0.2rem 0.4rem 0.
1
rem 1rem',
+ minWidth: '
3
0rem',
+ padding: '0.2rem 0.4rem 0.
2
rem 1rem',
},
descriptionToggle: {
display: 'flex',
},
descriptionToggle: {
display: 'flex',
@@
-90,14
+89,12
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
- justifyContent: 'space-between',
},
namePlate: {
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
margin: 0,
},
namePlate: {
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
margin: 0,
- paddingBottom: '0.5rem',
},
faveIcon: {
fontSize: '0.8rem',
},
faveIcon: {
fontSize: '0.8rem',
@@
-117,10
+114,6
@@
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
alignItems: 'center',
paddingLeft: '1rem',
},
alignItems: 'center',
paddingLeft: '1rem',
},
- toolbarSection: {
- marginTop: '-1rem',
- paddingBottom: '-1rem',
- },
tag: {
marginRight: '1rem',
marginTop: '1rem',
tag: {
marginRight: '1rem',
marginTop: '1rem',
@@
-148,6
+141,8
@@
const mapStateToProps = ({ auth, selectedResourceUuid, resources, properties }:
const mapDispatchToProps = (dispatch: Dispatch) => ({
handleCardClick: (uuid: string) => {
dispatch<any>(loadDetailsPanel(uuid));
const mapDispatchToProps = (dispatch: Dispatch) => ({
handleCardClick: (uuid: string) => {
dispatch<any>(loadDetailsPanel(uuid));
+ dispatch<any>(setSelectedResourceUuid(uuid));
+ dispatch<any>(deselectAllOthers(uuid));
},
handleContextMenu: (event: React.MouseEvent<HTMLElement>, resource: any, isAdmin: boolean) => {
event.stopPropagation();
},
handleContextMenu: (event: React.MouseEvent<HTMLElement>, resource: any, isAdmin: boolean) => {
event.stopPropagation();
@@
-243,7
+238,7
@@
export const ProjectDetailsCard = connect(
})
);
})
);
-const UserCard: React.FC<UserCardProps> = ({ classes, currentResource, handleC
ontextMenu, handleCardClick, isAdmin
, isSelected }) => {
+const UserCard: React.FC<UserCardProps> = ({ classes, currentResource, handleC
ardClick
, isSelected }) => {
const { fullName, uuid } = currentResource as UserResource & { fullName: string };
return (
const { fullName, uuid } = currentResource as UserResource & { fullName: string };
return (