[arvados] updated: 2.7.0-6068-gf1412eb308
git repository hosting
git at public.arvados.org
Tue Mar 26 16:29:51 UTC 2024
Summary of changes:
.../multiselect-toolbar/MultiselectToolbar.tsx | 8 +++-----
.../project-details-card/project-details-card.tsx | 23 +++++++++-------------
2 files changed, 12 insertions(+), 19 deletions(-)
via f1412eb308f5c8dcd91a034933882060b0d50177 (commit)
from 237fbc76375b52288a50d39606149a513ab15b57 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f1412eb308f5c8dcd91a034933882060b0d50177
Author: Lisa Knox <lisaknox83 at gmail.com>
Date: Tue Mar 26 12:29:47 2024 -0400
21224: css tweaks Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox at curii.com>
diff --git a/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx b/services/workbench2/src/components/multiselect-toolbar/MultiselectToolbar.tsx
index 69c9dfc5ef..ceefb34a2e 100644
--- 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,
- height: '2.7rem',
+ height: '2.5rem',
padding: 0,
- marginBottom: '-0.5rem',
transition: `width ${WIDTH_TRANSITION}ms`,
overflow: 'hidden',
},
transition: {
display: "flex",
flexDirection: "row",
- height: '2.7rem',
+ height: '2.5rem',
padding: 0,
- marginBottom: '-0.5rem',
overflow: 'hidden',
transition: `width ${WIDTH_TRANSITION}ms`,
},
@@ -144,7 +142,7 @@ export const MultiselectToolbar = connect(
<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 ? (
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 61aa0be519..8a3c2da4c9 100644
--- 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 { setSelectedResourceUuid } from 'store/selected-resource/selected-resource-actions';
+import { deselectAllOthers } from 'store/multiselect/multiselect-actions';
type CssRules =
| 'root'
@@ -39,7 +41,6 @@ type CssRules =
| 'faveIcon'
| 'frozenIcon'
| 'accountStatusSection'
- | 'toolbarSection'
| 'tag'
| 'description';
@@ -49,13 +50,10 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
marginBottom: '1rem',
flex: '0 0 auto',
padding: 0,
- border: '2px solid transparent',
+ minHeight: '3rem',
},
showMore: {
cursor: 'pointer',
- background: 'linear-gradient(to right, black, transparent)',
- backgroundClip: 'text',
- color: 'transparent',
},
noDescription: {
color: theme.palette.grey['600'],
@@ -64,6 +62,7 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
userNameContainer: {
display: 'flex',
alignItems: 'center',
+ minHeight: '2.7rem',
},
cardHeaderContainer: {
width: '100%',
@@ -72,8 +71,8 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
justifyContent: 'space-between',
},
cardHeader: {
- minWidth: '40rem',
- padding: '0.2rem 0.4rem 0.1rem 1rem',
+ minWidth: '30rem',
+ padding: '0.2rem 0.4rem 0.2rem 1rem',
},
descriptionToggle: {
display: 'flex',
@@ -90,14 +89,12 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
- justifyContent: 'space-between',
},
namePlate: {
display: 'flex',
flexDirection: 'row',
alignItems: 'center',
margin: 0,
- paddingBottom: '0.5rem',
},
faveIcon: {
fontSize: '0.8rem',
@@ -117,10 +114,6 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
alignItems: 'center',
paddingLeft: '1rem',
},
- toolbarSection: {
- marginTop: '-1rem',
- paddingBottom: '-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));
+ dispatch<any>(setSelectedResourceUuid(uuid));
+ dispatch<any>(deselectAllOthers(uuid));
},
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, handleContextMenu, handleCardClick, isAdmin, isSelected }) => {
+const UserCard: React.FC<UserCardProps> = ({ classes, currentResource, handleCardClick, isSelected }) => {
const { fullName, uuid } = currentResource as UserResource & { fullName: string };
return (
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list