Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hacksu/hacksu-website
Browse files Browse the repository at this point in the history
  • Loading branch information
toBeOfUse committed May 14, 2024
2 parents 8fe145a + 1683936 commit 7e6d0e4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/components/navigation/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default {
scaleFactor = 0.5;
}
let n = (30 * scaleFactor) * (1 - this.progress) + (10 * scaleFactor) * this.progress
return `${n}px 10px ${10 + n}px 10px`;
return `${n}px 10px ${n}px 10px`;
},
color() {
if (this.$el) {
Expand Down Expand Up @@ -113,7 +113,7 @@ export default {
.navbar {
position: fixed;
width: 100vw;
height: 55px;
// height: 55px;
@include mobile {
text-align: left;
}
Expand Down
2 changes: 1 addition & 1 deletion src/scss/underline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
padding-right: 0px;
//background: none repeat scroll 0 0 transparent;
background: $color;
margin-top: 5px;
transform: translateY(5px);
border-radius: 5vh;
}
&:hover:after {
Expand Down

0 comments on commit 7e6d0e4

Please sign in to comment.