Merge pull request #161 from mys/master

Remove sidebar, css inbox
jkroepke · Jun 3, 2018 · e0bcd32 · e0bcd32
2 parents bb8be8d + f527878
commit e0bcd32
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 46 deletions.
diff --git a/styles/resource/css/ingame/main.css b/styles/resource/css/ingame/main.css
@@ -67,6 +67,7 @@ header .fixed {
 menu {
 	grid-column: 2;
 	font-size: 14px;
+	margin: 0px;
 	z-index: 1;
 }
 
@@ -82,10 +83,10 @@ menu li {
 }
 
 content {
-	grid-column: 3;
-	max-width: 700px;
+	grid-column: 3/5;
+	max-width: 950px;
 	min-height: 700px;
-	overflow: auto;
+	/* overflow: auto; */
 	padding: 16px;
 }
 
@@ -257,11 +258,13 @@ textarea.tinymce{
 .table519{
 	/* min-width:519px !important; */
 	/* width:519px !important */
+	max-width: 519px !important;
 }
 
 .table569{
 	/* min-width:569px !important; */
 	/* width:569px !important */
+	max-width: 569px !important;
 }
 
 .build_submit {
@@ -322,7 +325,6 @@ textarea.tinymce{
 }
 
 .planetImage{
-	/* width:50px; */
 	text-align: center;
 	flex-grow: 1;
 }
@@ -642,28 +644,6 @@ table.tablesorter thead tr .headerSortDown {
 /* MEDIA */
 
 @media screen and (min-width: 700px) and (max-width: 959px) {
-	.wrapper {
-		grid-template-columns: 180px auto;
-		grid-template-rows: 100px 1fr auto;
-	}
-	top {
-		grid-column: 1/2;
-	}
-	logo {
-		grid-column: 1
-	}
-	header {
-		grid-column: 2/4;
-	}
-	menu {
-		grid-column: 1;
-	}
-	content {
-		grid-column: 2;
-	}
-	aside {
-		display: none;
-	}
 	.planetImage{
 		display: none;
 	}

diff --git a/styles/templates/game/layout.full.tpl b/styles/templates/game/layout.full.tpl
@@ -43,12 +43,6 @@
 		{block name="content"}{/block}
 		<table class="hack"></table>
 	</content>
-
-	<aside>
-		<div class="fixed">
-			{include file="main.side.tpl" nocache}
-		</div>
-	</aside>
 
 	<footer>
 		{foreach $cronjobs as $cronjob}<img src="cronjob.php?cronjobID={$cronjob}" alt="">{/foreach}

diff --git a/styles/templates/game/main.header.tpl b/styles/templates/game/main.header.tpl
@@ -13,7 +13,7 @@
 	<meta http-equiv="refresh" content="{$gotoinsec};URL={$goto}">
 	{/if}
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<!-- <link rel="stylesheet" type="text/css" href="./styles/resource/css/base/boilerplate.css?v={$REV}"> -->
+	<link rel="stylesheet" type="text/css" href="./styles/resource/css/base/boilerplate.css?v={$REV}">
 	<link rel="stylesheet" type="text/css" href="./styles/resource/css/ingame/main.css?v={$REV}">
 	<link rel="stylesheet" type="text/css" href="./styles/resource/css/base/jquery.css?v={$REV}">
 	<link rel="stylesheet" type="text/css" href="./styles/resource/css/base/jquery.fancybox.css?v={$REV}">
@@ -71,16 +71,6 @@
 			scrollTo = Math.max(a, b);
 			element.style.top = scrollTo + 'px';
 		}
-		
-		// side
-		elementHeight = document.getElementsByTagName("aside")[0].getElementsByClassName("fixed")[0].clientHeight;
-		element = document.getElementsByTagName("aside")[0].getElementsByClassName("fixed")[0];
-		if (elementHeight > windowHeight - 100){
-			a = 100 - lastScroll;
-			b = windowHeight - elementHeight;
-			scrollTo = Math.max(a, b);
-			element.style.top = scrollTo + 'px';
-		}
 	});
 	$(function() {
 		{$execscript}

diff --git a/styles/templates/game/page.messages.default.tpl b/styles/templates/game/page.messages.default.tpl
@@ -1,6 +1,6 @@
 {block name="title" prepend}{$LNG.lm_messages}{/block}
 {block name="content"}
-<table style="table-layout:fixed;">
+<table>
 	<tr>
 		<th colspan="6">{$LNG.mg_overview}<span id="loading" style="display:none;"> ({$LNG.loading})</span></th>
 	</tr>

diff --git a/styles/theme/nova/formate.css b/styles/theme/nova/formate.css
@@ -394,8 +394,7 @@ th a,.res_current{
 }
 
 .spyRaportContainerRow {
-	/* border-top:1px solid #DDD; */
-	height: 20px;
+	border-top:1px solid #DDD;
 }
 .spyRaportContainerHead + .spyRaportContainerRow {
 	border-top:0 none;