Merge branch 'master' into rankingcss
diff --git a/css/ranking.css b/css/ranking.css
index 456585b..e7263d9 100644
--- a/css/ranking.css
+++ b/css/ranking.css
@@ -1,51 +1,47 @@
 body {
+	margin: 0;
 	background-image: url('https://images.unsplash.com/photo-1428196457394-f0c4aec5f574?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1050&q=80');
 	background-size: cover;
 }
 
 header {
-	margin-top: 25px;
-	margin-bottom: 100px;
+	padding: 8px 0;
 	font-family: 'Open Sans';
 	display: block;
 }
 
 header a {
-	font-size: 40px;
+	font-size: 17px;
 	text-decoration: none;
 }
 
 header #leftlinks {
-	padding-left: 20px;
 	float: left;
 }
 
 header #rightlinks {
-	margin-right: 20px;
 	float: right;
 }
 
 div#outter-container {
-	width: 95%;
-	margin: 32px auto;
+	width: Calc(100% - 26px);
+	margin: 13px;
 }
 
 #inner-container {
 	background-color: white;
-	padding: 25px;
+	padding: 16px;
 }
 
 p {
 	font-size: 16px;
 	text-align: justify;
 	display: none;
-	width: 95%;
-	margin: auto;
 	margin-bottom: 25px;
 }
 
 #table-container {
-	overflow: scroll;
+	overflow: auto;
 }
 
 div#table-container {
@@ -55,17 +51,17 @@
 }
 
 table#ranking {
-	font-size: 48px;
+	font-size: 20px;
 	text-align: center;
 	font-family: 'Open Sans';
-	margin: 25px auto;
+	margin: 8px auto;
 	width: 95%;
+	max-width: 512px;
 }
 
 table#ranking td {
-	padding: 15px;
-	height: 50px;
-	
+	padding: 4px;
+
 	max-width: 400px;
 	text-overflow: ellipsis;
 	white-space: nowrap;
@@ -73,11 +69,11 @@
 }
 
 td div.username {
-	font-size: 40px;
+	font-size: 17px;
 }
 
 td div.userinfo {
-	font-size: 36px;
+	font-size: 14px;
 	color: rgb(100,100,100);
 }
 
@@ -87,8 +83,7 @@
 
 tr#header th {
 	text-align: center;
-	padding-top: 10px;
-	padding-bottom: 10px;
+	padding: 6px 0;
 }
 
 tr.gold {
@@ -109,9 +104,11 @@
 
 tr.top3 td:first-child::before {
 	content: '';
-	background-size: 48px 48px;
-	width: 48px;
-	height: 48px;
+	background-size: 20px 20px;
+	width: 20px;
+	height: 20px;
+	background-repeat: no-repeat;
+	padding-right: 8px;
 	float: left;
 	position: relative;
 	top: 0px;
diff --git a/ranking.php b/ranking.php
index 33dc1c7..fb0aef3 100644
--- a/ranking.php
+++ b/ranking.php
@@ -1,5 +1,6 @@
 <html>
 <head>
+	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
 	<link rel="stylesheet" href="./css/ranking.css" />
 </head>
@@ -32,9 +33,9 @@
 			<div id="leftlinks"><a id="info" href="javascript:void(0);" onclick="js: toggleinfo();">+Info</a></div>
 			<div id="rightlinks"><a href="./index.php">Tornar a l'inici</a></div>
 		</header>
-		
+
 		<p><img src="./bin/images/info.png" width="32px" /> La puntuació de cada jugador es calcula com a una suma ponderada depenent del caràcter de les seves víctimes: companys de <b>c</b>lasse (mateix curs, mateix grau), companys de <b>g</b>rau (mateix grau) i companys de <b>f</b>acultat (diferents grau). Amb puntuacions +100, +150 i +200; respectivament.</p>
-		
+
 		<div id="table-container">
 			<table id="ranking" cellspacing="0" cellpadding="0">
 				<tr id="header">
@@ -49,14 +50,14 @@
 				<?php
 					$id = 0;
 					$i = 1;
-					
+
 					while ($row = $results->fetch_object()) {
 						if ($i == 1) echo "<tr class='gold top3'>";
 						else if ($i == 2) echo "<tr class='silver top3'>";
 						else if ($i == 3) echo "<tr class='bronze top3'>";
 						else if ($row->id == $id) echo "<tr class='me'>";
 						else echo "<tr>";
-						
+
 						echo "<td>". ($i > 3 ? $i : '') ."</td>";
 						echo "<td class='name'><div>
 									<div class='username'>$row->nom</div>
@@ -68,7 +69,7 @@
 						echo "<td>$row->companys_grau</td>";
 						echo "<td>$row->companys_facu</td>";
 						echo "</tr>";
-						
+
 						$i = $i + 1;
 					}
 				?>