Merge branch 'gdpr'.

This supersedes and closes #80. It's better than what we had before, even if it does want reworking again.

# Conflicts:
#	Gemfile.lock
#	layouts/partials/footer.html

Author: FreneticScribbler

content/cookies.md

@@ -0,0 +1,26 @@
+---
+title: "TEC Cookie Policy"
+draft: true
+---
+
+Like most websites and apps, we use cookies. By using the TEC online services you agree to our use of cookies
+
+## Cookies help us remember your preferences
+You can think of cookies like stickers. Every time you visit a site, that site puts a sticker on you so they can keep track of how many times you’ve visited, how long you’ve spent there, and what you’ve done. 
+That lets the site show you things which are relevant to you, based on information you’ve entered and stuff you’ve looked at. 
+The length of time stored depends on the cookie, but this is generally between a few minutes and up to two years.
+
+Cookies never store any personal information.
+
+We use a couple of different kinds of cookies:
+
+* ‘Session cookies’
+* ‘Persistent cookies’
+* ‘Third-party cookies’
+
+## Session and Persistent cookies track what you’re doing on a specific visit to our site
+We use session cookies to improve our site and give you a better experience. Session cookies let us see where you spend your time, and work out which bits are most (and least) effective. 
+Persistent cookies let us remember you on future visits, improving your experience of services or functions offered.
+
+## You can turn cookies off if you like
+Exactly how to do it depends on your browser or phone settings. Try looking in your ‘Help’ section, or searching for ‘How to block cookies’.

content/legal.md

@@ -21,20 +21,6 @@ Unauthorised use of this website may give rise to a claim for damages and/or be
 From time to time this website may also include links to other websites. These links are provided for your convenience to provide further information. They do not signify that we endorse the website(s). We have no responsibility for the content of the linked website(s).
 Your use of this website and any dispute arising out of such use of the website is subject to the laws of England, Northern Ireland, Scotland and Wales.
 
-### Cookie Policy
-A cookie is a small file which asks permission to be placed on your computer’s hard drive. Once you agree, the file is added and the cookie helps analyse web traffic or lets you know when you visit a particular site. Cookies allow web applications to respond to you as an individual. The web application can tailor its operations to your needs, likes and dislikes by gathering and remembering information about your preferences.
-
-We use traffic log cookies to identify which pages are being used. This helps us analyse data about webpage traffic and improve our website in order to tailor it to customer needs. We only use this information for statistical analysis purposes and then the data is removed from the system.
-
-Overall, cookies help us provide you with a better website by enabling us to monitor which pages you find useful and which you do not. A cookie in no way gives us access to your computer or any information about you, other than the data you choose to share with us.
-
-You can choose to accept or decline cookies. Most web browsers automatically accept cookies, but you can usually modify your browser setting to decline cookies if you prefer. This may prevent you from taking full advantage of the website.
-
-Full details of TEC’s cookie usage can be found in our Website Terms and Conditions.
-
-## Copyright
-All website content © TEC PA & Lighting. All rights reserved.
-
 ## Terms and Conditions of Service
 TEC PA & Lighting operates with the following [Terms of Hire](/terms.pdf) across all services.
 

content/privacy.md

