-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1128 from Mallikki/feature/showcase-improvement
style(showcase): improvement of showcase homepage and news page
- Loading branch information
Showing
18 changed files
with
481 additions
and
194 deletions.
There are no files selected for viewing
14 changes: 14 additions & 0 deletions
14
showcase/src/app/welcome/components/news-item/_news-item-theme.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| news-item { | ||
| .news-image { | ||
| border: 1px solid mat-color($grey-palette, 700); | ||
| background-color: #fff; | ||
| } | ||
|
|
||
| .news-item-content { | ||
| color: mat-color($grey-palette, 900); | ||
| } | ||
|
|
||
| .information { | ||
| color: mat-color($grey-palette, 600); | ||
| } | ||
| } |
37 changes: 35 additions & 2 deletions
37
showcase/src/app/welcome/components/news-item/_news-item.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,38 @@ | ||
| .section-border { | ||
| padding-bottom: 26px; | ||
| border-bottom: 1px solid mat-color($grey-palette, 400); | ||
| margin-bottom: 20px; | ||
| position: relative; | ||
| min-height: 1px; | ||
| display: flex; | ||
| justify-content: flex-start; | ||
| flex-direction: column; | ||
| width: 290px; | ||
| padding-left: 12px; | ||
| padding-right: 12px; | ||
| } | ||
|
|
||
| .news-image { | ||
| background-size: contain; | ||
| height: 150px; | ||
| width: 290px; | ||
| display: block !important; | ||
| background-position: 50% 50% !important; | ||
| background-repeat: no-repeat; | ||
| } | ||
|
|
||
| .news-item-content { | ||
| letter-spacing: 0; | ||
| font-weight: 400; | ||
| font-style: normal; | ||
| font-size: 13px; | ||
| line-height: 1.4; | ||
| } | ||
|
|
||
| .information { | ||
| font-size: 12px; | ||
| font-weight: 500; | ||
| line-height: 2px; | ||
| } | ||
|
|
||
| .news-item-title { | ||
| font-size: 15px; | ||
| } |
8 changes: 4 additions & 4 deletions
8
showcase/src/app/welcome/components/news-item/news-item.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| <div class="section-border"> | ||
| <div fxLayout="column" fxLayoutAlign="space-between" fxLayout.gt-xs="row wrap"> | ||
| <ng-content class="image" select=".news-image"></ng-content> | ||
| <div class="news-item-container"> | ||
| <ng-content class="mat-display-2" select=".news-item-title"></ng-content> | ||
| <ng-content class="image" select=".news-image"></ng-content> | ||
| <div class="mat-body-2 information">Release: {{ release }} ({{ newsDate }})</div> | ||
| <ng-content select=".news-item-content"></ng-content> | ||
| </div> | ||
| <div class="mat-body-2 information">Release: {{ release }} ({{ newsDate }})</div> | ||
| <ng-content select=".news-item-content"></ng-content> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| .mat-icon.core-image { | ||
| color: mat-color($accent-palette, 500); | ||
| } | ||
|
|
||
| .mat-icon.about-image { | ||
| color: mat-color($primary-palette, 500); | ||
| } | ||
|
|
||
| .mat-icon.ui-image { | ||
| color: mat-color($success-palette, 500); | ||
| } | ||
|
|
||
| .mat-icon.showcase-image { | ||
| color: mat-color($warning-palette, 900); | ||
| } | ||
|
|
||
| .custom-homepage-button { | ||
| color: #fff; | ||
| background-color: #0063bb; | ||
| box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .26); | ||
| } | ||
|
|
||
| .section-division { | ||
| border-bottom: 1px solid #bdbdbd; | ||
| } |
159 changes: 93 additions & 66 deletions
159
showcase/src/app/welcome/pages/home/_home-page.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,121 @@ | ||
| //set the header image | ||
| .about-background { | ||
| .centered-title { | ||
| text-align: center; | ||
| font-size: 17px; | ||
| line-height: 30px; | ||
| font-weight: 500; | ||
| } | ||
|
|
||
| .homepage-item { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
|
|
||
| margin-bottom: 20px; | ||
| height: 100px; | ||
| box-sizing: border-box; | ||
| margin: 16px auto; | ||
| } | ||
|
|
||
| .doc-subtitle { | ||
| margin-left: 25px; | ||
| } | ||
|
|
||
| background-color: mat-color($primary-palette, 900); | ||
| background-image: url(/assets/stark-core/logo/light/stark_logo_light.svg); | ||
| .stark-logo{ | ||
| background-image: url(/assets/stark-core/logo/dark/stark_logo_dark.svg); | ||
| width: 250px; | ||
| height: 100px; | ||
| background-size: contain; | ||
| background-repeat: no-repeat; | ||
| background-size: 250px 100px; | ||
| background-position: center; | ||
| display: flex; | ||
| margin: auto; | ||
| } | ||
|
|
||
| .light-font { | ||
| font-weight: normal; | ||
| .mat-icon.homepage-icons{ | ||
| height: 80px; | ||
| width: 80px; | ||
| min-width: 80px; | ||
| max-width: 80px; | ||
| } | ||
|
|
||
| .bottom-margin { | ||
| margin-bottom: 20px; | ||
| .page-content { | ||
| margin: 0; | ||
| overflow: hidden; | ||
| } | ||
|
|
||
| //icon with a link to github | ||
| .github-link .github-icon { | ||
| height: 60px; | ||
| width: 60px; | ||
| position: relative; | ||
| float: right; | ||
| .doc-description { | ||
| display: flex; | ||
| margin-left: 25px; | ||
| margin-right: 25px; | ||
| max-width: 750px; | ||
| align-items: stretch; | ||
|
|
||
| svg { | ||
| fill: #000; | ||
| p { | ||
| display: flex; | ||
| } | ||
| } | ||
|
|
||
| .information-title { | ||
| font-size: 21px; | ||
| color: mat-color($grey-palette, 900); | ||
| padding-bottom: 0; | ||
| display: inline-flex; | ||
| vertical-align: middle; | ||
| margin: 10px 0 10px 0; | ||
| } | ||
|
|
||
| @media #{$desktop-query} { | ||
| .about-title { | ||
| font-size: 55px; | ||
| margin-left: 25px; | ||
| } | ||
| .buttons-row{ | ||
| display: flex; | ||
| justify-content: center; | ||
| align-items: center; | ||
| padding-bottom: 25px; | ||
|
|
||
| .information-title { | ||
| font-size: 30px; | ||
| .button.custom-homepage-button { | ||
| align-items: center; | ||
| justify-content: center; | ||
| width: 200px; | ||
| text-decoration: none; | ||
| height: 40px; | ||
| font-weight: 600; | ||
| line-height: 40px; | ||
| border-radius: 48px; | ||
| box-sizing: border-box; | ||
| cursor: pointer; | ||
| display: flex; | ||
| padding: 0 24px; | ||
| text-align: center; | ||
| margin: auto 6px auto 6px; | ||
| font-size: 12px; | ||
| } | ||
|
|
||
| } | ||
|
|
||
| .about-background { | ||
| height: 150px; | ||
| background-size: 250px 75px; | ||
| } | ||
| .section-division { | ||
| padding-bottom: 20px; | ||
| padding-top: 20px; | ||
| } | ||
|
|
||
| .last-section-division{ | ||
| padding-top: 20px; | ||
| } | ||
|
|
||
| @media #{$tablet-only-query} { | ||
| .list { | ||
| font-size: 17px; | ||
| @media #{$tablet-query}{ | ||
|
|
||
| .buttons-row{ | ||
| .button.custom-homepage-button { | ||
| margin: auto 30px auto 30px; | ||
| font-size: 15px; | ||
| } | ||
| } | ||
|
|
||
| .mat-icon.homepage-icons{ | ||
| margin-left: 25px; | ||
| height: 120px; | ||
| width: 120px; | ||
| min-width: 120px; | ||
| max-width: 120px; | ||
| } | ||
|
|
||
| .about-background { | ||
| height: 100px; | ||
| background-size: 250px 75px; | ||
| .homepage-item { | ||
| flex-direction: row; | ||
| } | ||
| } | ||
|
|
||
| @media #{$tablet-query} { | ||
| .stark-app-bar-content-center { | ||
| align-self: center; | ||
| margin-bottom: 15px; | ||
| .centered-title { | ||
| font-size: 30px; | ||
| line-height: 50px; | ||
| } | ||
| } | ||
|
|
||
| @media #{$mobile-only-query} { | ||
| .stark-app-bar-page-title { | ||
| position: absolute; | ||
| top: 60px; | ||
| left: 0; | ||
|
|
||
| width: 100px; | ||
| height: 30px; | ||
| max-width: 100%; | ||
|
|
||
| background-image: url(/assets/stark-core/logo/light/stark_logo_light.svg); | ||
| background-size: contain; | ||
| background-position: center; | ||
| background-repeat: no-repeat; | ||
| .stark-logo{ | ||
| width: 450px; | ||
| height: 130px; | ||
| } | ||
| } |
Oops, something went wrong.