Skip to content

Commit b362aa8

Browse files
committed
Fixed some graphical bugs that got introduced during the CSS cleanup - Issue #20
1 parent e9e62e3 commit b362aa8

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

public_html/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ <h2 id='scoreChange' class="scoreChange">+25</h2>
270270
<!-- Rank in leaderboards -->
271271
</div>
272272
<br />
273-
<div class = 'button blueButtonMenu'
273+
<div class = 'button blueButton returnButton'
274274
data-logic = 'return'>
275275
Return
276276
</div>
@@ -284,7 +284,7 @@ <h2 id='scoreChange' class="scoreChange">+25</h2>
284284
Multiple correct answers in a row will grant combo bonuses, while
285285
incorrect answers will cost you points, and end combos. <br /> <br />
286286
Answer as many questions as you can in the given time!
287-
<div class = 'button blueButtonMenu'
287+
<div class = 'button blueButton returnMenuButton'
288288
data-logic = 'endTutorial'>
289289
Return
290290
</div>

public_html/src/css/GameScreen.css

+12-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,12 @@
8484
font-size: 60px;
8585
text-align: left;
8686
padding-top: 200px;
87-
padding-left: 250px;
87+
padding-left: 230px;
88+
}
89+
90+
.readyText {
91+
padding-left: 0px !important;
92+
text-align: center !important;
8893
}
8994

9095
/* Animation for score flash-in-out */
@@ -136,4 +141,10 @@
136141

137142
.button.incorrect {
138143
background-color: red !important;
144+
}
145+
146+
.returnButton {
147+
font-size: 28px;
148+
width: 150px;
149+
margin: auto !important;
139150
}

public_html/src/css/TutorialScreen.css

+7
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@
55
padding: 17px;
66
font-size: 28px;
77
border: 0px;
8+
}
9+
10+
.returnMenuButton {
11+
font-size: 28px;
12+
width: 150px;
13+
margin: auto !important;
14+
margin-top: 60px !important;
815
}

public_html/src/js/GameScreen.js

+5
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
loadingString += '.';
130130
}
131131
$('#loadingMessage').text(loadingString);
132+
$('#loadingMessage').removeClass('readyText');
132133
/* Build Molecule */
133134
var molecule = MoleculeGeometryBuilder.load(data, 0.25, 5, 1, 0);
134135
if( molecule != undefined ) {
@@ -166,12 +167,16 @@
166167
}
167168
} else {
168169
enableButtons(this);
170+
/*
169171
$('#loadingMessage')
170172
.text('Ready')
171173
.css({
172174
'padding-left': '0px',
173175
'text-align': 'center'
174176
});
177+
*/
178+
$('#loadingMessage').text('Ready');
179+
$('#loadingMessage').addClass('readyText');
175180
$('#beginButton').addClass('in');
176181
}
177182
};

0 commit comments

Comments
 (0)