theme news, fix mod page

5 files changed, 80 insertions, 19 deletions

diff --git a/static/css/themes/default.css b/static/css/themes/default.css
index 07e960e..7f3d1a8 100644
--- a/static/css/themes/default.css
+++ b/static/css/themes/default.css
@@ -20,6 +20,10 @@ body.nsfw {
 	color: #820404
 }
 
+h1, h2, h3, h4, h5, h6 {
+    color: #af0a0f;
+}
+
 .popup-box {
 	border: 4px solid #d3caf0;
 	background-color: #eff5ff;
@@ -123,3 +127,32 @@ a.reply {
 	z-index: 9;
 	display: block;
 }
+
+/* TODO: rename */
+.box2 {
+	border: 4px solid #f0e2d9;
+	background-color: #f9f9e0;
+}
+
+.newsbox {
+    padding: 25px;
+    border: 4px solid #f0e2d9;
+    background-color: #f9f9e0;
+}
+
+.newsbox h2 {
+    margin: 0;
+    padding: 0;
+}
+
+.newsbox-news {
+    text-align: left;
+    margin-left: 25px; 
+    margin-top: 25px;
+    padding: 25px;
+}
+
+.newsbox-news p,
+.newsbox-news h3 {
+    margin: 0;
+}
diff --git a/static/css/themes/gruvbox.css b/static/css/themes/gruvbox.css
index ff9c596..fb40267 100644
--- a/static/css/themes/gruvbox.css
+++ b/static/css/themes/gruvbox.css
@@ -15,7 +15,7 @@ body {
 	background: #282828;
 	color: #ebdbb2;
 
-	font-family: Iosevka, monospace, sans-serif;
+	font-family: monospace, sans-serif;
 	font-size: 0.9em;
 }
 
@@ -108,3 +108,33 @@ input[type="text"] {
 	z-index: 9;
 	display: block;
 }
+
+/* TODO: rename */
+.box2 {
+	border: 4px solid #928374;
+	background-color: #3c3836;
+}
+
+.newsbox {
+    padding: 25px;
+    border: 4px solid #928374;
+    background-color: #3c3836;
+}
+
+.newsbox h2 {
+    margin: 0;
+    padding: 0;
+}
+
+.newsbox-news {
+    text-align: left;
+    background-color: #504945;
+    margin-left: 25px; 
+    margin-top: 25px;
+    padding: 25px;
+}
+
+.newsbox-news p,
+.newsbox-news h3 {
+    margin: 0;
+}
diff --git a/static/index.html b/static/index.html
index 4b175f6..96edb23 100644
--- a/static/index.html
+++ b/static/index.html
@@ -46,24 +46,22 @@
   {{ end }}
   
   {{ if .NewsItems }}  
-  <div style="margin-top:50px;">
-    <table style="text-align: left; margin: 25px;">
-    <th>
-      <tr><h4><a href="/news">{{ .PreferredUsername }} News</a></h4></tr>
-    </th>
+  <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 style="margin-top:50px;">
+  <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;">
diff --git a/static/manage.html b/static/manage.html
index 3bd621b..dc25468 100644
--- a/static/manage.html
+++ b/static/manage.html
@@ -20,7 +20,7 @@
 {{ $board := .Board }}
 {{ $key := .Key }}
 {{ if .IsLocal }}
-<div id="following" class="popup-box" style="margin-bottom: 25px; margin-top: 5px; padding: 12px;">
+<div id="following" class="box2" style="margin-bottom: 25px; margin-top: 5px; padding: 12px;">
   <h4 style="margin: 0; margin-bottom: 5px;">Following</h4>
   {{ if .AutoSubscribe }}<a title="Auto Follow is On" href="/autosubscribe?board={{ .Board.Name }}">[Toggle Auto Follow Off]{{ else }}<a title="Auto Follow is Off" href="/autosubscribe?board={{ .Board.Name }}">[Toggle Auto Follow On]{{ end }}</a>
   <form id="follow-form" action="/{{ .Key }}/{{ .Board.Name }}/follow" method="post" enctype="application/x-www-form-urlencoded" style="margin-top: 5px;">  
@@ -36,7 +36,7 @@
   </ul>
 </div>
 
-<div id="followers" class="popup-box" style="margin-bottom: 25px; padding: 12px;">
+<div id="followers" class="box2" style="margin-bottom: 25px; padding: 12px;">
   <h4 style="margin: 0; margin-bottom: 5px;">Followers</h4>
   <ul style="display: inline-block; padding: 0; margin: 0; list-style-type: none;">
     {{ range .Followers }}
@@ -46,7 +46,7 @@
 </div>
 {{ end }}
 
-<div id="reported" class="popup-box" style="margin-bottom: 25px; padding: 12px;">
+<div id="reported" class="box2" style="margin-bottom: 25px; padding: 12px;">
   <h4 style="margin: 0; margin-bottom: 5px;">Reported</h4>
   <ul style="display: inline-block; padding: 0; margin: 0; list-style-type: none;">
     {{ $domain := .Domain }}
diff --git a/static/nadmin.html b/static/nadmin.html
index 5e38151..e8fbc36 100644
--- a/static/nadmin.html
+++ b/static/nadmin.html
@@ -26,7 +26,7 @@
 </div>
 
 
-<div id="following" class="popup-box" style="margin-bottom: 25px; padding: 12px;">
+<div id="following" class="box2" style="margin-bottom: 25px; padding: 12px;">
   <h4 style="margin: 0; margin-bottom: 5px;">Subscribed</h4>
   <form id="follow-form" action="/{{ .Key }}/follow" method="post" enctype="application/x-www-form-urlencoded">
     <input id="follow" name="follow" style="margin-bottom: 12px;" placeholder="http://localhost:3000/g"></input><input type="submit" value="Subscribe"><br>
@@ -41,7 +41,7 @@
   </ul>
 </div>
 
-<div id="followers" class="popup-box" style="margin-bottom: 25px; padding: 12px; display:none;">
+<div id="followers" class="box2" style="margin-bottom: 25px; padding: 12px; display:none;">
   <h4 style="margin: 0; margin-bottom: 5px;">Followers</h4>
   <ul style="display: inline-block; padding: 0; margin: 0; list-style-type: none;">    
     {{ range .Followers }}
@@ -50,7 +50,7 @@
   </ul>      
 </div>
 
-<div class="popup-box" style="margin-bottom: 25px; padding: 12px;">
+<div class="box2" style="margin-bottom: 25px; padding: 12px;">
   <h3>Create News</h3>
   <form id="news" action="/{{ .Key }}/postnews" method="post" enctype="application/x-www-form-urlencoded">
     <label>Title:</label><br>
@@ -60,7 +60,7 @@
   </form>
 </div>
 
-<div id="regex" class="popup-box" style="margin-bottom: 25px; padding: 12px;">
+<div id="regex" class="box2" style="margin-bottom: 25px; padding: 12px;">
   <h3>Regex Post Blacklist</h3>
   <form id="blacklist" action="/blacklist" method="post" enctype="application/x-www-form-urlencoded">
     <label>Regex:</label><br>