Skip to content

New template, first version. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[deps]
Franklin = "713c75ef-9fc9-4b05-94a9-213340da978e"
NodeJS = "2bd173c7-0d6d-553b-b6af-13a54713934c"
Xranklin = "558449b0-171e-4e1f-900f-d076a5ddf486"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ooops

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or, if it refers to https://github.com/tlienart/Xranklin.jl I you need to check in the manifest (which for the website would be a good idea)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow-up here: #4


[compat]
Franklin = "0.10.56"
2 changes: 2 additions & 0 deletions _assets/author-badges.dat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Philip1: green-philip, red-philip
Philip2: purple-philip, green-philip
Binary file added _assets/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/default-badge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified _assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/footer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/green-philip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/purple-philip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added _assets/red-philip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 68 additions & 13 deletions _css/adjust.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
@media (min-width: 1024px) {
.franklin-content {
width: 75%;
padding-left: 20%;
padding-right: 5%;
/*padding-left: 20%;*/
/*padding-right: 5%;*/
}
}

Expand Down Expand Up @@ -37,23 +37,78 @@ blockquote {
padding-bottom: 0.5em;
margin-top: 1.5em;
margin-bottom: 1em;
color:#e54252;
}

.franklin-content a {
text-decoration: none;
color:#e54252;
}

