Merge pull request #1436 from ubyssey/many-style-fixes

Many style fixes!
ubyssey · Mar 7, 2024 · ca23420 · ca23420
2 parents 969f6b0 + eea3ff2
commit ca23420
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 12 deletions.
diff --git a/ubyssey/static_src/src/js/scrollTop.js b/ubyssey/static_src/src/js/scrollTop.js
@@ -10,9 +10,7 @@ $(document).on('click', '#myBtn', function (e) {
 window.onscroll = function() {scrollFunction()};
 
 function scrollFunction() {
-    if (document.documentElement.scrollTop + document.body.offsetHeight > document.getElementsByTagName("footer")[0].offsetTop) {
-        mybutton.style.opacity = "0";
-    } else if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
+    if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
         mybutton.style.opacity = "0.9";
     } else {
         mybutton.style.opacity = "0";

diff --git a/ubyssey/static_src/src/styles/modules/article/_embeds.scss b/ubyssey/static_src/src/styles/modules/article/_embeds.scss
@@ -31,10 +31,10 @@
 .o-article-embed__advertisement {
   // padding: 10px;
   display: inline-block;
-  border: 1px solid #9e9e9e;
+  background: #9e9e9e1c;
 
   .o-advertisement {
-    margin-top: 10px;
+    margin-bottom: 10px;
     clip-path: inset(0);
   }
 
@@ -43,6 +43,7 @@
     font-size: font-size(11);
     color: #9e9e9e;
     text-transform: uppercase;
+    text-decoration: underline;
     letter-spacing: 0.075em;
   }
 
@@ -464,8 +465,7 @@ hr.page-break{
 .drop-cap:first-letter {
   font-size: 5.5em;
   line-height: 2rem;
-  margin-top: 0.24em;
+  margin-top: 0.1em;
   margin-right: 0.08em;
-  margin-bottom: 0.08em;
   float: left;
 }
diff --git a/ubyssey/static_src/src/styles/modules/magazine/2024/_article.scss b/ubyssey/static_src/src/styles/modules/magazine/2024/_article.scss
@@ -6,6 +6,10 @@
 
   a{
     color: black;
+
+    &:hover {
+      color: #803734;
+    }
   }
 }
 
@@ -99,7 +103,7 @@
     font-size: $text-size;
     font-weight: normal;
     letter-spacing: 0.2px;
-    line-height: 1.3rem;
+    line-height: 1.7rem;
     width: 100%;
     max-width: 600px;
     margin: 0 0 1.5rem 0;
@@ -122,7 +126,62 @@
       float: right;
       padding-left: 35px;
     }
+  }
 
+  .image-attachment {
+    margin: auto;
+
+    img {
+      width: 100%;
+    }
+
+    .caption {
+      text-align: center;
+
+      .credit {
+        margin-left: 1em;
+
+        color: #57574D;
+        font-style: italic;
+
+        white-space: pre;
+      }
+    }
+
+    @media ($bp-larger-than-tablet) {
+      &.right,
+      &.left {
+        height: auto;
+        margin: 0;
+        margin-top: 15px !important;
+      }
+      &.right {
+        margin-left: 15px !important;
+        float: right;
+        clear: right;
+      }
+      &.left {
+        margin-right: 15px !important;
+        float: left;
+        clear: left;
+      }
+
+      &.small {
+        width: 100px;
+      }
+
+      &.medium {
+        width: 200px;
+      }
+
+      &.large {
+        width: 300px;
+      }
+
+      &.full {
+        width: 600px;
+      }
+    }
   }
 }
 

diff --git a/ubyssey/static_src/src/styles/modules/magazine/2024/_fonts.scss b/ubyssey/static_src/src/styles/modules/magazine/2024/_fonts.scss
@@ -29,7 +29,7 @@ $header-size: 3.1rem;
 $text-font: minion-pro, serif; 
 $text-weight: 300;
 $text-weight-bold: 500;
-$text-size: 1rem;
+$text-size: 1.2rem;
 
 $quote-font: kepler-std-condensed-subhead, serif; 
 $quote-size: 1.3rem;

diff --git a/ubyssey/static_src/src/styles/objects/_article.scss b/ubyssey/static_src/src/styles/objects/_article.scss
@@ -170,7 +170,7 @@
     .o-article__headline {
       // Text
       font-size: 2rem;
-      line-height: 3rem;
+      line-height: 3.2rem;
       left: 0.5em;
     }
     .o-article__image {
@@ -235,10 +235,10 @@
     color: #ffffff;
     background-color: $color-ubyssey-blue;
     filter: drop-shadow(-5px 10px 4px #00000040);
-    border: 2px var(--header_color) solid;
+    border-bottom: 3px $color-ubyssey-blue-light solid;
     transition-duration: 0.1s;
     &:hover {
-      border-color: var(--background);
+      border-color: white;
     }
 
     a{
@@ -1251,6 +1251,8 @@
   font-weight: 600;
   background-color: #0071c9;
   > h2 {
+    margin: 0;
+
     color: white;
     scroll-margin-top: 100px;
   }