Skip to content

Commit

Permalink
Emktg 3491 redesign landing page (#1806)
Browse files Browse the repository at this point in the history
* Make type of segment method on project root

* fix typescript error on product filter

* refacto of modules update

* refacto of modules update

* module version changed

* fix alignment elements

* fix alignment elements

* fix alignment elements

* new UI of link

* New UI of landing page
  • Loading branch information
ClaraLpresta authored Aug 30, 2024
1 parent ad87998 commit 18c61e4
Show file tree
Hide file tree
Showing 16 changed files with 144 additions and 112 deletions.
7 changes: 5 additions & 2 deletions _dev/apps/ui/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,19 @@
<AlertModuleUpdate
v-if="modulePsEventbusNeedUpgrade"
module-name="ps_eventbus"
:class-alert="currentlyConfigurationPage ? 'container' : undefined"
:class-alert="
currentlyConfigurationPage ? 'container' :
currentlyOnLandingPage ? 'container-md' : undefined"
/>
<router-view />
<div
class="ps_gs-landingpage-content__muted text-muted bg-transparent mt-4"
class="mt-4 container-md"
v-if="currentlyOnLandingPage"
>
<VueShowdown
:markdown="$t('landingPage.footer.explanation')"
:extensions="['extended-link']"
class="text-justify-center"
/>
</div>
<div
Expand Down
5 changes: 4 additions & 1 deletion _dev/apps/ui/src/assets/images/prestashop-google-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions _dev/apps/ui/src/assets/scss/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ $light-blue-500: #C8D7E4;
$light-blue-700: #BBCDDD;
$light-blue-900: #A7BED1;

$purple-700: #7B4FAC;

$off-white: #FBFEFF;

$primary: $primary-800;
Expand All @@ -69,8 +71,7 @@ $warning: $yellow;
$primary-lighten: $light-blue-050;
$text-muted: $primary-600;

$link-color: $blue;
$link-hover-color: $blue-700;
$link-color: $primary-800;

$nav-pills-link-active-bg: transparent;

Expand Down
2 changes: 0 additions & 2 deletions _dev/apps/ui/src/assets/scss/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@
@import "components/onboardingcard";
@import "components/google-issues";
@import "components/landingpageheader";
@import "components/landingpagecontent";
@import "components/landingpagefooter";
@import "components/glass";
@import "components/badge";
@import "components/breadcrumb";
Expand Down
12 changes: 12 additions & 0 deletions _dev/apps/ui/src/assets/scss/base/_color.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@
background-color: $ocean-blue-500;
}

.bg-green-50 {
background-color: $green-50;
}

.bg-red-50 {
background-color: $red-50;
}

.bg-amber-100 {
background-color: $amber-100;
}

.border-450 {
border-color: $gray-450 !important;
}
Expand Down
49 changes: 36 additions & 13 deletions _dev/apps/ui/src/assets/scss/base/_common.scss
Original file line number Diff line number Diff line change
@@ -1,16 +1,34 @@
a[target="_blank"]:not(.external_link-no_icon) {

&:not(.btn) {
text-decoration: underline;

&::after {
content: "\e895"; // "launch" icon
font-family: 'Material Icons';
-webkit-font-feature-settings: 'liga';
display: inline-block;
vertical-align: middle;
margin-left: 0.18em;
text-decoration: none;
a {
text-decoration-color: $primary-500 !important;
text-decoration-thickness: auto;
text-underline-offset: 2px;
transition-property: all;
transition-timing-function: cubic-bezier(.4,0,.2,1);
transition-duration: .15s;

&:hover {
text-underline-offset: 5px;
text-decoration-color: $primary-800 !important;
}

&:visited {
color: $purple-700;
}

&[target="_blank"]:not(.external_link-no_icon) {

&:not(.btn) {
text-decoration: underline;

&::after {
content: "\e895"; // "launch" icon
font-family: 'Material Icons';
-webkit-font-feature-settings: 'liga';
display: inline-block;
vertical-align: middle;
margin-left: 0.18em;
text-decoration: none;
}
}
}
}
Expand Down Expand Up @@ -153,3 +171,8 @@ a.without-hover {
font-weight: 900!important;
}

.container-md {
max-width: 718px;
margin-left: auto;
margin-right: auto;
}
7 changes: 6 additions & 1 deletion _dev/apps/ui/src/assets/scss/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
font-family: $prestafont-font-family;
}

h2 {
h2, h3 {
font-weight: 600;
}

Expand Down Expand Up @@ -110,3 +110,8 @@ h2 {
.line-height-13 {
line-height: 1.3;
}

.text-justify-center {
text-align: justify;
text-align-last: center;
}
24 changes: 0 additions & 24 deletions _dev/apps/ui/src/assets/scss/components/_landingpagecontent.scss

This file was deleted.

This file was deleted.

10 changes: 6 additions & 4 deletions _dev/apps/ui/src/assets/scss/components/_landingpageheader.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
.ps_gs-landingpage-header {
&__text {
font-size: rem(14);
font-weight: 600;
line-height: rem(22.5);
&__logo {
height: rem(160);

img {
width: rem(230);
}
}

&__benefits {
Expand Down
25 changes: 16 additions & 9 deletions _dev/apps/ui/src/assets/scss/pages/_landingpage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,25 @@
&#{$root}--small-padding {
padding: rem(16);
}

.ps_gs-landingpage-content {
margin-bottom: rem(40);

@include media-breakpoint-up(md) {
padding: rem(32);

.ps_gs-landingpage-content__figure {
width: 30%;
&__figure {
padding: rem(24);
height: max-content;

@include media-breakpoint-down(md) {
width: max-content;
margin-left: auto;
margin-right: auto;
margin-bottom: rem(24);
}
}

}

&-content + hr {
@include media-breakpoint-up(md) {
margin-top: rem(50) !important;
}
@include media-breakpoint-up(md) {
padding: rem(40) rem(64);
}
}
Loading

0 comments on commit 18c61e4

Please sign in to comment.