aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2017-01-03 17:58:37 +0100
committerHeather Miller <heather.miller@epfl.ch>2017-01-03 17:58:37 +0100
commit21cddf809d02a674f1fac59ccc5dfb3adac3bab2 (patch)
treec9ff1b135b662223ef03ef07293efed716227efd
parentc4958a50b1555c8b40e3fde26832d0f774693b47 (diff)
Moar faceliftfacelift
Diffstat
-rw-r--r--_includes/navbar-links.html3
-rw-r--r--_includes/navbar.html26
-rw-r--r--_layouts/chapter.html54
-rw-r--r--chapter/3/message-passing.md2
-rw-r--r--resources/css/blog.css51
5 files changed, 111 insertions, 25 deletions
diff --git a/_includes/navbar-links.html b/_includes/navbar-links.html
new file mode 100644
index 0000000..8b80a48
--- /dev/null
+++ b/_includes/navbar-links.html
@@ -0,0 +1,3 @@
+<li><a href="{{ site.baseurl }}/index.html">Intro</a></li>
+<li><a href="{{ site.baseurl }}/chapters">Chapters</a></li>
+<li><a href="{{ site.baseurl }}/about.html">About</a></li> \ No newline at end of file
diff --git a/_includes/navbar.html b/_includes/navbar.html
new file mode 100644
index 0000000..df5bc60
--- /dev/null
+++ b/_includes/navbar.html
@@ -0,0 +1,26 @@
+
+ <div class="navbar navbar-default navbar-static-top" role="navigation">
+ <div class="container">
+ <div class="col-md-2"></div>
+ <div class="col-md-6">
+ <div class="navbar-header">
+ {% if page.layout == 'front' %}
+ {% else %}
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ {% endif %}
+ <!-- <a class="navbar-brand" href="#">Project name</a> -->
+ </div>
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav navbar-right">
+ {% include navbar-links.html %}
+ </ul>
+ </div><!--/.nav-collapse -->
+ </div>
+ <div class="col-md-2"></div>
+ </div>
+ </div> \ No newline at end of file
diff --git a/_layouts/chapter.html b/_layouts/chapter.html
index bd8bcc0..78257b4 100644
--- a/_layouts/chapter.html
+++ b/_layouts/chapter.html
@@ -1,23 +1,53 @@
<!DOCTYPE html>
<html lang="en">
- {% include head.html %}
+{% include head.html %}
<body data-spy="scroll" data-target="#toc">
- <!-- <div class="thin-top-bar"></div> -->
<div class="topbar">
- <div class="logo-wrap">
- <!-- <div class="circle-logo"></div> -->
- <svg class="logo" width="100" height="100">
- <circle cx="50" cy="50" r="35" stroke-width="6" stroke="#fff" fill="#b3c7cf"/>
- <circle cx="50" cy="50" r="20" fill="#92adb9"/>
- <circle cx="50" cy="50" r="14" fill="#7499AA"/>
- </svg>
- <div class="book-title">
- <div class="prog-mod">Programming Models for</div>
- <div class="dist-comp">Distributed Computing</div>
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-1"></div>
+ <div class="col-sm-5">
+ <div class="logo-wrap">
+ <a href="{{ site.baseurl }}/">
+ <svg class="logo" width="100" height="100">
+ <circle cx="50" cy="50" r="35" stroke-width="6" stroke="#fff" fill="#b3c7cf"/>
+ <circle cx="50" cy="50" r="20" fill="#92adb9"/>
+ <circle cx="50" cy="50" r="14" fill="#7499AA"/>
+ </svg>
+ <div class="book-title">
+ <div class="prog-mod">Programming Models for</div>
+ <div class="dist-comp">Distributed Computing</div>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-5 visible-md visible-lg">
+ <div class="navbar-wrap">
+ <ul class="navbar">
+ {% include navbar-links.html %}
+ </ul>
+ </div>
+ </div>
+ <div class="col-sm-5 visible-sm visible-xs">
+ <div id="burger" data-toggle="collapse" data-target="#navbar-responsive-wrap">
+ <span></span>
+ <span></span>
+ <span></span>
+ <span></span>
+ </div>
+ <div class="navbar-responsive-wrap navbar-static-top navbar-collapse collapse" id="navbar-responsive-wrap">
+ <ul class="navbar-responsive">
+ {% include navbar-links.html %}
+ </ul>
+ </div>
+ </div>
+ <div class="col-sm-1">
+ </div>
</div>
</div>
</div>
+
<div class="container blog">
<div class="row">
<div class="col-sm-2"></div>
diff --git a/chapter/3/message-passing.md b/chapter/3/message-passing.md
index 3a27a40..25757e7 100644
--- a/chapter/3/message-passing.md
+++ b/chapter/3/message-passing.md
@@ -100,7 +100,7 @@ Splitting concerns into multiple pieces allows for the programmer to have an eas
This flexibility turns out to be a highly discussed advantage which continues to be touted in modern actor systems.
-## Rosette
+### Rosette
Rosette was both a language for concurrent object-oriented programming of actors, as well as a runtime system for managing the usage of and access to resources by those actors. Rosette {% cite Tomlinson:1988:ROC:67387.67410 --file message-passing %} is mentioned throughout Agha's _Concurrent Object-Oriented Programming_, {% cite Agha:1990:COP:83880.84528 --file message-passing %} and the code examples given in the paper are written in Rosette. Agha is even an author on the Rosette paper, so its clear that Rosette is foundational to the classic actor model. It seems to be a language which almost defines what the classic actor model looks like in the context of concurrent object-oriented programming.
diff --git a/resources/css/blog.css b/resources/css/blog.css
index 6074e5a..c47d5b3 100644
--- a/resources/css/blog.css
+++ b/resources/css/blog.css
@@ -160,7 +160,12 @@ ul > li {
padding-left: 30px;
}
-.prog-mod {
+.prog-mod,
+a:link > .book-title > .prog-mod,
+a:visited .book-title > .prog-mod,
+a:hover .book-title > .prog-mod {
+ transition: none;
+ border: none;
font-family: 'Alegreya Sans', sans-serif;
font-weight: 700;
font-style: italic;
@@ -170,7 +175,13 @@ ul > li {
color: #595959;
}
-.dist-comp {
+.dist-comp,
+a:link > .book-title > .dist-comp,
+a:visited > .book-title > .dist-comp,
+a:hover > .book-title > .dist-comp {
+ transition: none;
+ border: none;
+ color: #000;
font-family: 'Alegreya Sans', sans-serif;
text-transform: uppercase;
font-weight: 900;
@@ -218,11 +229,26 @@ code {
}
.logo-wrap {
+ /*width: 100%;*/
width: 84%;
padding-left: 8%;
padding-right: 8%;
}
+.logo-wrap > a:link,
+.logo-wrap > a:visited,
+.logo-wrap > a:hover {
+ transition: 0;
+ border: 0;
+}
+
+a:link > .logo,
+a:visited > .logo,
+a:hover > .logo {
+ transition: 0;
+ border: 0;
+}
+
.logo {
margin-left: -16px;
margin-top: 16px;
@@ -763,13 +789,13 @@ nav[data-toggle='toc'] {
.navbar > li a {
display: block;
text-align: center;
- margin: 14px 16px;
+ margin: 18px 16px;
/*padding: 14px 16px;*/
text-decoration: none;
font-weight: 700;
letter-spacing: 1px;
border: 0;
- font-size: 11px;
+ /*font-size: 11px;*/
text-transform: uppercase;
color: #000;
padding-bottom: 2px;
@@ -777,13 +803,13 @@ nav[data-toggle='toc'] {
}
.navbar > li a:hover {
- color: #562e4b;
- border-bottom: 2px solid #c5c763;
+ color: #7499aa;
+ border-bottom: 2px solid #562e4b;
}
.navbar > li a.active {
- color: #562e4b;
- border-bottom: 2px solid #c5c763;
+ color: #7499aa;
+ border-bottom: 2px solid #562e4b;
}
.navbar-wrap {
@@ -871,7 +897,7 @@ nav[data-toggle='toc'] {
z-index: 90;
margin: 0;
padding: 0;
- margin-top: 60px;
+ margin-top: 70px;
margin-left: -15px;
}
@@ -893,7 +919,7 @@ nav[data-toggle='toc'] {
}
.navbar-responsive > li:hover {
- background: #c5c763;
+ background: #7499aa;
}
.navbar-responsive > li > a {
@@ -1025,8 +1051,9 @@ nav[data-toggle='toc'] {
}
.page-title {
- margin-top: 4px;
- margin-bottom: 4px;
+ margin-top: 0.15em;
+ margin-bottom: 0.25em;
+ line-height: 0.9em;
}
.minutes {
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-15 23:48:00 +0000