Skip to content

GitLab

ScreenScale
ScreenScale
Commit 2f85c57b authored by Wakefield Morys-Carter's avatar Wakefield Morys-Carter
Browse files
Options

Add original CC image

parent d3a8ed6f
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 14 deletions
bank-1300155_640.png 0 → 100644
View file @ 2f85c57b
bank-1300155_640.png

25.2 KB

index.html
View file @ 2f85c57b
......@@ -3,17 +3,10 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="user-scalable=no">
<<<<<<< HEAD
<title>screen scale [PsychoPy]</title>
<!-- styles -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.12.1/jquery-ui.min.css">
<link rel="stylesheet" href="./lib/psychojs-2023.1.3.css">
=======
<title>screen_scale [PsychoPy]</title>
<!-- styles -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.12.1/jquery-ui.min.css">
<link rel="stylesheet" href="./lib/psychojs-2022.1.3.css">
>>>>>>> 1afc9e4edacd1824becad2b4ad25f551e673377b
</head>
<body>
<div id="root"></div>
......@@ -22,16 +15,9 @@
<script src="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.12.1/jquery-ui.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/preloadjs@1.0.1/lib/preloadjs.min.js"></script>
<!-- experiment -->
<<<<<<< HEAD
<script src="./screen scale.js" type="module"></script>
<!-- legacy browsers -->
<script src="./lib/psychojs-2023.1.3.iife.js" nomodule></script>
<script src="./screen scale-legacy-browsers.js" nomodule></script>
=======
<script src="./screen_scale.js" type="module"></script>
<!-- legacy browsers -->
<script src="./lib/psychojs-2022.1.3.iife.js" nomodule></script>
<script src="./screen_scale-legacy-browsers.js" nomodule></script>
>>>>>>> 1afc9e4edacd1824becad2b4ad25f551e673377b
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment