Skip to content

Commit 85668de

Browse files
authored
Merge branch 'master' into henry
2 parents 24de022 + 10c9093 commit 85668de

File tree

2 files changed

+164
-69
lines changed

2 files changed

+164
-69
lines changed

3people.md

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,52 @@ html {
8888
<img src="{{ site.baseurl }}/public/assets/ALP.jpeg" alt="Angel" style="width:45%">
8989
<div class="container">
9090
<h2>Angel L. Phanthanourak</h2>
91+
<p class="title">PhD Student</p>
92+
<p>Multi-omics Network Analytics</p>
93+
94+
</div>
95+
</div>
96+
</div>
97+
<div class="column">
98+
<div class="card">
99+
<img src="{{ site.baseurl }}/public/assets/ALP.jpeg" alt="Angel" style="width:45%">
100+
<div class="container">
101+
<h2>Test</h2>
102+
<p class="title">Research Assistant</p>
103+
<p>Multi-omics Network Analytics</p>
104+
105+
</div>
106+
</div>
107+
</div>
108+
</div>
109+
<div class="row">
110+
<div class="column">
111+
<div class="card">
112+
<img src="{{ site.baseurl }}/public/assets/ALP.jpeg" alt="Angel" style="width:45%">
113+
<div class="container">
114+
<h2>Test</h2>
115+
<p class="title">Research Assistant</p>
116+
<p>Multi-omics Network Analytics</p>
117+
118+
</div>
119+
</div>
120+
</div>
121+
<div class="column">
122+
<div class="card">
123+
<img src="{{ site.baseurl }}/public/assets/ALP.jpeg" alt="Angel" style="width:45%">
124+
<div class="container">
125+
<h2>Test</h2>
126+
<p class="title">Research Assistant</p>
127+
<p>Multi-omics Network Analytics</p>
128+
129+
</div>
130+
</div>
131+
</div>
132+
<div class="column">
133+
<div class="card">
134+
<img src="{{ site.baseurl }}/public/assets/ALP.jpeg" alt="Angel" style="width:45%">
135+
<div class="container">
136+
<h2>Testerrr</h2>
91137
<p class="title">Research Assistant</p>
92138
<p>Multi-omics Network Analytics</p>
93139
@@ -127,10 +173,39 @@ html {
127173
<p class="title">Senior Data Scientist</p>
128174
<p>Data Science Platform</p>
129175
176+
<img src="{{ site.baseurl }}/public/assets/APC.jpeg" alt="Albert" style="width:45%">
177+
<div class="container">
178+
<h2>Albert Pallejà Caro</h2>
179+
<p class="title">Senior Data Scientist</p>
180+
<p>Data Science Platform</p>
181+
182+
</div>
183+
</div>
184+
</div>
185+
<div class="column">
186+
<div class="card">
187+
<img src="{{ site.baseurl }}/public/assets/JBJ.jpeg" alt="Jakob" style="width:45%">
188+
<div class="container">
189+
<h2>Jakob B. Jespersen</h2>
190+
<p class="title">Data Scientist</p>
191+
<p>Data Science Platform</p>
192+
193+
</div>
194+
</div>
195+
</div>
196+
<div class="column">
197+
<div class="card">
198+
<img src="{{ site.baseurl }}/public/assets/JBJ.jpeg" alt="Jakob" style="width:45%">
199+
<div class="container">
200+
<h2>testttt</h2>
201+
<p class="title">Data Scientist</p>
202+
<p>Data Science Platform</p>
203+
130204
</div>
131205
</div>
132206
</div>
133207
</div>
134208

209+
135210
</body>
136211
</html>

README.md

Lines changed: 89 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,23 @@ Jekyll is a static site generator that takes care of updating a site template wi
66

77
The site template is [Hyde (see repo for more details)](https://github.com/poole/hyde) with some of our own modifications.
88

9-
Included are instructions for how to update the team website with a focus on the content rather than formating.
9+
Included are instructions for how to update the team website with a focus on the content rather than styling.
1010

1111
- [MoNA website](#mona-website)
12-
- [Contents](#contents)
13-
- [Directory organization](#directory-organization)
12+
- [Directory organization](#directory-organization)
13+
- [MUST READ - how jekyll works](#must-read---how-jekyll-works)
1414
- [Home page (default) vs. all other pages](#home-page-default-vs-all-other-pages)
15-
- [Adding a page (example)](#adding-a-page-example)
16-
- [Updating an existing page](#updating-an-existing-page)
15+
- [Updating website content](#updating-website-content)
16+
- [(OPTIONAL) Previewing changes locally](#optional-previewing-changes-locally)
17+
- [Updating an existing page](#updating-an-existing-page)
18+
- [Adding a page (example)](#adding-a-page-example)
1719
- [Updating side nav links](#updating-side-nav-links)
18-
- [Testing locally](#testing-locally)
20+
- [Updating the styling ](#updating-the-styling)
1921
- [Original Author](#original-author)
2022
- [License](#license)
2123

22-
## Contents
2324

24-
### Directory organization
25+
## Directory organization of Repo
2526

2627
(only highlighting folders and files relevant to updating site)
2728

@@ -49,99 +50,118 @@ Included are instructions for how to update the team website with a focus on the
4950

5051
```
5152

52-
- Main takeaway: To update the contents of the website you will only need to add/remove/update markdown files in the main directory.
5353

54-
- To incorporate images or any other files into the site please put them in `/public/assets/`
55-
56-
- Extra: Updates to formating is done in the 3 directories: `/_includes/` `/_layouts/` and `/_public/`
54+
## MUST READ - how jekyll works
5755

58-
### Home page (default) vs. all other pages
59-
60-
- How jekyll knows to work its magic on a markdown or html file is based on the file's [YAML front matter block](https://jekyllrb.com/docs/front-matter/).
56+
1. How jekyll knows to work its magic on a markdown or html file is based on the file's [YAML front matter block](https://jekyllrb.com/docs/front-matter/).
6157

62-
- no front matter = not included in the website (e.g., this readme)
63-
64-
- Currently, there are 2 page layouts (templates) used in our site:
65-
- `/_layouts/default.html`
66-
- `/_layouts/page.html`
67-
68-
- The way that they are merged with the markdown files is via the front matter:
58+
e.g.,
59+
```
60+
---
61+
layout: page
62+
title: About
63+
permalink: /about/
64+
---
65+
```
66+
- **no front matter = not included in the website** (e.g., jekyll knows not to include this README.md you are reading because there is no front matter)
6967

70-
```
71-
---
72-
layout: page
73-
title: About
74-
permalink: /about/
75-
---
76-
```
77-
78-
- `layout: default` should only be used for the home page because it has some additional formatting + appears as the first option in the top menu bar
68+
2. Main takeaway: To update the **contents of the website** you will only need to add/remove/update the markdown files with front matter in the main directory. (e.g., [3people.md](3people.md)) More instructions in [Updating website content](#updating-website-content).
7969

80-
>From the Hyde repo: "**Why require a specific layout?** Jekyll will return *all* pages, including the `atom.xml`, and with an alphabetical sort order. To ensure the first link is *Home*, we exclude the `index.md` page from this list by specifying the `default` layout."
70+
- **Do not alter the files in `_includes`, `_layouts` for now.**
8171

82-
- `layout: page` is used for all other pages you want included in the site. More instructions for adding a new page below.
8372

84-
#### Adding a page (example)
73+
#### Home page (default) vs. all other pages
8574

86-
Let's say you want to add a 'Contact' page and it should appear as the last option on the top menu bar
87-
88-
- create a markdown file in the main directory
75+
- How jekyll knows to work its magic on a markdown or html file is based on the file's [YAML front matter block](https://jekyllrb.com/docs/front-matter/).
8976

90-
- since 'page.html' pages are sorted alphabetically, if you want the Contact page to be last in the menu prefix the markdown filename with a '9' or 'z' for example
77+
- Currently, there are 2 page layouts (templates) used in our site:
78+
- `default` via */_layouts/default.html*
79+
- `page` via */_layouts/page.html`*
9180

92-
- in the markdown file, the front matter should look like this:
81+
- The way that the styling is merged with the markdown files is via `layout` in the front matter:
82+
e.g.,
83+
```
84+
---
85+
layout: page
86+
title: About
87+
permalink: /about/
88+
---
89+
```
90+
- `layout: page` is to be used for almost all of the pages you want included in the site
91+
- `layout: default` is only used for the home page [index.md](index.md) because it has some additional formatting + appears as the first option in the top menu bar
92+
>From the Hyde repo: "**Why require a specific layout?** Jekyll will return *all* pages, including the `atom.xml`, and with an alphabetical sort order. To ensure the first link is *Home*, we exclude the `index.md` page from this list by specifying the `default` layout."
93+
94+
95+
## Updating website content
96+
97+
- To update the contents of the website you will only need to add/remove/update markdown files in the main directory.
98+
- To incorporate images or any other files into the site please put them in `/public/assets/`
9399

94-
```
95-
---
96-
layout: page
97-
title: Contact
98-
permalink: /contact/
99-
---
100-
```
101-
- the layout should be 'page', to tell jekyll to use the page.html layout
102-
- the title is what will be used in the top menu bar
103-
- assigning a permalink will overwrite the default of using the filename (e.g., *https:// ... io/9contact/* :thumbsdown:)
104-
105-
- underneath the front matter include whatever content you would like
106-
107-
- you can add formatting to the file using markdown or html syntax
100+
#### (OPTIONAL) Previewing changes locally
101+
If you want to test/preview the site locally as you make changes
108102

109-
- when done save and push changes, jekyll will take care of the rest
103+
1. [install jekyll](https://jekyllrb.com/docs/installation/)
104+
2. in your terminal cd into the site's repo
105+
3. then run `jekyll serve --watch`
106+
4. open the url in `Server address: ...`
107+
5. To preview your changes don't forget to save your file and refresh the browser.
110108

111109
#### Updating an existing page
112110

113-
- In the main directory, open the markdown file
114-
- make whatever changes to the content you want
115-
- save it and push changes
111+
1. Clone this repository
112+
2. Create a branch from the 'master' branch of THIS repository (not the poole/hyde one)
113+
3. In the main directory, open the markdown file you want to update e.g. [3people.md](3people.md)
114+
4. make whatever changes to the content you want
115+
5. save the file
116+
6. push the changes to your branch
117+
7. Make a pull request for your branch into the **MoNA's `Master` branch** (:warning: NOT poole/hyde) then jekyll will take care of the rest
116118

117119
(it's that easy :smiley:)
118120

119-
### Updating side nav links
120121

121-
The file that needs to be updated is `/_inclues/sidebar.html`
122+
#### Adding a page (example)
123+
Let's say you want to add a 'Contact' page and it should appear as the last option on the top menu bar
122124

123-
Look for the `sidebar-nav-item` tags
125+
1. Steps 1-3 in [Updating an existing page](#updating-an-existing-page)
126+
2. Create a markdown file in the root directory. Since pages are sorted alphabetically, if you want the Contact page to be last in the menubar of the website, prefix the markdown filename with a '9' or 'z' for example
127+
3. In the markdown file, the front matter should look like this:
128+
129+
```
130+
---
131+
layout: page
132+
title: Contact
133+
permalink: /contact/
134+
---
135+
```
136+
- the layout should be 'page', to tell jekyll to use the page.html layout
137+
- the title is what will be used in the top menu bar
138+
- assigning a permalink will overwrite the default of using the ugly filename (e.g., `... .github.io/contact/` instead of `... .github.io/9contact/`)
124139

125-
### Testing locally
140+
4. Underneath the front matter include whatever content you would like. You can add formatting to the file using markdown or html syntax.
141+
5. Steps 5-7 in [Updating an existing page](#updating-an-existing-page)
126142

127-
If you want to test/preview the site locally as you make changes
128143

129-
- [install jekyll](https://jekyllrb.com/docs/installation/)
130-
- in your terminal cd into the site's repo
131-
- then run `jekyll serve --watch`
144+
#### Updating side nav links
145+
- similar steps to those in [Updating an existing page](#updating-an-existing-page)
146+
- However, the file that needs to be updated is `/_includes/sidebar.html`
147+
- Look for the `sidebar-nav-item` tags
132148

133149

134-
## Original Author
150+
## Updating the styling
151+
**:warning: Dangerous territory**
152+
153+
- Recall that the site template is [Hyde (see repo for more details)](https://github.com/poole/hyde) with some of our own modifications.
154+
- Updates to formating is done in the 3 directories: `/_includes/` `/_layouts/` and `/public/`
155+
- Requires HTML and CSS
135156

136-
[please see hyde repo for more details](https://github.com/poole/hyde)
137157

158+
## Original Author
159+
[Please see hyde repo for more details](https://github.com/poole/hyde)
138160
**Mark Otto**
139161
- <https://github.com/mdo>
140162
- <https://twitter.com/mdo>
141163

142-
143164
## License
144-
145165
Open sourced under the [MIT license](LICENSE.md).
146166

147167
<3

0 commit comments

Comments
 (0)