From f98b19fd9da3e7d07d1751308573fa4eb14d1339 Mon Sep 17 00:00:00 2001
From: aggelosQQ <jouflis1@hotmail.com>
Date: Thu, 29 Dec 2016 18:50:14 +0200
Subject: [PATCH] New font, style modifications & typed.js

---
 css/main.css        | 12 ++++++------
 css/staff.css       |  2 +-
 index.html          |  5 +++--
 js/main.js          |  6 ++++++
 js/typed.min.js     |  1 +
 staff/temp-file.txt |  1 +
 6 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 js/typed.min.js

diff --git a/css/main.css b/css/main.css
index 99db76d..4b4bb51 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1,6 +1,6 @@
 .brand-logo,
 body {
-    font-family: Catamaran, sans-serif
+    font-family: 'Raleway', sans-serif;
 }
 #rules-title,
 .button {
@@ -45,9 +45,9 @@ body {
     margin-top: 23%
 }
 .button {
-    padding: 5px 55px;
+    padding: 15px 55px;
     background: rgba(255, 255, 255, .1);
-    border-radius: 65px;
+    border-radius: 5px;
     color: #c8c8c8;
     transition: all .2s ease-in-out
 }
@@ -147,7 +147,7 @@ i.rules-icon:hover {
 .useful a {
     padding: 10px;
     z-index: 100;
-    text-align: center
+    text-align: center;
 }
 .cover-1,
 .cover-2,
@@ -244,9 +244,9 @@ i.rules-icon:hover {
 .modal li {
 	display: inline-block;
 /*	word-wrap: break-word;*/
-	padding:10px;
+	padding:5px 10px;
 	margin:4px;
-	background: rgba(150, 150, 150, .3);
+	background: rgba(150, 150, 150, .2);
     -webkit-transition: all .2s ease-in-out;
     -moz-transition: all .2s ease-in-out;
     -ms-transition: all .2s ease-in-out;
diff --git a/css/staff.css b/css/staff.css
index 77c9bf4..56f3ecb 100644
--- a/css/staff.css
+++ b/css/staff.css
@@ -1 +1 @@
-#note a,a{color:#c8c8c8}#note,.admins,.page-title,.rank{text-align:center}.brand-logo,h2{font-family:Catamaran,sans-serif}*{margin:0;padding:0}body{margin-bottom:50px;background:url(../images/staff-bg.png) center fixed #222;color:#ccc}.nav-wrapper{background:rgba(0,0,0,.2)}.admins{width:85%;margin:0 auto;background:rgba(100,100,100,.1);padding:15px;border-radius:10px}.admins li{display:inline-block;padding:10px;background:rgba(100,100,100,.2);margin:5px;border-radius:50px;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.admins li:hover{background:rgba(100,100,100,.5)}h2{font-size:1.5em}#note h5{margin-bottom:-15px}#note a{font-weight:700}.page-title{font-size:3.8em;font-weight:300}.brand-logo{font-size:2em;font-weight:200}@media only screen and (max-width:768px){.admins{width:95%}.admins li{display:block;border-radius:0}}
\ No newline at end of file
+#note a,a{color:#c8c8c8}#note,.admins,.page-title,.rank{text-align:center}.brand-logo,h2{font-family: 'Raleway', sans-serif;}*{margin:0;padding:0}body{margin-bottom:50px;background:url(../images/staff-bg.png) center fixed #222;color:#ccc}.nav-wrapper{background:rgba(0,0,0,.2)}.admins{width:85%;margin:0 auto;background:rgba(100,100,100,.1);padding:15px;border-radius:10px}.admins li{display:inline-block;padding:10px;background:rgba(100,100,100,.2);margin:5px;border-radius:50px;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-ms-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.admins li:hover{background:rgba(100,100,100,.5)}h2{font-size:1.5em}#note h5{margin-bottom:-15px}#note a{font-weight:700}.page-title{font-size:3.8em;font-weight:300}.brand-logo{font-size:2em;font-weight:200}@media only screen and (max-width:768px){.admins{width:95%}.admins li{display:block;border-radius:0}}
\ No newline at end of file
diff --git a/index.html b/index.html
index 8f07ced..014b43f 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
       <meta name="keywords" content="TF,minecraft,totalfreedom,free op,server,worldedit,freebuild">
       <meta name="description" content="TotalFreedom is the first Free OP Minecraft server, which is up and running since 2010! play.totalfreedom.me">
       <link async rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.7/css/materialize.min.css">
-      <link async href="https://fonts.googleapis.com/css?family=Catamaran:200" rel="stylesheet">
+      <link href="https://fonts.googleapis.com/css?family=Raleway" rel="stylesheet">
       <link async rel="stylesheet" href="css/component.min.css">
       <link async rel="stylesheet" href="css/main.css">
       <link async rel="stylesheet" href="css/global.css">
@@ -21,7 +21,7 @@
       <div class="navbar-fixed">
          <nav class="transparent z-depth-0" id="menu">
             <div class="nav-wrapper z-depth-0">
-               <a href="#header" class="brand-logo"><small class="hide-on-med-and-down">play.</small>TotalFreedom<small class="hide-on-med-and-down">.me</small></a> <a href="#" data-activates="mobile" class="button-collapse"><i class="fa fa-bars"></i></a> 
+               <a href="#header" class="brand-logo"></a> <a href="#" data-activates="mobile" class="button-collapse"><i class="fa fa-bars"></i></a> 
                <ul class="right hide-on-med-and-down cl-effect-14" id="cl-effect-14">
                   <li><a href="#header">Home</a></li>
                   <li><a href="#rules">Rules</a></li>
@@ -214,6 +214,7 @@
 
       <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.7/js/materialize.min.js"></script>
+      <script src="js/typed.min.js"></script>
       <script src="https://use.fontawesome.com/cb2592f0cc.js"></script>
       <script src="js/moment.js"></script>
       <script src="js/jquery.cookies.js"></script>
diff --git a/js/main.js b/js/main.js
index cb7305c..7adb818 100644
--- a/js/main.js
+++ b/js/main.js
@@ -43,6 +43,12 @@ $(document).ready(function() {
 });
 
 $(document).ready(function() {
+    $('.brand-logo').typed({
+        strings: ['<small class="hide-on-med-and-down">play.</small>TotalFreedom<small class="hide-on-med-and-down">.me</small>'],
+        typeSpeed: 30
+    });
+
+
     (new Date).getFullYear();
     $("#curYear").text((new Date).getFullYear())
 });
diff --git a/js/typed.min.js b/js/typed.min.js
new file mode 100644
index 0000000..4814675
--- /dev/null
+++ b/js/typed.min.js
@@ -0,0 +1 @@
+!function(t){"use strict";var s=function(s,e){this.el=t(s),this.options=t.extend({},t.fn.typed.defaults,e),this.isInput=this.el.is("input"),this.attr=this.options.attr,this.showCursor=this.isInput?!1:this.options.showCursor,this.elContent=this.attr?this.el.attr(this.attr):this.el.text(),this.contentType=this.options.contentType,this.typeSpeed=this.options.typeSpeed,this.startDelay=this.options.startDelay,this.backSpeed=this.options.backSpeed,this.backDelay=this.options.backDelay,this.stringsElement=this.options.stringsElement,this.strings=this.options.strings,this.strPos=0,this.arrayPos=0,this.stopNum=0,this.loop=this.options.loop,this.loopCount=this.options.loopCount,this.curLoop=0,this.stop=!1,this.cursorChar=this.options.cursorChar,this.shuffle=this.options.shuffle,this.sequence=[],this.build()};s.prototype={constructor:s,init:function(){var t=this;t.timeout=setTimeout(function(){for(var s=0;s<t.strings.length;++s)t.sequence[s]=s;t.shuffle&&(t.sequence=t.shuffleArray(t.sequence)),t.typewrite(t.strings[t.sequence[t.arrayPos]],t.strPos)},t.startDelay)},build:function(){var s=this;if(this.showCursor===!0&&(this.cursor=t('<span class="typed-cursor">'+this.cursorChar+"</span>"),this.el.after(this.cursor)),this.stringsElement){this.strings=[],this.stringsElement.hide(),console.log(this.stringsElement.children());var e=this.stringsElement.children();t.each(e,function(e,i){s.strings.push(t(i).html())})}this.init()},typewrite:function(t,s){if(this.stop!==!0){var e=Math.round(70*Math.random())+this.typeSpeed,i=this;i.timeout=setTimeout(function(){var e=0,r=t.substr(s);if("^"===r.charAt(0)){var o=1;/^\^\d+/.test(r)&&(r=/\d+/.exec(r)[0],o+=r.length,e=parseInt(r)),t=t.substring(0,s)+t.substring(s+o)}if("html"===i.contentType){var n=t.substr(s).charAt(0);if("<"===n||"&"===n){var a="",h="";for(h="<"===n?">":";";t.substr(s+1).charAt(0)!==h&&(a+=t.substr(s).charAt(0),s++,!(s+1>t.length)););s++,a+=h}}i.timeout=setTimeout(function(){if(s===t.length){if(i.options.onStringTyped(i.arrayPos),i.arrayPos===i.strings.length-1&&(i.options.callback(),i.curLoop++,i.loop===!1||i.curLoop===i.loopCount))return;i.timeout=setTimeout(function(){i.backspace(t,s)},i.backDelay)}else{0===s&&i.options.preStringTyped(i.arrayPos);var e=t.substr(0,s+1);i.attr?i.el.attr(i.attr,e):i.isInput?i.el.val(e):"html"===i.contentType?i.el.html(e):i.el.text(e),s++,i.typewrite(t,s)}},e)},e)}},backspace:function(t,s){if(this.stop!==!0){var e=Math.round(70*Math.random())+this.backSpeed,i=this;i.timeout=setTimeout(function(){if("html"===i.contentType&&">"===t.substr(s).charAt(0)){for(var e="";"<"!==t.substr(s-1).charAt(0)&&(e-=t.substr(s).charAt(0),s--,!(0>s)););s--,e+="<"}var r=t.substr(0,s);i.attr?i.el.attr(i.attr,r):i.isInput?i.el.val(r):"html"===i.contentType?i.el.html(r):i.el.text(r),s>i.stopNum?(s--,i.backspace(t,s)):s<=i.stopNum&&(i.arrayPos++,i.arrayPos===i.strings.length?(i.arrayPos=0,i.shuffle&&(i.sequence=i.shuffleArray(i.sequence)),i.init()):i.typewrite(i.strings[i.sequence[i.arrayPos]],s))},e)}},shuffleArray:function(t){var s,e,i=t.length;if(i)for(;--i;)e=Math.floor(Math.random()*(i+1)),s=t[e],t[e]=t[i],t[i]=s;return t},reset:function(){var t=this;clearInterval(t.timeout);this.el.attr("id");this.el.empty(),"undefined"!=typeof this.cursor&&this.cursor.remove(),this.strPos=0,this.arrayPos=0,this.curLoop=0,this.options.resetCallback()}},t.fn.typed=function(e){return this.each(function(){var i=t(this),r=i.data("typed"),o="object"==typeof e&&e;r&&r.reset(),i.data("typed",r=new s(this,o)),"string"==typeof e&&r[e]()})},t.fn.typed.defaults={strings:["These are the default values...","You know what you should do?","Use your own!","Have a great day!"],stringsElement:null,typeSpeed:0,startDelay:0,backSpeed:0,shuffle:!1,backDelay:500,loop:!1,loopCount:!1,showCursor:!0,cursorChar:"",attr:null,contentType:"html",callback:function(){},preStringTyped:function(){},onStringTyped:function(){},resetCallback:function(){}}}(window.jQuery);
\ No newline at end of file
diff --git a/staff/temp-file.txt b/staff/temp-file.txt
index e69de29..68691b0 100644
--- a/staff/temp-file.txt
+++ b/staff/temp-file.txt
@@ -0,0 +1 @@
+This file is not used for anything.
\ No newline at end of file