Skip to content

Commit

Permalink
back home
Browse files Browse the repository at this point in the history
  • Loading branch information
outsidemybox committed Aug 26, 2014
1 parent 33630d5 commit 33e8af4
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 18 deletions.
2 changes: 2 additions & 0 deletions gpoh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#/bin/sh
git checkout gh-pages && git merge master && git push origin gh-pages && git checkout -
71 changes: 56 additions & 15 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,23 @@ <h1>...Change your Frame of Mind</h1>
<div id="sdt1" class="step part" data-x="1860" data-y="-330">
<h2>Let's get rid of some misconceptions</h2>
</div>
<div id="sdt2" class="step part sdt" data-x="1860" data-y="-270" data-scale="0.4">
<div id="sdt2" class="step part sdt" data-x="1660" data-y="-440" data-scale="0.4">
<img src="http://placehold.it/100x100">
<span>text rereading</span>
</div>
<div id="sdt3" class="step part sdt" data-x="1860" data-y="-195" data-scale="0.4">
<div id="sdt3" class="step part sdt" data-x="2060" data-y="-400" data-scale="0.4">
<img src="http://placehold.it/100x100">
<span>text highlighting</span>
</div>
<div id="sdt4" class="step part sdt" data-x="1860" data-y="-120" data-scale="0.4">
<div id="sdt4" class="step part sdt" data-x="1660" data-y="-290" data-scale="0.4">
<img src="http://placehold.it/100x100">
<span>text solution</span>
</div>
<div id="sdt5" class="step part sdt" data-x="1860" data-y="-45" data-scale="0.4">
<div id="sdt5" class="step part sdt" data-x="2060" data-y="-250" data-scale="0.4">
<img src="http://placehold.it/100x100">
<span>text multitasking</span>
</div>
<div id="sdt6" class="step part sdt" data-x="1860" data-y="-45" data-scale="0.4">
<div id="sdt6" class="step part sdt" data-x="1660" data-y="-140" data-scale="0.4">
<img src="http://placehold.it/100x100">
<span>Waiting for the last minute</span>
</div>
Expand Down Expand Up @@ -156,11 +156,11 @@ <h2>What should I do then?</h2>
<span>Do exercises.</span>
</div>
<div id="gwtl9" class="step part gwtl" data-x="1860" data-y="540" data-scale="0.25">
<span>Spread out your study sessions over days</span>
</div>
<div id="gwtl10" class="step part gwtl" data-x="2070" data-y="540" data-scale="0.25">
<span>If you struggle, you're learning!</span>
</div>
<!-- <div id="gwtl10" class="step part gwtl" data-x="2070" data-y="540" data-scale="0.25">
<span>...</span>
</div> -->

<div id="gwtl11" class="step remember" data-x="1860" data-y="330">
<h1></h1>
Expand All @@ -176,19 +176,60 @@ <h1>The good ways to learn</h1>
<li>Solve problems yourself, don't rush to the solution.</li>
<li>Self explanation of the steps during problem solving.</li>
<li>Do exercises</li>
<li>Spread out your study sessions over days</li>
<li>If you struggle, you're learning!</li>
</ul>
</div>

<!-- ================================================================================== -->
<!-- When to learn and revise ? -->
<!-- ================================================================================== -->

<div id="wtl1" class="step part" data-x="930" data-y="400">
<h2>So, when should I apply these techniques?</h2>
</div>
<div id="wtl2" class="step part" data-x="930" data-y="450">
<h2>Space your revisions, learn and revise a bit everyday.</h2>
</div>
<div id="wtl3" class="step part" data-x="930" data-y="450">
<dl>
<dt>In the evening</dt>
<dd>Revise what you've just learnt during your schoolday.</dd>
<dd>Revise the subjects you will have the next schoolday.</dd>
</dl>
</div>

