Merge branch 'main' of https://git.cardiff.ac.uk/c21107895/21107895_cmt120_cw2

README.md

@@ -2,7 +2,7 @@
 
 # Student Number: 21107895
 
-# CHECKSUM of last commit: 2f176365d89c4e1ef4c448af23019057b4a5eee2
+# CHECKSUM of last commit: ea80fb310bca35c24fa50078c4953808f9eaad84
 
 # URL: http://blog-21107895-cmt-120-cw-2-git-blog-21107895.apps.openshift.cs.cf.ac.uk/
 

blog/static/style.css

@@ -9,7 +9,7 @@ html {
 }
 
 body {
-  margin-bottom: 210px;
+  margin-bottom: 130px;
 }
 
 .pers_greet {
@@ -98,13 +98,14 @@ select {
 }
 
 .form_sort {
-  max-width: 250px;
+  max-width: 260px;
   background: rgba(0, 0, 0, 0);
   padding: 0px 0px 0px 12px;
   text-shadow: 1px 1px 1px #fff;
   border: 1px solid #e4e4e4;
   border-radius: 10px;
   display: flex;
+  margin-top: 25px;
 }
 
 .form_sort input {
@@ -267,10 +268,6 @@ input {
   font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
 }
 
-.policy {
-  padding-left: 20px;
-}
-
 .new-post {
   margin-left: 20px;
 }
@@ -301,4 +298,28 @@ hr {
   background: linear-gradient(to right, #d3c3e2, #81a5ec);
   border: #fff;
   margin-top: 30px;
+}
+
+.policy {
+  font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+  margin-top: 0px;
+  padding: 0 20px 0 20px;
+}
+
+.policy_title {
+  font-size: 22px;
+}
+
+.policy_subtitle {
+  font-size: 18px;
+}
+
+.disclaimer {
+  font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
+  margin-top: 40px;
+  padding: 0 20px 0 20px;
+}
+
+.disclaimer_title {
+  font-size: 22px;
 }
\ No newline at end of file

blog/templates/disclaimer.html

 {% extends 'base.html' %} {% block main %}
-<div class="policy">
-  <h1>Disclaimer:</h1>
+<div class="disclaimer">
+  <h1 class="disclaimer_title">Disclaimer:</h1>
   <p>
     The content of this website is published by users and only represents the
     user's personal position. This website makes no representations or

blog/templates/policy.html

 {% extends 'base.html' %} {% block main %}
 <div class='policy'>
-    <h1>Privacy Policy:</h1>
+    <h1 class="policy_title">Privacy Policy:</h1>
     <p>Welcome to use this website service! We value the trust you place in us when you provide us with your personal
         information, and we will handle your personal information and keep it secure in accordance with this Privacy
         Policy.
     </p>
-    <br>
-    <h1>Introduction:</h2>
+    <hr>
+    <h2 class="policy_subtitle">Introduction</h2>
     <p>
         This website is a community interaction platform gathering like-minded people on topics of interest. The topics
         of
@@ -19,21 +19,21 @@
         policy is designed to help you understand the types of personal information we collect about you and how we use
         your
         personal information.
-
+    </p>
+    <p>
         Please be sure to read this privacy policy carefully, and use the services of this website after confirming your
         full understanding and agreement.
         This Privacy Policy will help you understand how we collect and use your personal information.
     </p>
-    <br>
     <p>
-        Personal information refers to all kinds of information recorded electronically or otherwise that can identify
-        you
-        or
-        reflect your activities, alone or in combination with other information. We only collect the information
+        Personal information refers to all kinds of information recorded electronically or otherwise that, alone or in 
+        combination with other information, can identify you or reflect your activities. We only collect the information
         necessary
         to realize the function of the product according to the principles of legality, legitimacy and necessity.
-
-        Account registration information
+    </p>
+    <hr>
+    <h2 class="subtitle">Account registration information</h2>
+    <p>
         If you only browse this website, you do not need to log in to your account. If you use this website to post
         information or socialize, you need to register and log in to an account. When registering an account, you need
         to