Merge pull request #52 from KushBlazingJudah/development

Themes

1 files changed, 19 insertions, 21 deletions

diff --git a/static/index.html b/static/index.html
index b706e6b..8f1d53b 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,6 +1,6 @@
 {{ define "header" }}
 <title>{{ .Title }}</title>
-<meta name="description" content="{{ .PreferredUsername }} is a federated image board based on ActivityPub. The current version of the code running on the server is still a work-in-progress product, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">    
+<meta name="description" content="{{ .PreferredUsername }} is a federated image board based on ActivityPub. The current version of the code running on the server is still a work-in-progress product, expect a bumpy ride for the time being. Get the server code here: https://github.com/FChannel0.">
 
 <meta property="og:locale" content="en_US" />
 <meta property="og:type" content="website" />
@@ -23,47 +23,45 @@
   <p style="text-align: justify">{{ .PreferredUsername }} is a federated image board based on <a href="https://activitypub.rocks/">ActivityPub</a>. The current version of the code running on the server is still a work-in-progress product, expect a bumpy ride for the time being. Get the server code here: <a href="https://github.com/FChannel0">https://github.com/FChannel0</a>.</p>
 
   {{ if .Boards }}
-  {{ $l := len .Boards }}      
+  {{ $l := len .Boards }}
   <div style="margin-top:50px;">
-    <div style="display: grid;border-right: 2px solid #820404">    
+    <div style="display: grid;border-right: 2px solid #820404;">
       {{ if lt $l 2 }}
       <div style="display: inline-grid; border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
       {{ else if eq $l 2 }}
       <div style="display: inline-grid; grid-column: 1 / 3; border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
       {{ else }}
       <div style="display: inline-grid;grid-column: 1 / 4;border-bottom: 2px solid #820404;border-left: 2px solid #820404;border-top: 2px solid #820404;"><span style="font-size: 1.5em;font-weight: bold;">Local boards</span></div>
-      {{ end }}      
+      {{ end }}
       {{ range .Boards }}
       <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"><a href="{{.Location}}"><b>/{{.Name}}/</b> - {{.PrefName}} {{ if not .Restricted }} [NSFW] {{ end }}</a></div>
       {{ end }}
-      {{ if gt $l 2 }}      
+      {{ if gt $l 2 }}
       {{ range .BoardRemainer }}
       <div style="whitespace: nowrap;display: inline-grid;text-align: left;padding: 5px;border-bottom: 2px solid #820404;border-left: 2px solid #820404;"></div>
       {{ end }}
       {{ end }}
-    </div>      
+    </div>
   </div>
   {{ end }}
-  
-  {{ if .NewsItems }}  
-  <div class="popup-box" style="margin-top:50px;">
-    <table style="text-align: left; margin: 25px;">
-    <th>
-      <tr><h4><a href="/news">{{ .PreferredUsername }} News</a></h4></tr>
-    </th>
+
+  {{ if .NewsItems }}
+  <div class="newsbox" style="margin-top:50px;">
+    <h2><a href="/news">{{ .PreferredUsername }} News</a></h2>
     {{ range $i, $e := .NewsItems }}
-    <tr>
-      <td>{{ if $.Board.ModCred }}<a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}} 
-      <a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>
-      <br><p style="margin-left: 25px;">{{$e.Content}}</p>
+    <div class="newsbox-news">
+      <h3><a href="/news/{{.Time}}">{{unixtoreadable $e.Time}} - {{$e.Title}}</a>{{ if $.Board.ModCred }} <a href="/{{ $.Key }}/newsdelete/{{ $e.Time }}">[Delete] </a>{{end}}</h3>
+      <br>
+
+      <p>{{$e.Content}}</p>
       </td>
-    </tr>
+    </div>
     {{ end }}
   </table>
   </div>
-  {{ end }}  
-  
-  <div class="popup-box" style="margin-top:50px;">
+  {{ end }}
+
+  <div class="box2" style="margin-top:50px;">
     <h4 style="margin-bottom:5px;">Current known instances</h4>
     <span>(always use a proxy)</span>
     <table style="text-align: left; margin: 25px;">