Merge pull request #3 from psychopy/master

merge from master
psychopy · Oct 13, 2020 · 3a722f5 · 3a722f5
2 parents 8d8fb79 + 583dc90
commit 3a722f5
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/source/3days/debuggingOnline.rst b/source/3days/debuggingOnline.rst
@@ -1,4 +1,10 @@
 
+.. ifslides::
+
+    .. image:: /_static/OST600.png
+        :align: left
+        :scale: 25 %
+
 .. _debuggingOnline:
 
 Debugging online

diff --git a/source/3days/index.rst b/source/3days/index.rst
@@ -2,7 +2,7 @@
 .. ifslides::
 
   .. image:: /_static/OST600.png
-    :align: right
+    :align: left
     :scale: 25%
 
 Building better experiments with

diff --git a/source/3days/index_rh.rst b/source/3days/index_rh.rst
@@ -1,8 +1,10 @@
 
 .. ifslides::
 
-  .. image:: /_static/nott_logo.png
-    :align: right
+    .. image:: /_static/OST600.png
+        :align: left
+        :scale: 25 %
+
 
 Building better experiments with
 `````````````````````````````````````````````````

diff --git a/source/3days/pavlovia.rst b/source/3days/pavlovia.rst
@@ -1,4 +1,11 @@
 
+.. ifslides::
+
+    .. image:: /_static/OST600.png
+        :align: left
+        :scale: 25 %
+
+
 .. _pavloviaEnv:
 
 The Pavlovia environment

diff --git a/source/3days/pavloviaLaunch.rst b/source/3days/pavloviaLaunch.rst
@@ -1,4 +1,11 @@
 
+.. ifslides::
+
+    .. image:: /_static/OST600.png
+        :align: left
+        :scale: 25 %
+
+
 .. _builderToPavlovia:
 
 Launching your studies on Pavlovia

diff --git a/source/index.rst b/source/index.rst
@@ -1,18 +1,15 @@
 
 .. ifslides::
 
-    .. image:: /_static/psychopy.png
-        :align: left
-        :scale: 50 %
-
     .. image:: /_static/OST600.png
-        :align: right
+        :align: left
         :scale: 25 %
 
 
 Open Science Tools official workshops
 `````````````````````````````````````````````````
 
+
 There are many resources to help you learn the various aspects of PsychoPy (and most of them are free!
 
 For users that have a budget, and want some direct training from the Open Science Tools team (who create PsychoPy), we now run frequent workshops with a range of topics, a range of timezones and a range of durations. 

diff --git a/source/themes/psychopy_bootstrap/navbar.html b/source/themes/psychopy_bootstrap/navbar.html
@@ -35,7 +35,7 @@
                       <li class="toctree-l1"><a class="reference internal" href="slides/3days/index.html#3">Day 1</a>
                       </li>
                       <li class="toctree-l1"><a class="reference internal" href="slides/3days/index.html#4">Day 2</a></li>
-                      <li class="toctree-l1"><a class="reference internal" href="slides/3days/index.html#5">Day 3</a></li>
+                      <li class="toctree-l1"><a class="reference internal" href="slides/3days/index.html#6">Day 3</a></li>
                   </ul>
               </ul>
             </li>