Skip to content

Commit

Permalink
Format code
Browse files Browse the repository at this point in the history
  • Loading branch information
mvuorre committed Oct 24, 2023
1 parent 8c1bbdd commit 8fa26e1
Show file tree
Hide file tree
Showing 3 changed files with 278 additions and 269 deletions.
39 changes: 21 additions & 18 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
<!DOCTYPE html>
<html>
<head>
<title>Tests</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
<link href="squared.css", rel="stylesheet" type="text/css">
<script src="jspsych/dist/jspsych.js"></script>
<script src="jspsych/dist/plugin-call-function.js"></script>
<script src="jspsych/dist/plugin-fullscreen.js"></script>
<script src="jspsych/dist/plugin-html-keyboard-response.js"></script>
<script src="jspsych/dist/plugin-html-button-response.js"></script>
<script src="jspsych/dist/plugin-preload.js"></script>
<script src="jspsych/dist/plugin-survey-text.js"></script>
<script src="jspsych/dist/plugin-survey-multi-choice.js"></script>
<script src="https://unpkg.com/@jspsych-contrib/plugin-pipe"></script>
<link href="jspsych/dist/jspsych.css", rel="stylesheet" type="text/css">

</head>
<body>
</body>
<script src="squared.js"></script>
<head>
<title>Tests</title>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script>
<link href="squared.css" , rel="stylesheet" type="text/css">
<script src="jspsych/dist/jspsych.js"></script>
<script src="jspsych/dist/plugin-call-function.js"></script>
<script src="jspsych/dist/plugin-fullscreen.js"></script>
<script src="jspsych/dist/plugin-html-keyboard-response.js"></script>
<script src="jspsych/dist/plugin-html-button-response.js"></script>
<script src="jspsych/dist/plugin-preload.js"></script>
<script src="jspsych/dist/plugin-survey-text.js"></script>
<script src="jspsych/dist/plugin-survey-multi-choice.js"></script>
<script src="https://unpkg.com/@jspsych-contrib/plugin-pipe"></script>
<link href="jspsych/dist/jspsych.css" , rel="stylesheet" type="text/css">

</head>

<body>
</body>
<script src="squared.js"></script>

</html>
46 changes: 25 additions & 21 deletions squared.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
p {
/* font-family: Arial; */
font-size: 25px
/* font-family: Arial; */
font-size: 25px
}

input[type=text] {
color: black;
}

body {
background-color: black;
}
Expand All @@ -18,48 +18,52 @@ body {
top: 10px;
margin: auto;
display: inline-block;

}

#timeleft {
#timeleft {
height: 20px;
background-color: #04AA6D;
top: 10px;
}

.space {
width: 90px; /* 300 for stroop; 150px for flanker */
width: 90px;
/* 300 for stroop; 150px for flanker */
height: auto;
display: inline-block;
}

.choiceStyle {
background-color: black;
/* border: 2px solid white; */
width: 305px; /* 200px for stroop; 350px for flanker */;
/* color: white;
background-color: black;
/* border: 2px solid white; */
width: 305px;
/* 200px for stroop; 350px for flanker */
;
/* color: white;
padding: 5px 10px; */
text-align: center;
text-decoration: none;
display: inline-block;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 54pt;
outline: none;
cursor: pointer;
}
cursor: pointer;
}

.defaultButton {
width: 250px;
padding: 10px 10px;
font-size: 12pt;
width: 250px;
padding: 10px 10px;
font-size: 12pt;
background-color: #d0d0d0;
font-family: Open Sans;
font-weight: 700;
border: 2px solid #dddddd;

}

.defaultButton:hover, .defaultButton:focus {
background-color: #eeeeee;
.defaultButton:hover,
.defaultButton:focus {
background-color: #eeeeee;
}

.jspsych-display-element {
Expand Down
Loading

0 comments on commit 8fa26e1

Please sign in to comment.