Merge branch 'master' of git.emacsconf.org:emacsconf-wiki

5 files changed, 39 insertions, 14 deletions

diff --git a/2020/cfp.md b/2020/cfp.md
index e08f7e09..626cdc56 100644
--- a/2020/cfp.md
+++ b/2020/cfp.md
@@ -6,7 +6,7 @@ Toronto/EST). Moved CFP end date to October 7, 2020.
 
 **EmacsConf 2020 | November 28 and 29, 2020 | Online Conference**
 
-The Call for Proposals for EmacsConf 2020 talks is now open, until
+The Call for Proposals for EmacsConf 2020 is now open, until
 **September 30, 2020**.
 
 After a successful [[EmacsConf 2019|2019]], we are back again this
@@ -60,6 +60,7 @@ dates in the coming months, given the current state of the world, we
 may have to move things around a bit in case of unforeseen events.
 Thank you for bearing with us as we all navigate these trying times.
 
+<a name="formats"></a>
 ### Talk formats
 
 The following are the main formats for EmacsConf 2020 talks:
@@ -98,7 +99,7 @@ will be happy to work something out with you.
 To help minimize disruptions in case of potential technical issues
 that may arise during the conference, we ask that our speakers either
 schedule a short tech-check with us, or submit a prerecording of their
-talk (especially for Lightning talks, where the allotted time slot is
+talk (especially for lightning talks, where the allotted time slot is
 rather small and any issues that cannot be resolved quickly will
 greatly detract from the presentation).  We will send an email about
 this with more details further down the line.
diff --git a/2020/emacsconf-2020-cfp.org b/2020/emacsconf-2020-cfp.org
index a20edf98..8a889c43 100644
--- a/2020/emacsconf-2020-cfp.org
+++ b/2020/emacsconf-2020-cfp.org
@@ -5,7 +5,7 @@
 
 # Copyright (C) 2020 Amin Bandali, Sacha Chua, David Bremner
 
-The [[https://emacsconf.org/2020/cfp/][Call for Proposals]] for [[https://emacsconf.org/2020/][EmacsConf 2020]] talks is now open, until
+The [[https://emacsconf.org/2020/cfp/][Call for Proposals]] for [[https://emacsconf.org/2020/][EmacsConf 2020]] is now open, until
 *September 30, 2020*.
 
 After a successful EmacsConf 2019, we are back again this year and are
@@ -75,9 +75,9 @@ will be happy to work something out with you.
 To help minimize disruptions in case of potential technical issues
 that may arise during the conference, we ask that our speakers either
 schedule a short tech-check with us, or submit a prerecording of their
-talk (especially for Lightning talks, where the allotted time slot is
+talk (especially for lightning talks, where the allotted time slot is
 rather small and any issues that cannot be resolved quickly will
-greatly deter from the presentation).  We will send an email about
+greatly detract from the presentation).  We will send an email about
 this with more details further down the line.
 
 Keynote speaker(s) for EmacsConf 2020 will be introduced in a future
@@ -86,7 +86,7 @@ announcement.
 * Topic ideas
 
 Not sure what to talk about?  You might find some neat ideas on the
-[[https://emacsconf.org/2020/ideas/][ideas]] page (feel free to add yours there too)!  If you're still not
+[[https://emacsconf.org/2020/ideas/][ideas]] page.  Feel free to add yours there too!  If you're still not
 sure, come by our IRC channel =#emacsconf= on =chat.freenode.net= and
 say hi.  You can join the chat using [[ircs://chat.freenode.net:6697/emacsconf][your favourite IRC client]], or by
 pointing your web browser to [[https://chat.emacsconf.org][chat.emacsconf.org]] which runs our
diff --git a/2020/submit.md b/2020/submit.md
index 773c6da4..fa80b3cf 100644
--- a/2020/submit.md
+++ b/2020/submit.md
@@ -2,16 +2,16 @@
 [[!meta copyright="Copyright &copy; 2019, 2020 Amin Bandali"]]
 
 When you are ready to submit your proposal, send your submission via
-email to <emacsconf-submit@gnu.org> including at minimum these
-essential information:
+email to <emacsconf-submit@gnu.org> by **September 30**, including at
+minimum these essential information:
 
 - Your (preferred) name;
 
 - the title of your talk/session;
 
-- your preferred talk/session format, and whether you would be
-  flexible about your allotted time slot (whether a shorter format
-  would also work for your talk, and if you would be okay with
+- your preferred talk/session [[format|cfp#formats]], and whether you
+  would be flexible about your allotted time slot (whether a shorter
+  format would also work for your talk, and if you would be okay with
   presenting a shorter talk if necessary, to allow more people a
   chance to present at EmacsConf 2020);
 
diff --git a/local.css b/local.css
index 757863e4..af8f6e05 100644
--- a/local.css
+++ b/local.css
@@ -1,6 +1,28 @@
 /* ikiwiki local style sheet */
 
-#content { line-height: 1.5 }
+.pageheader, #pagebody, #footer {
+  max-width: 60rem;
+  margin: 0 auto;
+  padding-left: 2em;
+  padding-right: 2em;
+}
+
+.pageheader-wrapper {
+  margin: 0;
+  overflow: hidden;
+  background: #eee;
+  border-color: #999;
+  border-style: none none solid none;
+  border-width: 1px;
+}
+
+.pageheader { border: none }
+
+#content {
+  max-width: 38rem;
+  margin: 0;
+  line-height: 1.5;
+}
 
 video { max-width: 100% }
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index f741a107..28d650ad 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -42,6 +42,7 @@
 
 <TMPL_IF HTML5><article class="page"><TMPL_ELSE><div class="page"></TMPL_IF>
 
+<TMPL_IF HTML5><section class="pageheader-wrapper"><TMPL_ELSE><div class="pageheader-wrapper"></TMPL_IF>
 <TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
 <TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
@@ -122,6 +123,9 @@
 </TMPL_UNLESS>
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<div id="pagebody">
 
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF SIDEBAR>
@@ -131,8 +135,6 @@
 </TMPL_IF>
 </TMPL_UNLESS>
 
-<div id="pagebody">
-
 <TMPL_IF HTML5><section<TMPL_ELSE><div</TMPL_IF> id="content" role="main">
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>