diff --git a/packages/app-market/src/components/apps-browse/__styles__/featured-hero-apps.ts b/packages/app-market/src/components/apps-browse/__styles__/featured-hero-apps.ts index d1a850744c..1e77027a1d 100644 --- a/packages/app-market/src/components/apps-browse/__styles__/featured-hero-apps.ts +++ b/packages/app-market/src/components/apps-browse/__styles__/featured-hero-apps.ts @@ -152,6 +152,8 @@ export const FeaturedHeroAppsIcon = styled.img` border-radius: 0.25rem; width: 48px; height: 48px; + padding: 0.25rem; + background-color: var(--color-white); ${forMobileAndAbove} { border-radius: 0.5rem; diff --git a/packages/app-market/src/components/apps-browse/__styles__/hero-apps.ts b/packages/app-market/src/components/apps-browse/__styles__/hero-apps.ts index cb5231ec0d..c2ebecd1ca 100644 --- a/packages/app-market/src/components/apps-browse/__styles__/hero-apps.ts +++ b/packages/app-market/src/components/apps-browse/__styles__/hero-apps.ts @@ -106,7 +106,7 @@ export const HeroAppsStrapline = styled(ElBodyText)` export const HeroAppsInnerContainer = styled.div` width: 100%; - border-radius: 0.25rem; + border-radius: 0.5rem; padding: 0.75rem; ${forMobileAndAbove} { @@ -203,6 +203,8 @@ export const HeroAppsIcon = styled.img` border-radius: 0.25rem; width: 40px; height: 40px; + padding: 0.25rem; + background-color: var(--color-white); ${forMobileAndAbove} { margin-bottom: 1.25rem; diff --git a/packages/app-market/src/components/apps-detail/__styles__/index.ts b/packages/app-market/src/components/apps-detail/__styles__/index.ts index 7b464a3393..686643ad5a 100644 --- a/packages/app-market/src/components/apps-detail/__styles__/index.ts +++ b/packages/app-market/src/components/apps-detail/__styles__/index.ts @@ -1,7 +1,8 @@ +import { forDesktopAndAbove } from './../../../core/__styles__/media' import { ElModalBody } from './../../../../../elements/src/components/modal/__styles__/index' import { css } from '@linaria/core' import { styled } from '@linaria/react' -import { forMobileAndAbove, forTabletAndAbove } from '../../../core/__styles__/media' +import { forMobileAndAbove, forTabletAndAbove, forWidescreenAndAbove } from '../../../core/__styles__/media' export const htmlRender = css` font-family: var(--font-sans-serif); @@ -22,25 +23,27 @@ export const htmlRender = css` export const AppDetailWrapper = styled.div` margin-right: 0.75rem; border-radius: 0.25rem; + padding: 0.75rem; background-color: var(--color-grey-light); - width: 48px; - height: 48px; display: flex; align-items: center; justify-content: center; + margin-bottom: 0.75rem; ${forMobileAndAbove} { width: 96px; height: 96px; + margin-bottom: 0rem; } ` export const AppDetailIcon = styled.img` - border-radius: 1rem; + border-radius: 0.25rem; width: 48px; height: 48px; ${forMobileAndAbove} { + border-radius: 1rem; width: 72px; height: 72px; } @@ -82,6 +85,10 @@ export const AppDetailDescriptionColMain = styled.div` ${forTabletAndAbove} { grid-column-end: span 7; } + + ${forWidescreenAndAbove} { + grid-column-end: span 12; + } ` export const AppDetailDescriptionColAside = styled.div` @@ -93,6 +100,20 @@ export const AppDetailDescriptionColAside = styled.div` grid-column-end: span 5; padding-top: 2.75rem; } + + ${forWidescreenAndAbove} { + display: none; + } +` + +export const AppDetailDescriptionAsideDesktop = styled.div` + display: none; + + ${forWidescreenAndAbove} { + display: block; + margin-left: 1rem; + margin-bottom: 1.25rem; + } ` export const AppDetailBackButton = styled.div` @@ -103,8 +124,13 @@ export const AppDetailBackButton = styled.div` align-items: center; border-radius: 0.25rem; background-color: var(--color-grey-light); - margin-bottom: 0.75rem; + margin-bottom: 1.25rem; cursor: pointer; + margin-top: 0.75rem; + + ${forMobileAndAbove} { + margin-top: 0; + } ` export const AppDetailPermissionChip = styled.div` @@ -143,3 +169,48 @@ export const appDetailVideoModal = css` height: calc(100% - 2.5rem); } ` + +export const appDetailInfoLineAdjust = css` + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; +` + +export const AppsDetailContentGrid = styled.div` + display: grid; + grid-template-columns: 1fr; + + ${forWidescreenAndAbove} { + grid-template-columns: 1fr 2fr; + grid-column-gap: 2rem; + } +` + +export const AppDetailSupportGrid = styled.div` + display: grid; + grid-template-columns: repeat(12, 1fr); + grid-column-gap: 1rem; + grid-row-gap: 1.5rem; + + ${forMobileAndAbove} { + grid-column-gap: 2rem; + grid-row-gap: 2.5rem; + } +` + +export const AppDetailSupportGridCol = styled.div` + grid-column-end: span 12; + + ${forMobileAndAbove} { + grid-column-end: span 6; + } + + ${forDesktopAndAbove} { + grid-column-end: span 4; + } + + ${forWidescreenAndAbove} { + grid-column-end: span 6; + } +` diff --git a/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/app-install-modal.test.tsx.snap b/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/app-install-modal.test.tsx.snap index 0365ff460b..20b95267da 100644 --- a/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/app-install-modal.test.tsx.snap +++ b/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/app-install-modal.test.tsx.snap @@ -12,7 +12,7 @@ Object { class="el-mb11" >
As an organisation admin, you have control over enabling @@ -32,20 +32,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -64,7 +70,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -83,7 +89,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -96,47 +102,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
As an organisation admin, you have control over enabling @@ -188,20 +178,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -220,7 +216,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -239,7 +235,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -252,47 +248,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
As an organisation admin, you have control over enabling @@ -401,20 +381,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -433,7 +419,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -452,7 +438,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -465,47 +451,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
As an organisation admin, you have control over enabling @@ -557,20 +527,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -589,7 +565,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -608,7 +584,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -621,47 +597,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -768,20 +728,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -800,7 +766,7 @@ Object { Pricing Information
Will Test DevCo have specified there is no cost for using this @@ -813,47 +779,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -903,20 +853,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -935,7 +891,7 @@ Object { Pricing Information
Will Test DevCo have specified there is no cost for using this @@ -948,47 +904,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -1093,20 +1033,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -1125,7 +1071,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -1144,7 +1090,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -1157,47 +1103,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -1245,20 +1175,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -1277,7 +1213,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -1296,7 +1232,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -1309,47 +1245,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -1456,20 +1376,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -1488,7 +1414,7 @@ Object { Pricing Information
There may be a cost associated to using this integration @@ -1504,47 +1430,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -1594,20 +1504,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -1626,7 +1542,7 @@ Object { Pricing Information
There may be a cost associated to using this integration @@ -1642,47 +1558,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -1789,20 +1689,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -1821,7 +1727,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -1840,7 +1746,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -1853,47 +1759,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
You are about to enable @@ -1943,20 +1833,26 @@ Object { Desktop Integration
This app requires the following Desktop Integration. Some integration types may replace or change certain behaviours within Agency Cloud.
-For more information regarding Desktop Integration types, please @@ -1975,7 +1871,7 @@ Object { Pricing Information
Will Test DevCo have specified that there is a cost for using this @@ -1994,7 +1890,7 @@ Object { .
You will not be charged by Reapit Ltd for any costs associated with using this @@ -2007,47 +1903,31 @@ Object { Data Permissions
By enabling this app, you are granting the following permissions to your data:
Information about your organisation and the names/email addresses of your users
will-test-dev-co-voracious-person integration has been successfully enabled.
For details on how to use the integration and, if there are any additional setup requirements, a member of - MOCK_NAME + MOCK_DEVELOPER_NAME will be in touch to help you through the process.
If you wish to contact them directly, you can do this via telephone at 07777777777 @@ -58,21 +58,21 @@ Object { class="el-snack-holder" />
will-test-dev-co-voracious-person integration has been successfully enabled.
For details on how to use the integration and, if there are any additional setup requirements, a member of - MOCK_NAME + MOCK_DEVELOPER_NAME will be in touch to help you through the process.
If you wish to contact them directly, you can do this via telephone at 07777777777 @@ -164,14 +164,14 @@ Object { class="el-snack-holder" />
The will-test-dev-co-voracious-person app has been successfully installed. You can now launch the app from the ‘My Apps’ page or by clicking the button below.
If you wish to contact the developer about using the app, you can do this via telephone at 07777777777 @@ -218,14 +218,14 @@ Object { class="el-snack-holder" />
The will-test-dev-co-voracious-person app has been successfully installed. You can now launch the app from the ‘My Apps’ page or by clicking the button below.
If you wish to contact the developer about using the app, you can do this via telephone at 07777777777 @@ -329,14 +329,14 @@ Object { class="el-snack-holder" />
The will-test-dev-co-voracious-person app has been successfully installed. You can now launch the app from the ‘My Apps’ page or by clicking the button below.
If you wish to contact the developer about using the app, you can do this via telephone at 07777777777 @@ -383,14 +383,14 @@ Object { class="el-snack-holder" />
The will-test-dev-co-voracious-person app has been successfully installed. You can now launch the app from the ‘My Apps’ page or by clicking the button below.
If you wish to contact the developer about using the app, you can do this via telephone at 07777777777 diff --git a/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/apps-detail-header.test.tsx.snap b/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/apps-detail-header.test.tsx.snap new file mode 100644 index 0000000000..9f86a584dd --- /dev/null +++ b/packages/app-market/src/components/apps-detail/__tests__/__snapshots__/apps-detail-header.test.tsx.snap @@ -0,0 +1,411 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`AppsDetailHeader should match a snapshot for desktop 1`] = ` +Object { + "asFragment": [Function], + "baseElement":
++ Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar +
++ Verified by Reapit +
++ Integration +
++ Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar +
++ Verified by Reapit +
++ Integration +
++ Verified by Reapit +
++ Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar +
++ Integration +
++ Verified by Reapit +
++ Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar +
++ Integration +
+- Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar -
-- Integration Enabled -
- -- Verified by Reapit -
-- Integration -
-+ Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar Foo bar +
++ Verified by Reapit +
++ Integration +
- + +
- 07777777777 -
-+
+ + foo@bar.com + +
++ 07777777777 +
+
-
+ About Developer
+
+
+ All about us in a number of words
+
- All about us -
-- Integration Enabled -
- + +
- 07777777777 -
-+
+ + foo@bar.com + +
++ 07777777777 +
+
-
+ About Developer
+
+
+ All about us in a number of words
+
- All about us -
-+
+ Free +
++
+ Free +
+