From 3e6e3738031dc41738988d5913ad482e59e9defb Mon Sep 17 00:00:00 2001
From: Bady <bady@disroot.org>
Date: Sat, 19 Sep 2020 18:32:48 +0530
Subject: [PATCH] Papercut improvements
Partly fixes issue #14
---
coc.html | 2 +-
index.html | 6 +++---
sched.html | 61 ++++++++++++++++++++++++++++--------------------------
style.css | 5 ++++-
4 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/coc.html b/coc.html
index c78948b..3b24d56 100644
--- a/coc.html
+++ b/coc.html
@@ -84,7 +84,7 @@
<li>We will read every complaint and have several people on that alias that can help investigate and resolve the complaint.</li>
<li>We will reply, in writing, as soon as possible to acknowledge the concern and assure that the matter is being investigated.</li>
<li>Depending on the situation, we will talk to the reporter, the reported, or both to determine what mediation and/or action is necessary.</li>
- <li>Depending on the outcome of the investigation and mediation, we reserve the right to expel people not in compliance with our Code of Conduct from the venue. FSCI, the Free Software Camp Organizing Committee and the venue in which Free Software Camp is being held will not be held responsible for further costs incurred by the dismissal from the camp.</li>
+ <li>Depending on the outcome of the investigation and mediation, we reserve the right to expel people not in compliance with our Code of Conduct from the camp. FSCI, the Free Software Camp Organizing Committee and the venue in which Free Software Camp is being held will not be held responsible for further costs incurred by the dismissal from the camp.</li>
</ul>
</div>
</section>
diff --git a/index.html b/index.html
index 60a9084..81e900b 100644
--- a/index.html
+++ b/index.html
@@ -42,7 +42,7 @@
<a href='#about'><button>About us</button></a>
</div>
<div class="cta">
- <a href='learners.html'><button>Register Now</button></a>
+ <a href='learners.html'><button>Apply Now</button></a>
</div>
</div>
</div>
@@ -105,7 +105,7 @@
<div class="about-section" style="margin-top: 10vh auto;">
<div class="about-text">
<h1 class="medium-heading" style="color:#469198">How does it work</span>?</h1>
- <p class="para">Learners apply to join the program and are given a common introduction to the program, to free software, and to the projects they can work on. These sessions will be conducted online using free software tools (see below). Then they submit proposal(s) for working on the project of their choice which is evaluated and mentors get assigned for these. Learners can also choose to work independently without dedicated mentors. Learners are expected to report regularly on their progress and periodic review is done. By the end of the camp the learners will be contributing to free software and collaborating with other contributors from around the world.
+ <p class="para">Learners apply to join the program and are given a common introduction to the program, to free software, and to the projects they can work on. These sessions will be conducted online using <a href="#tools" style="text-decoration:none; color: #0000FF">free software tools</a>. Then they submit proposal(s) for working on the project of their choice which is evaluated and mentors get assigned for these. Learners can also choose to work independently without dedicated mentors. Learners are expected to report regularly on their progress and periodic review is done. By the end of the camp the learners will be contributing to free software and collaborating with other contributors from around the world.
</p>
</div>
</div>
@@ -134,7 +134,7 @@
</div>
</div>
<div class="about-section" style="margin: 10vh auto;">
- <div class="about-text">
+ <div id="tools" class="about-text">
<h1 class="medium-heading" style="color: #469198">Camp Communication Infrastructure</h1>
<div>
<ul>
diff --git a/sched.html b/sched.html
index a6d93dd..cd84ef5 100644
--- a/sched.html
+++ b/sched.html
@@ -45,89 +45,92 @@
border: 1px solid black;
padding: 30px;
}
+ th {
+ width: 30%;
+ }
</style>
<table style="width: 100%;">
<tbody>
<tr>
- <td style="width: 50.0000%;"><strong>September 19-October 15</strong></td>
+ <th scope="row"><strong>September 19-October 15</strong></th>
<td style="width: 50.0000%;"><strong>Mentors & Learners Application Window</strong><br />People who wish to join the camp as mentor or learner can apply during this time.</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>October 17-October 24</strong></td>
- <td style="width: 50.0000%;"><strong>Ice Breaking</strong><br />Learners get to know each other and know more about the program</td>
+ <th scope="row"><strong>October 17-October 24</strong></th>
+ <td><strong>Ice Breaking</strong><br />Learners get to know each other and know more about the program</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>October 25-November 3</strong></td>
- <td style="width: 50.0000%;"><strong>Introduction to Free Software</strong><br />Get to know free software philosophy and install a GNU/Linux OS</td>
+ <th scope="row"><strong>October 25-November 3</strong></th>
+ <td><strong>Introduction to Free Software</strong><br />Get to know free software philosophy and install a GNU/Linux OS</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>November 4-November 11</strong></td>
- <td style="width: 50.0000%;"><strong>Explore different areas of contribution</strong><br />Learn about different free software projects from contributors, and meet mentors. Exploration of potential ideas to work on in the later phase.</td>
+ <th scope="row"><strong>November 4-November 11</strong></th>
+ <td><strong>Explore different areas of contribution</strong><br />Learn about different free software projects from contributors, and meet mentors. Exploration of potential ideas to work on in the later phase.</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>November 12-November 19</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>November 12-November 19</strong></th>
+ <td>
<p><strong>Choose a way forward</strong></p>
Learners finalize one/two proposals for working on free software project(s) with mentors. Proposals should be submitted before 23:59 on November 19.</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>November 20-November 22</strong></td>
- <td style="width: 50.0000%;">
- <p><strong>Mentor assignment </strong></p>
+ <th scope="row"><strong>November 20-November 22</strong></th>
+ <td>
+ <p><strong>Mentor assignment</strong></p>
<p>Proposals are evaluated and learners are assigned mentors.</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>November 23</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>November 23</strong></th>
+ <td>
<p><strong>Start working with mentors</strong></p>
Learners can begin work as per their proposals</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>December 19</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>December 19</strong></th>
+ <td>
<p><strong>Last date for first report</strong></p>
<p>Learners submit an interim report with their progress.</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>December 20</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>December 20</strong></th>
+ <td>
<p><strong>First review meeting</strong></p>
<p>Camp regroups for evaluation and review of progress.</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>January 22</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>January 22</strong></th>
+ <td>
<p><strong>Submit second report</strong></p>
<p>Learners submit an interim report with their progress.</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>January 23</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>January 23</strong></th>
+ <td>
<p><strong>Second review meeting</strong></p>
<p>Camp regroups for evaluation and review of progress.</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>February 20</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>February 20</strong></th>
+ <td>
<p><strong>Submit final report</strong></p>
<p>Learners submit a final report about their project.</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>February 27</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>February 27</strong></th>
+ <td>
<p><strong>Final review meeting</strong></p>
<p>Camp regroups for final review of their project. Closing ceremony</p>
</td>
</tr>
<tr>
- <td style="width: 50.0000%;"><strong>February 28</strong></td>
- <td style="width: 50.0000%;">
+ <th scope="row"><strong>February 28</strong></th>
+ <td>
<p><strong>The After-party</strong></p>
<p>The camp never ends. You can continue your free software contributions and we will always remain a family.</p>
</td>
@@ -142,7 +145,7 @@
<a href="https://fsf.org.in"><img height="50px" src="https://fsf.org.in/assets/img/logo.png" alt="Logo of FSF" /></a>
</div>
<h3 style="text-align: center; font-weight: 400">Free Software Camp <a style="color: inherit;" href="privacy.html">Privacy Policy</a></h3>
-<p style="text-align: center;">Made with <span style="color: #e25555;">♥</span> All original content licensed under a free/libre copyleft license (GPL or CC BY-SA)</p>
+ <p style="text-align: center;">Made with <span style="color: #e25555;">♥</span> All original content licensed under a free/libre copyleft license (GPL or CC BY-SA)</p>
</footer>
</main>
</body>
diff --git a/style.css b/style.css
index 6f1ad10..3fbde05 100644
--- a/style.css
+++ b/style.css
@@ -241,7 +241,10 @@ nav{
margin: auto;
align-items: center;
}
-
+#tools {
+ margin-top: -100px;
+ padding-top: 100px;
+}
.about-cover{
flex: 1;
}
--
GitLab