/* For some reason,
* `h1, h2, h3 { a { color: ... } a:visited { color: ... } }` didn't work.
*/
h1 a { color: #1c1c1c !important; }
h2 a { color: #1c1c1c !important; }
h3 a { color: #1c1c1c !important; }
h4 a { color: #1c1c1c !important; }
h5 a { color: #1c1c1c !important; }

h1 a:visited { color: #1c1c1c !important; }
h2 a:visited { color: #1c1c1c !important; }
h3 a:visited { color: #1c1c1c !important; }
h4 a:visited { color: #1c1c1c !important; }
h5 a:visited { color: #1c1c1c !important; }
h1 a { color: #81353c; !important; }
h2 a { color: #81353c !important; }
h3 a { color: #81353c !important; }
h4 a { color: #81353c !important; }
h5 a { color: #81353c !important; }

h1 a:visited { color: #81353c !important; }
h2 a:visited { color: #81353c !important; }
h3 a:visited { color: #81353c !important; }
h4 a:visited { color: #81353c !important; }
h5 a:visited { color: #81353c !important; }


.jp-logo {
background-image: url("/assets/logo.png");
padding-right:10px;
width:6%;
}

.news-container{
display: flex;
flex-wrap: wrap;
justify-content: center;
padding:20px;
}

.news-block{
border-style: solid;
border-color:#f8d8d5;
border-width:1px;
margin:-5px;
padding:20px;
font-family: nyt-cheltenham,georgia,'times new roman',times,serif;
color:#5A5A5A;
font-size:12px;
}

.news-block a{
color:#e54252;
font-family: nyt-cheltenham,georgia,'times new roman',times,serif;
font-size: 18px;
line-height: 0.5em;
}

.news-block p{
font-family: nyt-cheltenham,georgia,'times new roman',times,serif;
font-size:13px;
color:#5A5A5A;
overflow: hidden;
display: -webkit-box;
-webkit-line-clamp: 5;
-webkit-box-orient: vertical;
line-height: 1.5em;
}

.news-block img{
width:25px;
padding:0px;
}

.franklin-content p{
font-family: nyt-cheltenham,georgia,'times new roman',times,serif;
font-size:16px;
}
26 changes: 17 additions & 9 deletions _css/minimal-mistakes.css
Original file line number Diff line number Diff line change
Expand Up @@ -1867,6 +1867,8 @@ th {
}

.masthead {
background: transparent url("/assets/banner.png") fixed repeat center top;
height: 60px;
position: relative;
border-bottom: 1px solid #f2f3f3;
-webkit-animation: intro 0.3s both;
Expand All @@ -1881,6 +1883,7 @@ th {
margin-left: auto;
margin-right: auto;
padding: 1em;
padding-top: 5px;
max-width: 100%;
display: -webkit-box;
display: -ms-flexbox;
Expand Down Expand Up @@ -2141,18 +2144,19 @@ th {
-ms-flex-align: center;
align-items: center;
min-height: 2em;
background: #fff;
/*background: #fff;*/
}

.greedy-nav a {
display: block;
margin: 0 1rem;
color: #6f777d;
/*color: #6f777d;*/
color: #fff;
text-decoration: none;
}

.greedy-nav a:hover {
color: #53595e;
color: #fff; /*#53595e;*/
}

.greedy-nav a.site-logo {
Expand Down Expand Up @@ -2203,7 +2207,7 @@ th {
left: 0;
bottom: 0;
height: 4px;
background: #6f777d;
background: #e54252;
width: 100%;
-webkit-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
Expand Down Expand Up @@ -2238,10 +2242,12 @@ th {
margin: 0;
padding: 10px 20px;
font-size: 1em;
color: #e54252;
}

.greedy-nav .hidden-links a:hover {
color: #53595e;
/*color: #53595e;*/
color: #e54252;
background: #dbdddf;
}

Expand Down Expand Up @@ -2523,6 +2529,7 @@ th {
}

.page__footer {
background-image: url("/assets/footer.png");
clear: both;
float: left;
margin-left: 0;
Expand All @@ -2532,8 +2539,9 @@ th {
position: absolute;
bottom: 0;
height: auto;
margin-top: 3em;
color: #898c8f;
margin-top: 0px; /* 3em; */
/*color: #898c8f;*/
color: #fff;
-webkit-animation: intro 0.3s both;
animation: intro 0.3s both;
-webkit-animation-delay: 0.45s;
Expand All @@ -2551,7 +2559,7 @@ th {
clear: both;
margin-left: auto;
margin-right: auto;
margin-top: 2em;
margin-top: 1em;
max-width: 100%;
padding: 0 1em 2em;
}
Expand Down Expand Up @@ -3559,7 +3567,7 @@ a.reversefootnote:hover {

@media (min-width: 80em) {
#main {
max-width: 1280px;
/*max-width: 1280px;*/
}
}

Expand Down
2 changes: 1 addition & 1 deletion _layout/foot.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<li><a href="https://github.com/JuliaParallel" rel="nofollow noopener noreferrer"><i class="fab fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
</ul>
</div>
<div class="page__footer-copyright">&copy; {{ fill author }}. Powered by <a href="https://github.com/tlienart/Franklin.jl">Franklin</a> &amp; <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>.</div>
<div class="page__footer-copyright">&copy; {{ fill author }}. Powered by <a href="https://github.com/tlienart/Franklin.jl">Franklin</a>, <a href="https://mademistakes.com/work/minimal-mistakes-jekyll-theme/" rel="nofollow">Minimal Mistakes</a>, and <a href="https://julia.mit.edu" rel="nofollow">Julia Lab</a>.</div>
</footer>
</div>

Expand Down
1 change: 1 addition & 0 deletions _layout/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
{{insert style.html}}
{{isdef title}} <title>{{fill title}}</title> {{end}}
<!-- end custom head snippets -->

</head>
{{insert body_layout.html}}

Expand Down
3 changes: 2 additions & 1 deletion _layout/masthead.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<div class="masthead__inner-wrap">
<div class="masthead__menu">
<nav id="site-nav" class="greedy-nav">
<a class="site-title" href="/">JuliaParallel </a>
<img class="jp-logo" src="/assets/logo.png"/>
<a class="site-title" href="/">JuliaParallel</a>
<ul class="visible-links">
<li class="masthead__menu-item"><a href="/news/">News</a></li>
<li class="masthead__menu-item"><a href="/teaching/">Teaching</a></li>
Expand Down
2 changes: 2 additions & 0 deletions _layout/page_foot.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<!--
<div class="page-foot">
<div class="copyright">
&copy; {{ fill author }}. {{isnotpage /tag/*}}Last modified: {{ fill fd_mtime }}.{{end}} Website built with <a href="https://github.com/tlienart/Franklin.jl">Franklin.jl</a> and the <a href="https://julialang.org">Julia programming language</a>.
</div>
</div>
-->
10 changes: 10 additions & 0 deletions config.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ generate_rss = true
website_title = "JuliaParallel"
website_descr = "JuliaParallel"
website_url = "https://juliaparallel.org/"

# Author badges
using DelimitedFiles
author_badges_mat = readdlm("_assets/author-badges.dat", ':')
author_badges = Dict()
for i = 1:size(author_badges_mat,1)
author_badges[author_badges_mat[i]] =
rstrip.(lstrip.(split(author_badges_mat[i,2], ",")))
end

+++

<!--
Expand Down
105 changes: 0 additions & 105 deletions index.html

This file was deleted.

2 changes: 2 additions & 0 deletions index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{{news}}

10 changes: 0 additions & 10 deletions news/2022/04/hello_world.md

This file was deleted.

14 changes: 14 additions & 0 deletions news/2022/04/hello_world1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@def post_title = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt"
@def short_descr = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
@def post_author = "Philip1"
@def hascode = true
@def date = Date(2022, 04, 04)
@def rss = "Hello world"
@def tags = ["hpc", "internals", "news"]

# Lorem ipsum dolor sit amet
\toc

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

{{addcomments}}
Loading