Skip to content

Commit 69f4578

Browse files
feat: styled update
1 parent 758f982 commit 69f4578

File tree

10 files changed

+52
-92
lines changed

10 files changed

+52
-92
lines changed

src/discussions/discussions-home/DiscussionContent.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const DiscussionContent = () => {
1313
const postEditorVisible = useSelector((state) => state.threads.postEditorVisible);
1414

1515
return (
16-
<div className="d-flex discussionContentWrapper flex-column w-75 w-xs-100 w-xl-75 align-items-center overflow-auto">
16+
<div className="d-flex flex-column w-75 w-xs-100 w-xl-75 align-items-center overflow-auto">
1717
<div className="d-flex flex-column w-100">
1818
<Suspense fallback={(<Spinner />)}>
1919
<Routes>

src/discussions/discussions-home/DiscussionsHome.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ const DiscussionsHome = () => {
8686
{!enableInContextSidebar && <CourseTabsNavigation />}
8787
{(isEnrolled || !isUserLearner) && (
8888
<div
89-
className={classNames('header-action-bar bg-white position-sticky headerWrapper', {
89+
className={classNames('header-action-bar bg-white position-sticky', {
9090
'shadow-none border-light-300 border-bottom': enableInContextSidebar,
9191
})}
9292
ref={postActionBarRef}
@@ -135,7 +135,7 @@ const DiscussionsHome = () => {
135135
</Routes>
136136
</Suspense>
137137
) : (
138-
<div className="d-flex flex-row position-relative sidebarWrapper">
138+
<div className="d-flex flex-row position-relative">
139139
<Suspense fallback={(<Spinner />)}>
140140
<DiscussionSidebar displaySidebar={displaySidebar} postActionBarRef={postActionBarRef} />
141141
</Suspense>

src/discussions/learners/learner/LearnerFooter.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ const LearnerFooter = ({
3434
)}
3535
>
3636
<div className="d-flex align-items-center">
37-
<Icon src={QuestionAnswerOutline} className="icon-size mr-2" />
37+
<svg width="24" className='pgn__icon icon-size mr-2' height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
38+
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.35402 19.7002L9.45339 20.7996C9.89995 21.2461 10.6238 21.2461 11.0704 20.7996L12.1697 19.7002C12.483 19.3869 12.9072 19.2118 13.3499 19.2118H14.1768C15.859 19.2118 17.223 17.8478 17.223 16.1647V10.8157C17.223 9.13354 15.859 7.76953 14.1768 7.76953H6.3479C4.66479 7.76953 3.30078 9.13354 3.30078 10.8157V16.1647C3.30078 17.8478 4.66479 19.2118 6.3479 19.2118H7.17389C7.61656 19.2118 8.04074 19.3869 8.35402 19.7002Z" stroke="#111827" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
39+
<path d="M7.37891 7.76979V6.99147C7.37891 5.3103 8.74096 3.94922 10.4289 3.94922H18.2579C19.939 3.94922 21.3011 5.3103 21.3011 6.99147V12.3414C21.3011 14.0294 19.939 15.3905 18.2579 15.3905H17.4319C17.3618 15.3905 17.2927 15.3983 17.2227 15.4051" stroke="#111827" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
40+
<path d="M12.4541 13.6211V13.6909M12.737 13.6361C12.737 13.7932 12.6095 13.9206 12.4524 13.9206C12.2953 13.9206 12.168 13.7932 12.168 13.6361C12.168 13.4789 12.2953 13.3516 12.4524 13.3516C12.6095 13.3516 12.737 13.4789 12.737 13.6361Z" stroke="#111827" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
41+
<path d="M7.76858 13.6211V13.6909M8.05144 13.6361C8.05144 13.7932 7.92397 13.9206 7.76685 13.9206C7.60972 13.9206 7.48242 13.7932 7.48242 13.6361C7.48242 13.4789 7.60972 13.3516 7.76685 13.3516C7.92397 13.3516 8.05144 13.4789 8.05144 13.6361Z" stroke="#111827" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
42+
</svg>
43+
3844
{threads + responses + replies}
3945
</div>
4046
</OverlayTrigger>

src/discussions/posts/post-actions-bar/PostActionsBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const PostActionsBar = () => {
5555
<Button
5656
variant={enableInContextSidebar ? 'plain' : 'brand'}
5757
className={classNames(
58-
'my-0 font-style border-0 line-height-24 purple-bg',
58+
'my-0 font-style border-0 line-height-24',
5959
{ 'px-3 py-10px border-0 transparent-bg': enableInContextSidebar },
6060
)}
6161
onClick={handleAddPost}

src/discussions/posts/post-filter-bar/PostFilterBar.jsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import {
2929
import { selectThreadFilters, selectThreadSorting } from '../data/selectors';
3030
import messages from './messages';
3131

32+
import FilterIcon from './filter-icon.svg';
33+
3234
export const ActionItem = React.memo(({
3335
id,
3436
label,
@@ -184,7 +186,7 @@ const PostFilterBar = () => {
184186
className="filter-bar collapsible-card-lg border-0"
185187
>
186188
<Collapsible.Trigger className="collapsible-trigger border-0">
187-
<span className="dark-black-color pr-4 font-style">
189+
<span className="pr-4 font-style">
188190
{intl.formatMessage(messages.sortFilterStatus, {
189191
own: false,
190192
type: currentFilters.postType,
@@ -196,10 +198,10 @@ const PostFilterBar = () => {
196198
</span>
197199
<span>
198200
<Collapsible.Visible whenClosed>
199-
<Icon src={Tune} />
201+
<img src={FilterIcon} alt="FilterIcon" aria-hidden="true" />
200202
</Collapsible.Visible>
201203
<Collapsible.Visible whenOpen>
202-
<Icon src={Tune} />
204+
<img src={FilterIcon} alt="FilterIcon" aria-hidden="true" />
203205
</Collapsible.Visible>
204206
</span>
205207
</Collapsible.Trigger>
Lines changed: 8 additions & 0 deletions
Loading

src/discussions/posts/post/PostSummaryFooter.jsx

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
Badge, Icon, OverlayTrigger, Tooltip,
66
} from '@openedx/paragon';
77
import {
8-
People, QuestionAnswer, QuestionAnswerOutline,
8+
People,
99
StarFilled, StarOutline, ThumbUpFilled, ThumbUpOutline,
1010
} from '@openedx/paragon/icons';
1111
import { useSelector } from 'react-redux';
@@ -17,6 +17,10 @@ import timeLocale from '../../common/time-locale';
1717
import { selectUserHasModerationPrivileges } from '../../data/selectors';
1818
import messages from './messages';
1919

20+
import FilledChatIcon from './filled-chat-icon.svg';
21+
import OutlineChatIcon from './chat-icon.svg';
22+
23+
2024
const PostSummaryFooter = ({
2125
postId,
2226
voted,
@@ -35,8 +39,8 @@ const PostSummaryFooter = ({
3539
const userHasModerationPrivileges = useSelector(selectUserHasModerationPrivileges);
3640

3741
return (
38-
<div className="d-flex align-items-center text-gray-700" style={{ height: '24px' }}>
39-
<div className="d-flex align-items-center mr-4.5">
42+
<div className="d-flex align-items-center text-gray-700 " style={{ height: '28px' }}>
43+
<div className="d-flex align-items-center mr-4.5 ">
4044
<OverlayTrigger
4145
overlay={(
4246
<Tooltip id={`liked-${postId}-tooltip`}>
@@ -68,20 +72,20 @@ const PostSummaryFooter = ({
6872
</OverlayTrigger>
6973

7074
{preview && commentCount > 1 && (
71-
<div className="d-flex align-items-center ml-4.5 text-gray-700 font-style font-size-12">
75+
<div className="d-flex align-items-center ml-4.5 text-gray-700 font-style font-size-12" style={{ gap: '5px' }}>
7276
<OverlayTrigger
7377
overlay={(
7478
<Tooltip id={`follow-${postId}-tooltip`}>
7579
{intl.formatMessage(messages.activity)}
7680
</Tooltip>
7781
)}
7882
>
79-
<Icon
80-
src={unreadCommentCount ? QuestionAnswer : QuestionAnswerOutline}
81-
className="post-summary-comment-count-dimensions mr-0.5"
82-
>
83-
<span className="sr-only">{' '} {intl.formatMessage(messages.activity)}</span>
84-
</Icon>
83+
84+
85+
<div className="post-summary-comment-count-dimensions mr-0.5 pgn__icon">
86+
<img src={unreadCommentCount ? FilledChatIcon : OutlineChatIcon} />
87+
</div>
88+
8589
</OverlayTrigger>
8690
{commentCount}
8791
</div>
Lines changed: 6 additions & 0 deletions
Loading
Lines changed: 7 additions & 0 deletions
Loading

src/index.scss

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -597,79 +597,6 @@ td {
597597
white-space: nowrap;
598598
}
599599

600-
#root {
601-
.headerWrapper {
602-
&.header-action-bar {
603-
z-index: 100 !important;
604-
.navbar {
605-
padding-bottom: 32px;
606-
.pgn {
607-
&__searchfield {
608-
form {
609-
background-color: #f3f3f3 !important;
610-
611-
.form-control {
612-
background-color: #f3f3f3 !important;
613-
}
614-
}
615-
}
616-
}
617-
.nav-button-group {
618-
.nav-item {
619-
.nav-link {
620-
color: #111827 !important;
621-
&.active {
622-
background: #4600c7 !important;
623-
color: #fff !important;
624-
&:hover {
625-
background: #4600c7 !important;
626-
color: #fff !important;
627-
}
628-
}
629-
&:hover {
630-
background-color: #f3f3f3 !important;
631-
}
632-
}
633-
}
634-
}
635-
}
636-
}
637-
}
638-
.sidebarWrapper {
639-
border: 1px solid #f3f3f3;
640-
border-radius: 8px !important;
641-
padding: 0 !important;
642-
margin-bottom: 30px !important;
643-
overflow: hidden;
644-
.discussion-posts {
645-
border: 1px solid #f3f3f3;
646-
border-radius: 8px 0 0 8px !important;
647-
}
648-
}
649-
.discussionContentWrapper {
650-
background-color: #f3f3f3;
651-
border-radius: 0 8px 8px 0 !important;
652-
.card{
653-
&.post-form{
654-
border: unset !important;
655-
}
656-
}
657-
}
658-
}
659-
.purple-bg.transparent-bg {
660-
background-color: transparent !important;
661-
}
662-
.buttonActionWrap {
663-
button {
664-
color: #4600c7 !important;
665-
}
666-
}
667600

668-
.post-card-comment {
669-
.hover-button {
670-
button {
671-
color: #4600c7 !important;
672-
}
673-
}
674-
}
601+
675602

0 commit comments

Comments
 (0)