<div id="wtl4" class="step part" data-x="930" data-y="400">
<h2>And how long are the sessions?</h2>
</div>
<div id="wtl5" class="step part blockWork" data-x="600" data-y="410">
<p>Work (focus!)</p>
25 mn
</div>
<div id="wtl6" class="step part blockPause" data-x="750" data-y="410">
<p>Pause</p>
</div>
<div id="wtl7" class="step part blockWork" data-x="900" data-y="410">
<p>Work (focus!)</p>
25 mn
</div>
<div id="wtl8" class="step part blockPause" data-x="1050" data-y="410">
<p>Pause</p>
</div>
<div id="wtl9" class="step part blockWork" data-x="1200" data-y="410">
<p>Work (focus!)</p>
25 mn
</div>
<div id="wtl10" class="step part blockPause" data-x="1350" data-y="410">
<p>Long Pause</p>
</div>

<div id="whenToLearn" class="step summary" data-x="930" data-y="400">
<h1>When to learn and revise ?</h1>
<h1>When to learn and revise?</h1>
<ul>
<li>Learn and revise a bit everyday, regularly.</li>
<li>25mn of work, a 5mn pause with a reward, 25mn of work, ...</li>
<li>25mn of work, a 5mn pause with a reward, 25mn of work, and so on.</li>
<li>Your brain needs pauses, time and sleep to assimilate the material.</li>
<li>By spacing your revisions, your brain works for you, during your freetime!</li>
</ul>
</div>

Expand Down Expand Up @@ -243,7 +284,7 @@ <h1>Have a life!</h1>
<!-- Mnemosy -->
<!-- ================================================================================== -->
<div id="mnemosy" class="step summary" data-x="-930" data-y="-400">
<h1>Mnemosy</h1>
<h2>Mnemosy</h2>
</div>

<!-- ================================================================================== -->
Expand All @@ -257,7 +298,7 @@ <h1>Credits</h1>
<i>Dunlosky, J., Rawson, K. A., Marsh, E. J., Nathan, M. J., & Willingham, D. T.</i>
</li>
<li>[2] Better Grades, Less Effort. W. R. Klemm, D.V.M., Ph.D.</li>
<li>[3]</li>
<li>[3] Divided Attention http://chronicle.com/article/Scholars-Turn-Their-Attention/63746/</li>
<li>[4]</li>
<li>[5]</li>
<li>[6]</li>
Expand All @@ -267,10 +308,10 @@ <h1>Credits</h1>
<p>Slides:</p>
<ul>
<li>Change your frame of mind:[2], []</li>
<li>Stop doing that:[1], [2]</li>
<li>Stop doing that:[1], [2], [3]</li>
<li>The good ways to learn:[1], [2]</li>
<li>When to learn and revise:[2], []</li>
<li>For a good learning session:[2], []</li>
<li>For a good learning session:[2], [3]</li>
<li>At school:[2], []</li>
<li>Tame your thoughts:[], []</li>
<li>Have a life!:[2], []</li>
Expand Down
30 changes: 27 additions & 3 deletions less/presentation.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ a:focus {

.fallback-message {
font-family: sans-serif;

line-height: 1.3;

width: 780px;
Expand Down Expand Up @@ -603,7 +604,11 @@ a:focus {
// ================================================================================================

body {
font-family: 'PT Sans', sans-serif;
// font-family: 'PT Sans', sans-serif;
font-family: 'MuseoSans-500';
src: url('webfonts/29DF2B_0_0.eot');
src: url('webfonts/29DF2B_0_0.eot?#iefix') format('embedded-opentype'),url('webfonts/29DF2B_0_0.woff') format('woff'),url('webfonts/29DF2B_0_0.ttf') format('truetype');

min-height: 740px;
background: whitesmoke;
}
Expand Down Expand Up @@ -690,8 +695,8 @@ body {
padding:0;
border: 1px solid rgba(0, 0, 0, .3);
min-width: 650px;
width: 650px;
height: 120px;
width: 860px;
height: 320px;
img {
vertical-align: text-top;
margin: 10px;
Expand All @@ -703,7 +708,26 @@ body {
min-width: 800px;
max-width: 800px;
height: 600px;
}

.blockPomodoro {
padding:0;
min-height:60px;
max-height:60px;
line-height:60px;
font-size: 1.35em;
text-align: center;
}

.blockWork {
.blockPomodoro;
border: 1px solid rgba(200, 200, 0, .3);
width:200px;
}
.blockPause {
.blockPomodoro;
border: 1px solid rgba(200, 0, 0, .3);
width:80px;
}

#howTo {
Expand Down

0 comments on commit 33e8af4

Please sign in to comment.