Skip to content

Commit

Permalink
Merge branch 'main' into ToniGrbic/382-popravit-ponasanje-sponzorskih…
Browse files Browse the repository at this point in the history
…-logotipova
  • Loading branch information
ToniGrbic committed Sep 23, 2024
2 parents e52fc54 + 70f8877 commit 79dc8c2
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 17 deletions.
6 changes: 3 additions & 3 deletions apps/web/src/assets/icons/minus-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions apps/web/src/assets/icons/minus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions apps/web/src/assets/icons/plus-black.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions apps/web/src/assets/icons/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
flex-direction: row;
position: relative;
background-color: #f5ede1;
z-index: 1;

&:before {
z-index: -1;
content: '';
background-image: url(../../assets/images/noise.webp);
opacity: 0.15;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ const FrequentlyAskedQuestionCard: React.FC<
)}
</button>
</div>
{isRulerVisible && (
<div className={c.dottedRuler}> </div>
)}
{isRulerVisible && <div className={c.dottedRuler}> </div>}
</>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
.faqCard {
display: flex;
justify-content: space-between;
align-items: center;
align-items: flex-start;
cursor: pointer;
height: 40px;
min-height: 40px;

&Left {
display: flex;
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/Hero/Hero.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
letter-spacing: 1px;
text-transform: uppercase;
text-decoration: none;
transition: all 200ms;

&:hover {
filter: brightness(75%);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/components/ScheduleSection/ScheduleCard.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { EventWithSpeakerDto } from '@ddays-app/types';
import MinusSvg from 'assets/icons/minus-black.svg';
import PlusSvg from 'assets/icons/plus-black.svg';
import { useEffect, useState } from 'react';

import PlusSvg from '../../assets/Plus.svg';
import { useScreenSize } from '../../hooks/useScreenSize';
import c from './ScheduleSection.module.scss';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
}

.plusButton {
fill: black;
background-color: transparent;
border: none;
cursor: pointer;
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/components/SponsorSection/SponsorModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const SponsorModal: React.FC<SponsorModalProps> = ({ sponsor, close }) => {
<p className={c.themeBadgeText}>DIZ</p>
</div>
<div className={c.themeBadge}>
<p className={c.themeBadgeText}>TECH</p>
<p className={c.themeBadgeText}>DIV</p>
</div>
</div>
</div>
Expand All @@ -72,8 +72,8 @@ const SponsorModal: React.FC<SponsorModalProps> = ({ sponsor, close }) => {
</a>
</div>
{(index === jobs.length - 1 || isMobile) && (
<div className={clsx(c.verticalRuler, c.verticalRulerEnd)}>
</div>
<div
className={clsx(c.verticalRuler, c.verticalRulerEnd)}></div>
)}
<div className={clsx(c.dottedRuler, c.positionBottom)}></div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,31 @@
overflow-x: clip;
position: relative;


.sectionBreaker {
z-index: 5;
position: absolute;
left: 0;
bottom: -45px;
width: 100%;
height: 45px;
rotate: -0.7deg;

mask-image: url('../../assets/images/section-breaker.webp');
background: black;
&:before {
content: '';
background-image: url(../../assets/images/noise.webp);
opacity: 0.15;
top: 0;
left: 0;
position: absolute;
width: 100%;
height: 100%;
pointer-events: none;
}
}

@media screen and (min-width: 768px) {
> div {
scale: 1.01;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ const TestimonialsSection = () => {
<Testimonial color='white' {...testimonials[0]} />
<Testimonial color='black' {...testimonials[1]} refEl={blackSection} />
<Testimonial color='beige' {...testimonials[2]} refEl={beigeSection} />
<div className={c.sectionBreaker}></div>
</section>
);
};
Expand Down

0 comments on commit 79dc8c2

Please sign in to comment.