Merge pull request #32507 from woocommerce/fix/32128_experiment_1_ui_issues
Fix experiment 1 UI issues
This commit is contained in:
commit
c10a9cfd63
|
@ -64,6 +64,8 @@ export const Layout = ( {
|
|||
query,
|
||||
taskListComplete,
|
||||
hasTaskList,
|
||||
showingProgressHeader,
|
||||
isLoadingTaskLists,
|
||||
shouldShowWelcomeModal,
|
||||
shouldShowWelcomeFromCalypsoModal,
|
||||
isTaskListHidden,
|
||||
|
@ -141,7 +143,9 @@ export const Layout = ( {
|
|||
<Column shouldStick={ shouldStickColumns }>
|
||||
{ ! isLoadingExperimentAssignment &&
|
||||
! isLoadingTwoColExperimentAssignment &&
|
||||
! isRunningTaskListExperiment && (
|
||||
! isRunningTaskListExperiment &&
|
||||
! isLoadingTaskLists &&
|
||||
! showingProgressHeader && (
|
||||
<ActivityHeader
|
||||
className="your-store-today"
|
||||
title={ __(
|
||||
|
@ -286,7 +290,13 @@ export default compose(
|
|||
const { getOption, hasFinishedResolution } = select(
|
||||
OPTIONS_STORE_NAME
|
||||
);
|
||||
const { getTaskList } = select( ONBOARDING_STORE_NAME );
|
||||
const {
|
||||
getTaskList,
|
||||
getTaskLists,
|
||||
hasFinishedResolution: taskListFinishResolution,
|
||||
} = select( ONBOARDING_STORE_NAME );
|
||||
const taskLists = getTaskLists();
|
||||
const isLoadingTaskLists = ! taskListFinishResolution( 'getTaskLists' );
|
||||
|
||||
const welcomeFromCalypsoModalDismissed =
|
||||
getOption( WELCOME_FROM_CALYPSO_MODAL_DISMISSED_OPTION_NAME ) !==
|
||||
|
@ -336,8 +346,12 @@ export default compose(
|
|||
isBatchUpdating: isNotesRequesting( 'batchUpdateNotes' ),
|
||||
shouldShowWelcomeModal,
|
||||
shouldShowWelcomeFromCalypsoModal,
|
||||
isLoadingTaskLists,
|
||||
isTaskListHidden: getTaskList( 'setup' )?.isHidden,
|
||||
hasTaskList: getAdminSetting( 'visibleTaskListIds', [] ).length > 0,
|
||||
showingProgressHeader: !! taskLists.find(
|
||||
( list ) => list.isVisible && list.displayProgressHeader
|
||||
),
|
||||
taskListComplete: getTaskList( 'setup' )?.isComplete,
|
||||
installTimestamp,
|
||||
installTimestampHasResolved,
|
||||
|
|
|
@ -19,10 +19,10 @@
|
|||
flex: 1;
|
||||
}
|
||||
|
||||
.woocommerce-ellipsis-menu.setup {
|
||||
.woocommerce-ellipsis-menu {
|
||||
position: absolute;
|
||||
top: 20px;
|
||||
right: 16px;
|
||||
top: $gap;
|
||||
right: $gap-large;
|
||||
}
|
||||
|
||||
.woocommerce-task-card.is-loading {
|
||||
|
@ -130,11 +130,11 @@
|
|||
}
|
||||
|
||||
.woocommerce-task-header__contents {
|
||||
max-width: 380px;
|
||||
max-width: calc(60% - 2%);
|
||||
}
|
||||
|
||||
.svg-background {
|
||||
right: 0.5%;
|
||||
right: 2%;
|
||||
width: 40%;
|
||||
}
|
||||
}
|
||||
|
@ -143,6 +143,13 @@
|
|||
@include single-column;
|
||||
}
|
||||
|
||||
&.two-columns .svg-background {
|
||||
top: 50%;
|
||||
bottom: 50%;
|
||||
margin-top: auto;
|
||||
margin-bottom: auto;
|
||||
}
|
||||
|
||||
ul {
|
||||
display: flex;
|
||||
li {
|
||||
|
@ -229,10 +236,6 @@
|
|||
position: absolute;
|
||||
z-index: 0;
|
||||
right: 6%;
|
||||
top: 50%;
|
||||
bottom: 50%;
|
||||
margin-top: auto;
|
||||
margin-bottom: auto;
|
||||
|
||||
.admin-theme-color {
|
||||
fill: var(--wp-admin-theme-color);
|
||||
|
|
Loading…
Reference in New Issue