From ad432ca31d209dfbcecb56ee4495e73a442dec06 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Fri, 13 Oct 2017 12:21:00 +0300 Subject: [PATCH] New pricing page design + Fixed: Some color issues + Fixed: Icons and Quick Nav in memory web api related data issues --- src/app/core/scss/partials/_colors.scss | 5 +- src/app/core/scss/partials/_material.scss | 2 +- .../sidenavs/main/main-sidenav.component.html | 1 + src/app/main/content/pages/pages.module.ts | 4 + .../content/pages/pricing/pricing.module.ts | 39 ++++ .../pricing/style-1/style-1.component.html | 175 ++++++++++++++++++ .../pricing/style-1/style-1.component.scss | 95 ++++++++++ .../pricing/style-1/style-1.component.ts | 15 ++ .../pricing/style-2/style-2.component.html | 161 ++++++++++++++++ .../pricing/style-2/style-2.component.scss | 95 ++++++++++ .../pricing/style-2/style-2.component.ts | 15 ++ .../pricing/style-3/style-3.component.html | 156 ++++++++++++++++ .../pricing/style-3/style-3.component.scss | 95 ++++++++++ .../pricing/style-3/style-3.component.ts | 15 ++ .../main/content/ui/icons/icons.component.ts | 2 +- .../main/quick-panel/quick-panel.component.ts | 4 +- src/app/navigation.model.ts | 22 +++ 17 files changed, 895 insertions(+), 6 deletions(-) create mode 100644 src/app/main/content/pages/pricing/pricing.module.ts create mode 100644 src/app/main/content/pages/pricing/style-1/style-1.component.html create mode 100644 src/app/main/content/pages/pricing/style-1/style-1.component.scss create mode 100644 src/app/main/content/pages/pricing/style-1/style-1.component.ts create mode 100644 src/app/main/content/pages/pricing/style-2/style-2.component.html create mode 100644 src/app/main/content/pages/pricing/style-2/style-2.component.scss create mode 100644 src/app/main/content/pages/pricing/style-2/style-2.component.ts create mode 100644 src/app/main/content/pages/pricing/style-3/style-3.component.html create mode 100644 src/app/main/content/pages/pricing/style-3/style-3.component.scss create mode 100644 src/app/main/content/pages/pricing/style-3/style-3.component.ts diff --git a/src/app/core/scss/partials/_colors.scss b/src/app/core/scss/partials/_colors.scss index a4ae2aa3..f2d3a7c5 100644 --- a/src/app/core/scss/partials/_colors.scss +++ b/src/app/core/scss/partials/_colors.scss @@ -55,7 +55,7 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400 .secondary-text, .mat-icon, .icon { - color: rgba(0, 0, 0, 0.54); + color: rgba(0, 0, 0, 0.54) !important; } &.hint-text, @@ -80,7 +80,7 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400 .mat-icon, .icon { - color: rgba(255, 255, 255, 1); + color: rgba(255, 255, 255, 1) !important; } &.secondary-text, @@ -111,6 +111,7 @@ $matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400 // If the contrast color is white... $fuseForeground: ( base: white, + text: white, hint-text: rgba(white, 0.5), divider: rgba(white, 0.12), ); diff --git a/src/app/core/scss/partials/_material.scss b/src/app/core/scss/partials/_material.scss index 3232602b..fb6c488e 100644 --- a/src/app/core/scss/partials/_material.scss +++ b/src/app/core/scss/partials/_material.scss @@ -196,7 +196,7 @@ mat-icon.status { background-color: #FFFFFF; width: 280px; border-radius: 2px; - margin: 24px 24px 0 0; + margin: 12px; overflow: hidden; &.style-1 { diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html index 2a4a75b4..b967b4cc 100644 --- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html +++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html @@ -1,6 +1,7 @@
+