Skip to content

Commit

Permalink
Merge pull request finos#3 from mcleo-d/move-media-to-home
Browse files Browse the repository at this point in the history
Update HTML and CSS for Morphir Homepage Media
  • Loading branch information
ronaldssebalamu authored Jul 13, 2023
2 parents f6176a0 + 68be166 commit 53f66db
Show file tree
Hide file tree
Showing 10 changed files with 23,216 additions and 10,598 deletions.
5 changes: 4 additions & 1 deletion docs/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ title: FAQs
# Frequently Asked Questions

### How Do I Generate the Scala Codecs?
Run the the `morphir gen` command with the -s flag
Run the command `morphir-elm gen -s`

### How Do I Generate the JSON Schema for my model
Run the `morphir json-schema-gen` command
1 change: 1 addition & 0 deletions docs/scala-api-usage-docs.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
id: scala-api
title: Scala API Guide
---


Expand Down
2 changes: 1 addition & 1 deletion docs/spark-backend-api-documentation.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
id: spark-backend-api
title: API Documentation
title: Spark API Documentation
---

# Spark Backend/API Documentation
Expand Down
10 changes: 10 additions & 0 deletions node_modules/.yarn-integrity

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30,878 changes: 21,764 additions & 9,114 deletions website/package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions website/sidebars.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ const sidebars = {
type: 'category',
label: 'Scala Integration Guide',
items: [
'scala-api',
'scala-backend',
'scala-codecs',
'codec-docs',
Expand Down
33 changes: 8 additions & 25 deletions website/src/components/MediaPanel.module.css
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
.mediaPanel {
box-sizing: border-box;
float: left;
line-height: 26.4px;
/* display:table-cell; */
/* margin-left: auto; */
/* border-collapse: collapse; */
/* list-style: list-style-image; */
/* margin: 0 auto; */
/* display:block; */
/* overflow:auto;
float: none;
position: static;
z-index: auto; */
}
.videoContainer{
margin: auto;
border: 15px solid black;
.videoContainer {
width:100%;
padding: 15px;
}
.descriptionContainer{
float:none;
}
img{
width: 250pt;

.descriptionContainer {
float:none;
}
a{
width: 478.2;

.videoContainer img {
border: 1px solid black;
}
35 changes: 21 additions & 14 deletions website/src/components/MediaPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,27 @@ const MediaList: MediaList[] = [
Description: 'Morphir Showcase – Full Show',
},
]

export default function MediaPanel (): JSX.Element{
return(
<div>
{MediaList.map(({...props}, idx) => (
<div className={Styles.mediaPanel}>
<div className= {Styles.videoContainer}>
<a href = {props.EpisodeUrl}>
<img src = {props.EpisodeImg}></img>
</a>
<div className='container padding--lg'>
<section className='row text--center padding-horiz--md'>
<div className="col col--12">
<h2>Morphir in the Media</h2>
</div>
</section>
<section className='row text--center padding-horiz--md'>
{MediaList.map(({...props}, idx) => (
<div className="col col--4">
<div className={Styles.videoContainer}>
<a href={props.EpisodeUrl}>
<img src={props.EpisodeImg} alt={props.Description}></img>
</a>
<br/>
<a href={props.EpisodeUrl}>{props.Description}</a>
</div>
</div>
<div className= {Styles.descriptionContainer}>
<a href = {props.EpisodeUrl}>{props.Description}</a>
</div>
</div>
))}
</div>
)}
))}
</section>
</div>
)}
2,845 changes: 1,402 additions & 1,443 deletions website/yarn.lock

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


0 comments on commit 53f66db

Please sign in to comment.