@@ -0,0 +1,93 @@
+---
+title: "TEC Privacy Policy"
+draft: true
+---
+
+## Who are we?
+We are TEC PA & Lighting (“we”, “our”, “us”), a Student Run Service of the University of Nottingham Students' Union.
+
+We provide high quality sound, lighting and audio-visual services both within the University of Nottingham Students’ Union and outside to public customers.
+
+We're committed to protecting and respecting your privacy. 
+If you have any questions about your personal information please email us at [[email protected]](mailto:[email protected]).
+
+We operate as a trading name of the University of Nottingham Students' Union, registered with the Information Commissioners Office under number Z2326680.
+
+
+## The information we hold about you
+
+* **Information you provide to us**
+<br>
+For example, when you contact us for an event and provide us with details such as your name, email address, phone number and venue details, we will record these to allow us to provide your event.
+<br>
+You may also provide us with contact details for your venue, we will save these for future events that may be held here.
+* **Details about your events**
+<br>
+We will need the start and end times for any event we provide.
+<br>
+There may also be times we need information about any acts performing at your event, including contact details for them.
+* **Membership details** 
+<br>
+If you are a TEC member, we will collect your student number from you and verify your membership status with the Students' Union.
+* **Information from social networks or online accounts**
+<br>
+Information from any accounts that you share with us.
+* **Cookie information**
+<br>
+Read our [Cookie Policy]({{< ref "cookies.md" >}}) for more info on what cookies are and how we use them.
+
+## How we use your information
+To provide our services. We use it to:
+
+* Contact you to organise and manage your event.
+* Invoice you or your company or society for our services.
+
+To meet our legal obligations. We use it to:
+* Prevent illegal activities like money laundering, tax evasion and fraud.
+
+To exercise what’s known as our legitimate interests. This is when we use data for a reason which is in your and/or our interest, and which doesn't involve overriding your privacy rights. We use it to:
+* Ask you for feedback on our services
+
+As a member. We use it to:
+* Keep you up to date with the latest events and other important information. You can opt out of this at any time by contacting us.
+
+## Who we share it with
+We may share your information with:
+
+* Any member who needs it to do their job.
+* Any organisation which supports any of our services you use, when they need it to offer those services. That includes:
+    * The University of Nottingham Students' Union Finance Office so they can manage our accounts. The Students' Union is also responsible for processing our invoices.
+    * The venue for your event should they need to contact you.
+    * Our suppliers where extra equipment is required.
+
+We’ll also share it to comply with the law; to enforce our Terms and Conditions or other agreements; or to protect the rights, property or safety of us, our customers or others.
+
+## How long we keep it
+We securely keep your data as long as you're using our services, and for 6 years after that to comply with the law.
+In some circumstances, like cases of fraud or legal investigations, we may keep data longer than we need to and/or the law says we have to.
+
+## Your rights
+You have a right to:
+
+* Access the personal data we hold about you, or to get a copy of it.
+* Make us correct inaccurate data.
+* Ask us to delete, 'block' or suppress your data, though for legal reasons we might not always be able to do it.
+* Object to us using your data for direct marketing and in certain circumstances ‘legitimate interests’, research and statistical reasons.
+* Withdraw any consent you’ve previously given us.
+
+To do so, please email us at [[email protected]](mailto:[email protected]).
+
+## Where we store your data
+We might transfer and store the data we collect from you somewhere outside the European Economic Area (‘EEA’). 
+People who work for us or our suppliers outside the EEA might also process your data. 
+We may share data with organisations and countries that:
+
+* The European Commission say have adequate data protection.
+* We’ve agreed standard data protection clauses with.
+
+## How to make a complaint
+If you have a complaint, please contact us by email at [[email protected]](mailto:[email protected]) and we'll do out best to fix the problem.
+If you still aren't happy, you can refer your complaint to the [University of Nottingham Students' Union](https://www.su.nottingham.ac.uk/).
+
+## Changes to this policy
+We’ll post any changes we make to our privacy notice on this page and, if they’re significant changes we may let you know by email.

layouts/partials/footer.html

@@ -3,7 +3,11 @@
 			<div class="row no-margin valign-wrapper">
 				<div class="col m4 l4 hide-on-small-and-down left-align">
 					<a href="/legal/">Legal</a>
-					&nbsp; &boxv; &nbsp;
+                    &nbsp; &boxv; &nbsp;
+                    <a href="/privacy/">Privacy Policy</a>
+                    &nbsp; &boxv; &nbsp;
+                    <a href="/cookies/">Cookie Policy</a>
+					<br>
 					<a href="https://members.nottinghamtec.co.uk">Members' Login</a>
 				</div>
 
@@ -81,11 +85,11 @@
 
 			$(window).scroll(function(){
 				if( $(this).scrollTop() > offset ) {
-					$back_to_top.addClass('visible') 
+					$back_to_top.addClass('visible')
 				} else {
 					$back_to_top.removeClass('visible fade-out hover');
 				}
-				if( $(this).scrollTop() > offset_opacity ) { 
+				if( $(this).scrollTop() > offset_opacity ) {
 					$back_to_top.addClass('fade-out');
 				}
 			});

src/sass/screen.scss

@@ -1,8 +1,6 @@
 @import "compass";
 
 // Mixins
-@import "materialize/components/prefixer";
-@import "materialize/components/mixins";
 @import "materialize/components/color";
 
 $primary-color: color("grey", "darken-4");
@@ -41,6 +39,20 @@ body {
   .assoc-logo {
     max-height: 2rem;
   }
+
+  .brand-logo {
+    img {
+      max-width: 100%;
+      max-height: 5rem;
+    }
+  }
+
+  @media #{$medium-and-up} {
+    .row {
+      display: flex;
+      align-items: center;
+    }
+  }
 }
 
 $main-nav-top: 3rem;
@@ -152,11 +164,11 @@ $main-nav-height: 6rem;
 }
 
 article {
-  ul {
+  ul, ul:not(.browser-default)  {
     list-style-type: square;
     padding-left: 1.5rem;
 
-    li {
+    & > li {
       list-style-type: square;
     }
   }