Merge pull request #7 from UniversityRadioYork/kory-curvening

The Curvening™
UniversityRadioYork · Oct 29, 2023 · 991b1ac · 991b1ac
2 parents cbe89bf + 81dc7f2
commit 991b1ac
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 30 deletions.
diff --git a/sass/base/_uryCard.scss b/sass/base/_uryCard.scss
@@ -10,7 +10,7 @@ a.ury-card,
   background: $show-bg;
   color: $show-txt-color;
   transition: $transition-time;
-
+  border-radius: 2rem;
   // Override the ancher tag defaults
   display: block;
   text-decoration: none;
@@ -24,7 +24,7 @@ a.ury-card,
     padding-top: 100%;
     background-repeat: no-repeat;
     background-size: cover !important; //propotional resize
-
+    border-radius: 2rem;
 
   }
 

diff --git a/sass/elements/_currentAndNext.scss b/sass/elements/_currentAndNext.scss
@@ -23,18 +23,21 @@
 }
 .current-next-container {
   max-width: 950px;
+  border-radius: 2rem;
 }
 
 .current-and-next {
   color: white;
   overflow: hidden;
+  border-radius: 2rem;
 
   .current-and-next-img {
     background: $current-next-now-bg;
-
+    
     img {
       width: 100%;
       height: auto;
+      border-radius: 2rem;
     }
   }
 

diff --git a/sass/elements/_navbar.scss b/sass/elements/_navbar.scss
@@ -1,5 +1,5 @@
 $nav-background: rgba(255, 255, 255, .97);
-$nav-bottom-border: 1px solid rgba(2, 45, 89, .3);
+$nav-bottom-border: .4rem solid rgba(0, 45, 90, .97);
 $nav-links-color: rgb(2, 45, 89);
 
 // How fast search expands and shrinks
@@ -10,6 +10,7 @@ $nav-links-color: rgb(2, 45, 89);
   backdrop-filter: blur(5px);
   background: $nav-background;
   border-bottom: $nav-bottom-border;
+  border-radius: 0 0 2rem 2rem;
 
   a {
     color: $nav-links-color;

diff --git a/sass/elements/_onDemand.scss b/sass/elements/_onDemand.scss
@@ -17,3 +17,6 @@
 .view-more-link {
   font-size: 1.5rem;
 }
+.podcasts-container{
+  padding: 5rem 5rem 1rem 5rem;
+}
diff --git a/sass/elements/_schedule.scss b/sass/elements/_schedule.scss
@@ -200,8 +200,9 @@ $sustainer-color: tint($primary-color, 40%);
     margin: auto;
     margin-bottom: 10px;
     padding: 10px;
-    border-radius: 2px;
-
+    border-radius: 2rem;
+    padding-bottom: 2rem;
+    padding-right: 2rem;
     tr {
       height: 70px;
     }

diff --git a/sass/main.scss b/sass/main.scss
@@ -42,13 +42,17 @@
 footer {
   color: #646464;
   background: $off-white-color;
+  border-top: 2rem;
+  border-radius: 2rem 2rem 0 0;
+  margin-top: -2rem;
 
   a {
     color: $link-color-dark;
   }
 
   .row {
     min-height: 3em;
+    padding: 15px
   }
 }
 
@@ -342,9 +346,10 @@ footer {
 .show-img {
   border: $off-white-color 7px solid;
   background-color: $primary-color;
+  border-radius: 2rem;
 
   @include media-breakpoint-up(md) {
-    margin-top: -3em;
+    margin-top: -7rem;
   }
 }
 
@@ -398,11 +403,16 @@ body {
   background-color: $off-white-color;
 }
 
+.container-padded{
+  border-bottom: 2rem solid transparent;
+  margin-top: -2rem;
+  border-radius: 2rem 2rem 0 0;
+  padding-top: 2rem;
+
 .pageTitleImage{
   max-inline-size: 90%;
   max-height: 15rem;
 }
-
 .teams-banner {
   background: url("/images/drone-banner.jpg") center center no-repeat;
   background-size: cover;

diff --git a/views/about.tmpl b/views/about.tmpl
@@ -90,7 +90,7 @@
     </div>
   </div>
 </div>
-<div class="container-fluid container-padded bg-secondary">
+<div class="container-fluid container-padded bg-white">
   <div class="container container-padded">
     <h1>Our History</h1>
     <div> {{/* Prevents bug where p would appear inline with h2 */}}

diff --git a/views/contact.tmpl b/views/contact.tmpl
@@ -23,7 +23,7 @@
     </div>
   </div>
 </div>
-<div class="container-fluid container-padded text-center">
+<div class="container-fluid container-padded text-center bg-white">
   <div class="row">
     <div class="col-md-2 align-self-center">
       <a href="//instagram.com/{{.PageContext.MainInstagram}}"><i class="fab fa-instagram fa-2x"></i><h3>Our Instagram</h3></a>

diff --git a/views/index.tmpl b/views/index.tmpl
@@ -4,7 +4,7 @@
         {{template "index_countdown" .}}
     {{end}}
   {{end}}
-  <div class="container-fluid header-large current-next position-relative">
+  <div class="container-fluid header-large current-next">
   <img src="/images/sra-2020-bug.png" class="sra-2020-bug" alt="" />
   {{if .PageContext.Christmas}}
     <div class="snow"></div>

diff --git a/views/on_demand.tmpl b/views/on_demand.tmpl
@@ -13,7 +13,7 @@
 {{end}}
 
 {{define "content"}}
-<div class="container-fluid header-medium on-demand position-relative">
+<div class="container-fluid header-medium on-demand">
   <div class="container">
     <div class="row align-items-center text-center">
       <div class="col">

diff --git a/views/podcast.tmpl b/views/podcast.tmpl
@@ -36,7 +36,7 @@
   </div>
 
   {{with .PageData}}
-  <div class="container-fluid bg-off-white">
+  <div class="container-fluid bg-off-white container-padded">
     <div class="container container-padded">
       <div class="row">
         <div class="col-12 col-lg-3">
@@ -101,7 +101,7 @@
       </div>
     </div>
   </div>
-  <div class="container-fluid bg-third collapse" id="collapseEmbedCode">
+  <div class="container-fluid bg-third collapse container-padded" id="collapseEmbedCode">
     <div class="container container-padded">
       <h2>Embed this podcast...</h2>
       <div class="row">

diff --git a/views/podcasts.tmpl b/views/podcasts.tmpl
@@ -20,7 +20,7 @@
   </div>
 
 {{with .PageData}}
-<div class="container container-padded pt-5 mt-5">
+<div class="container-fluid podcasts-container container-padded bg-white">
   <nav class="row nav justify-content-between">
     <span>
       <a class="nav-link

diff --git a/views/schedule_week.tmpl b/views/schedule_week.tmpl
@@ -18,7 +18,7 @@
 </div>
 
 <!-- schedule header -->
-<div class="container-fluid bg-off-white">
+<div class="container-fluid bg-off-white container-padded">
   <div class="container justify-content-between py-3">
     <div class="row">
       <div class="col-auto">
@@ -59,7 +59,7 @@
 </div>
 
 <!-- schedule body -->
-<div class="container-fluid bg-off-white">
+<div class="container-fluid bg-off-white container-padded">
   <div class="container">
   {{with .Schedule}}
   {{if .Table}}

diff --git a/views/show.tmpl b/views/show.tmpl
@@ -20,7 +20,7 @@
 <div class="container-fluid current-next">
 
 </div>
-<div class="container-fluid bg-off-white">
+<div class="container-fluid bg-off-white container-padded">
   <div class="container p-3">
     <div class="row">
       <div class="col-12 col-sm-5 col-lg-3">
@@ -80,7 +80,7 @@
 </div>
 {{with .PageData}}
   {{if .CreditsToUsers}}
-  <div class="container-fluid bg-primary">
+  <div class="container-fluid bg-primary container-padded">
     <div class="container pt-3">
       <h2>Credits</h2>
       <hr>
@@ -103,7 +103,7 @@
   {{end}}
 {{end}}
 {{if gt (len .PageData.Seasons) 0}}
-<div class="container-fluid bg-secondary">
+<div class="container-fluid bg-secondary container-padded">
   <div class="container show-selector">
     <div class="row">
       <div class="col-12 col-xl-4 p-4">
@@ -190,7 +190,7 @@
 {{end}}
 {{with .PageData}}
 {{if gt (len .Podcasts) 0}}
-  <div class="container-fluid bg-off-white">
+  <div class="container-fluid bg-off-white container-padded">
     <div class="container pt-3 pb-1">
       <div class="row justify-content-between">
         <div class="col">

diff --git a/views/team.tmpl b/views/team.tmpl
@@ -39,13 +39,13 @@
       </div>
     </div>
     {{with .Team}}
-    <div class="container-fluid">
+    <div class="container-fluid container-padded bg-white">
       <div class="container container-padded">
         <h4 class="display-4">{{.Name}}</h4>
       </div>
     </div>
     {{if .Description}}
-    <div class="container-fluid bg-primary">
+    <div class="container-fluid bg-primary container-padded">
       <div class="container container-padded">
         <h2>Team Description</h2>
         <p>{{html .Description}}</p>
@@ -55,7 +55,7 @@
     {{end}}
     {{end}}
     {{if len .Team.Officers}}
-    <div class="container-fluid bg-secondary">
+    <div class="container-fluid bg-secondary container-padded">
       <div class="container container-padded">
         <h2>Team Officers</h2>
         <div class="row">
@@ -72,7 +72,7 @@
       </div>
     </div>
     {{end}}
-    <div class="container-fluid bg-third">
+    <div class="container-fluid bg-third container-padded">
       <div class="container container-padded">
         <h2>Get Involved</h2>
         <p>

diff --git a/views/teams.tmpl b/views/teams.tmpl
@@ -13,7 +13,7 @@
       </div>
     </div>
   </div>
-  <div class="container-fluid bg-off-white">
+  <div class="container-fluid bg-white container-padded">
     <div class="container container-padded">
       <h1>Get Involved</h1>
       <p>
@@ -23,7 +23,7 @@
       </p>
     </div>
   </div>
-  <div class="container-fluid bg-off-white">
+  <div class="container-fluid bg-primary container-padded">
     <div class="container container-padded">
       <h1>Teams</h1>
       <div class="row justify-content-center">

diff --git a/views/timeslot.tmpl b/views/timeslot.tmpl
@@ -54,7 +54,7 @@
   </div>
 </div>
 {{with .PageData}}
-<div class="container-fluid bg-off-white">
+<div class="container-fluid bg-off-white container-padded">
   <div class="container p-3">
     <div class="row">
       <div class="col-12 col-sm-5 col-lg-3">
@@ -122,7 +122,7 @@
 </div>
 {{with .PageData}}
 {{if .CreditsToUsers}}
-<div class="container-fluid bg-primary">
+<div class="container-fluid bg-primary container-padded">
   <div class="container pt-3">
     <h2>Credits</h2>
     <hr>
@@ -143,7 +143,7 @@
   </div>
 </div>
 {{end}}
-<div class="container-fluid bg-secondary">
+<div class="container-fluid bg-secondary container-padded">
   <div class="container p-3">
     <h2>Tracklist</h2>
     {{if .Tracklist}}