From 8eb8288b68125a99fbee07ef0a643c36d52ef25c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 29 Jan 2018 17:39:44 +0100 Subject: [PATCH 1/2] positioning of the fedstat graph This is a followup on #4266 resizing the fedstat graph in the admin panel so that it fits alongside the intro text again. Checked also with duepunto, quattro and vier theme. --- view/global.css | 3 ++- view/templates/admin/federation.tpl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/view/global.css b/view/global.css index c14f727a59..daf40bbdd4 100644 --- a/view/global.css +++ b/view/global.css @@ -414,6 +414,7 @@ a { } .federation-graph { margin: 0 auto; + float: right; } .federation-network-graph { float: left; @@ -578,4 +579,4 @@ img.invalid-src:after { vertical-align: top;} } .tag-cloud { word-wrap: break-word; -} \ No newline at end of file +} diff --git a/view/templates/admin/federation.tpl b/view/templates/admin/federation.tpl index c92af180c2..193eefb565 100644 --- a/view/templates/admin/federation.tpl +++ b/view/templates/admin/federation.tpl @@ -1,7 +1,7 @@ <script src="{{$baseurl}}/vendor/asset/Chart-js/dist/Chart.min.js"></script> -<canvas id="FederationChart" class="federation-graph" width="400" height="400"></canvas> <div id="adminpage"> <h1>{{$title}} - {{$page}}</h1> + <canvas id="FederationChart" class="federation-graph" width="320" height="320"></canvas> <p>{{$intro}}</p> {{if not $autoactive}} <p class="error-message">{{$hint}}</p> From 88e71a102c01c7314b5dddb02a8c21e98d775785 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff <tobias.diekershoff@gmx.net> Date: Mon, 29 Jan 2018 17:51:59 +0100 Subject: [PATCH 2/2] same indentation style --- view/global.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/global.css b/view/global.css index daf40bbdd4..ef76b5ffbe 100644 --- a/view/global.css +++ b/view/global.css @@ -414,7 +414,7 @@ a { } .federation-graph { margin: 0 auto; - float: right; + float: right; } .federation-network-graph { float: left;