Skip to content

Commit

Permalink
Merge branch 'COPS-IITBHU:main' into fix-team-image
Browse files Browse the repository at this point in the history
  • Loading branch information
EshaanAgg authored Oct 3, 2022
2 parents 7341403 + 4c4bcbf commit 3c97cb7
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 30 deletions.
13 changes: 12 additions & 1 deletion assets/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,18 @@
//
// The variables you want to modify
// $font-size-root: 20px0;

:root{
--project-card-glow-primary:#89ff00;
--project-card-glow-secondary:#00bcd4;
--project-card-content:#0946ca;
--project-card-background:#060c21;
--contact-link-bg-primary:rgba(255, 255, 255, 0.911);
--contact-link-bg-secondary:rgba(255, 255, 255, 0.911);
--contact-link-shadow-primary:rgba(116, 227, 235, 0.959);
--navbar-color:#56eefd;
--navbar-bg:#111;
--sdgcard-bg:#06508b;
}
@layer base {
@font-face {
font-family: 'Open Sans';
Expand Down
11 changes: 6 additions & 5 deletions components/Home/projectCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
></div>
<div
class="
text-white
flex
justify-between
items-center
Expand Down Expand Up @@ -54,6 +55,7 @@
<button
class="
contentBtn
text-white
transition-all
ease-in-out
duration-150
Expand Down Expand Up @@ -100,7 +102,7 @@ export default {
left: 10vw;
}
.box {
background: #060c21;
background: var(--project-card-background);
}
.box::before {
content: '';
Expand All @@ -126,9 +128,8 @@ export default {
.box::before,
.box::after {
border-radius: 1.5rem;
background: linear-gradient(235deg, #89ff00, #010615, #00bcd4);
background: linear-gradient(235deg, var(--project-card-glow-primary), #010615, var(--project-card-glow-secondary));
}
.info h2 {
color: #00bcd4;
}
Expand All @@ -140,10 +141,10 @@ export default {
margin: 0px 16px 0 0px;
}
.contentBtn {
box-shadow: 0 0 40px 40px #0946ca inset, 0 0 0 0 #0946ca;
box-shadow: 0 0 40px 40px var(--project-card-content) inset, 0 0 0 0 var(--project-card-content);
}
.contentBtn:hover {
box-shadow: 0 0 10px 0 #0946ca inset, 0 0 10px 4px #0946ca;
box-shadow: 0 0 10px 0 var(--project-card-content) inset, 0 0 10px 4px var(--project-card-content);
}
@media only screen and (max-width: 1000px) {
.wrapper {
Expand Down
18 changes: 6 additions & 12 deletions components/navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
</template>
<script>
import { defineComponent } from '@nuxtjs/composition-api';
export default defineComponent({
data() {
return {
Expand Down Expand Up @@ -125,7 +124,6 @@ export default defineComponent({
}
})
</script>

<style scoped>
/* BUTTON STYLING */
.navbar-toggle {
Expand All @@ -138,7 +136,7 @@ export default defineComponent({
transition-property: stroke, stroke-dasharray, stroke-dashoffset;
transition-timing-function: ease;
transition-duration: 400ms;
stroke: #fff;
stroke: white;
stroke-width: 5.5;
stroke-linecap: round;
}
Expand All @@ -152,7 +150,6 @@ export default defineComponent({
.navbar-toggle.active {
transform: rotate(45deg);
}
.navbar-toggle.active .line.top {
stroke-dashoffset: -98px;
}
Expand All @@ -165,39 +162,36 @@ export default defineComponent({
}
/* NAVBAR STYLING */
.navbar {
background-color: #111;
border-left: 5px solid #56eefd;
background-color: var(--navbar-bg);
border-left: 5px solid var(--navbar-color);
height: 100vh;
left: 100vw;
}
.list_item {
@apply text-2xl md:text-3xl lg:text-4xl;
}
.list_item:before, .list_item::after {
content: ' ';
display: block;
position: absolute;
width: 0;
top: 2px;
height: 100%;
border-bottom: 2px solid #56eefd;
border-bottom: 2px solid var(--navbar-color);
transition: 0.3s;
}
.list_item:before {
right: 0;
}
.list_item:after {
bottom: 0;
}
.list_item:hover {
color: #56eefd;
color: var(--navbar-color);
}
.list_item:hover:before, .list_item:hover:after {
width: 50%;
}
</style>
7 changes: 2 additions & 5 deletions components/sdgCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
<script>
import { defineComponent, ref } from '@nuxtjs/composition-api'
import { OptiImage } from 'opti-image'
export default defineComponent({
components: {
OptiImage
Expand Down Expand Up @@ -140,17 +139,16 @@ export default defineComponent({
padding: 20px 20px;
border-radius: 50%;
}
.our-team:hover img {
transform: scale(1.2);
}
.our-team .team-content {
width: 100%;
height: 100%;
background: #06508b;
background: var(--sdgcard-bg);
position: absolute;
padding-top: 35%;
color: #fff;
color: white;
opacity: 0;
top: 0;
left: 0;
Expand All @@ -175,7 +173,6 @@ export default defineComponent({
opacity: 1;
transform: scale(1);
}
.opti-image-loaded.opti-image {
transition: transform 0.8s ease 0s;
}
Expand Down
18 changes: 11 additions & 7 deletions pages/contact/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<main class="text-center text-light-50">
<div id="head-map" class="flex justify-center items-center">
<Map class="w-full" />
<span class="absolute text-light-50 text-6xl xl:text-8xl font-bold font-display">Contact Us</span>
<span class="map-title rounded-full absolute text-light-50 font-bold font-display
text-8xl p-4
<lg:(text-6xl p-4)
<md:(text-4xl p-4)
">Contact Us</span>
</div>

<div
Expand Down Expand Up @@ -146,7 +150,6 @@
import { defineComponent } from '@nuxtjs/composition-api'
import Online from '~/components/contact-us/discord/online.vue'
import Map from '~/components/contact-us/map.vue'
interface itemsObject {
name: string
url: string
Expand All @@ -157,7 +160,6 @@ interface itemsObject {
color: string
}
}
export default defineComponent({
components: { Map, Online },
data () {
Expand Down Expand Up @@ -200,14 +202,16 @@ img {
#content:hover img {
transform: scale(1.1);
}
ul li a {
background-color: rgba(255, 255, 255, 0.911);
background-color: var(--contact-link-bg-primary);
transition: 0.4s;
}
ul li a:hover {
transform: translate(0, -5px) scale(1.05);
background-color: rgba(255, 255, 255, 0.979);
box-shadow: 0px 0px 18px rgba(116, 227, 235, 0.959);
background-color: var(--contact-link-bg-secondary);
box-shadow: 0px 0px 18px var(--contact-link-shadow-primary);
}
.map-title{
background: rgba(0, 0, 0, 0.6);
}
</style>

0 comments on commit 3c97cb7

Please sign in to comment.