Skip to content

Commit

Permalink
Merge pull request #643 from sonaliTekdi/webapp_changes
Browse files Browse the repository at this point in the history
Bug #227091 - [mobile - content page] Button lable should be in one line, Bug #227343 - [webapp => event] Allignments are not proper on event card
  • Loading branch information
paritshivani authored Sep 23, 2024
2 parents 05bfd5e + d10b869 commit c2a0e0b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
6 changes: 3 additions & 3 deletions packages/nulp_elite/src/components/EventCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,19 @@ export default function EventCard({ items, index, onClick }) {
>
{/* <CardMedia className="card-media" title="green iguana" /> */}
{/* <div onClick={onClick} className="card-div"></div> */}
<CardContent className="d-flex jc-bw">
<CardContent className="d-flex">
<Box>
{items.name && (
<Typography gutterBottom className="mt-10 event-title" >
{items.name}
</Typography>
)}
<Box className="d-flex h6-title mt-30" style={{ color: "#484848" }}>
<Box className="d-flex jc-bw alignItems-center">
<Box className="d-flex alignItems-center">
<TodayOutlinedIcon className="fs-12 pr-5" />
{formatDate(items.startDate)}
</Box>
<Box className="d-flex jc-bw alignItems-center pl-5 pr-5">
<Box className="d-flex alignItems-center pl-5 pr-5">
<AccessAlarmsOutlinedIcon className="fs-12 pr-5" />

{formatTimeToIST(items.startTime)}
Expand Down
9 changes: 6 additions & 3 deletions packages/nulp_elite/src/styles/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -766,6 +766,9 @@ button {
}

@media (max-width: 768px) {
.h3-title {
font-size: 15px !important;
}
.votingDashboard {
margin-top:55px;
}
Expand All @@ -774,7 +777,7 @@ button {
}
.viewAll{
font-size: 10px !important;
padding: 7px 4px;
padding: 9px 4px !important;
}
.d-flex-none {
display: block !important;
Expand Down Expand Up @@ -2643,7 +2646,7 @@ button {
border: none !important;
border-radius: 10px !important;
color: #fff !important;
font-size: 12px !important;
font-size: 12px;
font-weight: 500 !important;
padding: 9px 32px;
text-align: center !important;
Expand Down Expand Up @@ -2682,7 +2685,7 @@ button {

.h3-title {
color: #484848 !important;
font-size: 18px !important;
font-size: 18px;
font-weight: 600 !important;
}

Expand Down

0 comments on commit c2a0e0b

Please sign in to comment.