Skip to content

Commit

Permalink
Merge branch 'main' into RokoPerisic/prominit-jedan-tech-u-dev-u-opis…
Browse files Browse the repository at this point in the history
…u-zlatnih-sponzora
  • Loading branch information
lovretomic authored Sep 23, 2024
2 parents 5c91d97 + d0b454d commit 4ffc013
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 14 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 @@ -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

0 comments on commit 4ffc013

Please sign in to comment.