Merge pull request #393 from UniversityRadioYork/ash/update-cin

Update CIN for 2025

Author: alyxbb

flake.lock

@@ -57,6 +57,14 @@
 .bg-cin {
   background: $cin-background;
   color: $cin-primary;
+
+  a {
+    color: $link-color-cin;
+  }
+}
+
+input.bg-cin::placeholder {
+  color: $cin-primary;
 }
 
 .bg-cin:focus {

sass/base/_backgrounds.scss

@@ -16,8 +16,9 @@ $primetime: #feb93a;
 $collab: #d14fda;
 
 $cin-primary: #FFF;
-$cin-dark-primary: #E5204D;
-$cin-background: #210B3C;
+$cin-dark-primary: #f9b9bd;
+$cin-background: #307dbf;
+$link-color-cin: #b2e2ff;
 
 $disabled-color: rgb(150, 150, 150);
 $primary-color: $ury-blue-color;

sass/base/_variables.scss

@@ -35,12 +35,13 @@ type PageContext struct {
 	MainTwitter      string                `toml:"mainTwitter"`
 	MainFacebook     string                `toml:"mainFacebook"`
 	MainInstagram    string                `toml:"mainInstagram"`
+	MainTikTok       string                `toml:"mainTikTok"`
 	NewsTwitter      string                `toml:"newsTwitter"`
 	MyRadioAPIKey    string                `toml:"publicMyRadioAPIKey"`
 	ODName           string                `toml:"odName"`
 	Christmas        bool                  `toml:"christmas"`
 	AprilFools       bool                  `toml:"aprilFools"`
-	Pride 		     bool                  `toml:"pride"`
+	Pride            bool                  `toml:"pride"`
 	CIN              bool                  `toml:"cin"`
 	CINLivestreaming bool                  `toml:"cinLivestreaming"`
 	CINAPI           string                `toml:"cinAPI"`
@@ -94,14 +95,14 @@ type Page struct {
 }
 
 type youtube struct {
-	APIKey             string `toml:"apiKey"`
-	CINPlaylistID      string `toml:"cinPlaylistID"`
-	ChannelURL         string `toml:"channelURL"`
+	APIKey        string `toml:"apiKey"`
+	CINPlaylistID string `toml:"cinPlaylistID"`
+	ChannelURL    string `toml:"channelURL"`
 }
 
 type osm struct {
-	Lat    float32 `toml:"latitude"`
-	Lng    float32 `toml:"longitude"`
+	Lat float32 `toml:"latitude"`
+	Lng float32 `toml:"longitude"`
 }
 
 // ShortURLsConfig is a structure configuring the short-urls subsystem.

structs/config.go

@@ -1,9 +1,5 @@
 {{define "title"}}{{.PageContext.ShortName}} | Candidate Interview Night{{end}}
 
-{{define "head"}}
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
-{{end}}
-
 {{define "content"}}
 <div class="container-fluid bg-cin-2">
 <div class="container bg-cin bg-cin-space">
@@ -17,13 +13,13 @@
     <div class="container-fluid container-padded text-center">
       <div class="row">
           <div class="col-md-4 align-self-center">
-            <a href="//twitter.com/{{.PageContext.MainTwitter}}"><i class="fab fa-twitter fa-2x"></i><h3>Find us on Twitter</h3></a>
+            <a href="//instagram.com/{{.PageContext.MainInstagram}}" class="cin-link"><i class="fab fa-instagram fa-2x"></i><h3>Find us on Instagram</h3></a>
           </div>
           <div class="col-md-4 align-self-center">
             <h3>Join in with the conversation<br>{{.PageContext.CINHashtag}}</h3>
           </div>
           <div class="col-md-4 align-self-center">
-            <a href="//facebook.com/{{.PageContext.MainFacebook}}"><i class="fab fa-facebook fa-2x"></i><h3>Find us on Facebook</h3></a>
+            <a href="//tiktok.com/{{.PageContext.MainTikTok}}" class="cin-link"><i class="fab fa-tiktok fa-2x"></i><h3>Find us on TikTok</h3></a>
           </div>
       </div>
     </div>

views/cin.tmpl

@@ -39,7 +39,7 @@
 
     <link rel="stylesheet" href='{{url "/css/main.scss.css"}}?ver={{ .PageContext.CacheBuster }}' type="text/css">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,500|Roboto:300,400,500">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.0.13/css/all.css" integrity="sha384-DNOHZ68U8hZfKXOrtjWvjxusGo9WQnrNx2sqG0tfsghAvtVlRW3tvkXWZh58N9jp" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css" integrity="sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm" crossorigin="anonymous">
 </head>
 <body>
 {{block "header-block" .}}