Skip to content

Commit

Permalink
revert
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasjfox1 committed Sep 27, 2015
1 parent fa41397 commit 34727d5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 21 deletions.
4 changes: 1 addition & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<span class="element"></span>
</div>
</div>
<div class="logo-container">
<img src="media/images/lutech-logo.png">
</div>
<!-- Here is where the magic begins -->
</body>
</html>
Binary file removed media/images/lutech-logo.png
Binary file not shown.
8 changes: 2 additions & 6 deletions scripts/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ function getTime(){
var minute = date.getMinutes();
var hour = date.getHours();

if (minute < 10){
minute = '0' + String(minute);
}

// time = String(hour) + ':' + String(minute) + ':' + String(second);
time = String(hour) + ':' + String(minute);

Expand All @@ -50,7 +46,7 @@ function greeting(){
var greeting;
var intro = "I hope that you are having a "
if (hour >= 12 && hour < 18){
greeting = intro + "good afternoon!";
greeting = into + "good afternoon!";
}
else if (hour >= 18){
greeting = intro + "good evening!";
Expand Down Expand Up @@ -89,7 +85,7 @@ function dayOfWeek(){
$(function(){
$(".element").typed({
strings: ["Hi, there!", greeting(), "My name is Alan and I'm a clock.","Do you happen to know what time is it? I seem to have forgotten.", "Oh I am just joking.", "It's " + getTime(), dayOfWeek()],
typeSpeed: 25,
typeSpeed: 50,
backSpeed: 0,
backDelay: 2000,
startDelay: 5000,
Expand Down
14 changes: 2 additions & 12 deletions styles/main.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* GLOBAL ITEMS */
html, body {
font-size: 125%;
font-size: 100%;
font-family: 'Source Code Pro', sans-serif;
background-color: #954040;
background-color: #000;
color: #fff;

}
Expand Down Expand Up @@ -51,13 +51,3 @@ h3{
50% { opacity:0; }
100% { opacity:1; }
}

.logo-container{
width: 125px;
position: fixed;
bottom: 20px;
right: 20px;
}
.logo-container img{
width: 100%;
}

0 comments on commit 34727d5

Please sign in to comment.