Skip to content

Commit 5fd5305

Browse files
committed
misc style enhancements
1 parent 8d9d559 commit 5fd5305

File tree

5 files changed

+25
-14
lines changed

5 files changed

+25
-14
lines changed

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
${{ runner.os }}-mix-${{ env.cache-name }}-
4141
${{ runner.os }}-mix-
4242
- name: Restore Elixir build folder
43-
uses: actions/cache@v1
43+
uses: actions/cache@v3
4444
with:
4545
path: ./api/build
4646
key: ${{ runner.os }}-mix-${{ env.cache-name }}-${{ hashFiles('**/mix.lock') }}

app/components/Comments/Source.jsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,13 @@ export const Source = ({ source: { url, title, site_name }, withoutPlayer }) =>
4949
return (
5050
<ExternalLinkNewTab
5151
href={url}
52-
className="inline-block max-w-full p-3 px-5 mt-2 text-sm border border-primary-600/20 border-l-4 border-l-blue-400 rounded-r-md shadow-sm transition-all duration-200 hover:shadow-md hover:translate-x-0.5 hover:bg-gradient-to-br hover:from-primary-700/90 hover:to-primary-800/90 group"
52+
className="inline-block max-w-full p-3 px-5 mt-2 text-sm border border-primary-600/20 border-l-4 border-l-blue-400 rounded-r-md shadow-sm transition-all duration-200 hover:shadow-md hover:translate-x-0.5 hover:bg-gradient-to-br hover:from-primary-700/90 hover:to-primary-800/90 group bg-blue-50"
5353
>
54-
<div className="flex items-center gap-1 fond-semibold text-[1.05em] truncate group-hover:underline decoration-primary-400/60">
55-
<ExternalLink size="1em" />
56-
{site_name ? site_name.toUpperCase() : getDisplayableHostname(url)}
54+
<div className="flex items-center gap-1">
55+
<ExternalLink className="flex-grow-0 flex-shrink-0 basis-[14x]" size={14} />
56+
<span className="font-semibold truncate group-hover:underline">
57+
{site_name ? site_name.toUpperCase() : getDisplayableHostname(url)}
58+
</span>
5759
</div>
5860
<span className="italic text-[0.95em]">{title}</span>
5961
</ExternalLinkNewTab>

app/components/Comments/Vote.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Spinner from '../ui/spinner'
1010

1111
const Score = ({ isVoting, isReported, score }) => {
1212
return (
13-
<Badge variant="outline" className="min-w-9 h-[22px] justify-center">
13+
<Badge variant="outline" className="min-w-9 h-[22px] justify-center bg-white">
1414
{isVoting ? <Spinner size={13} /> : isReported ? <Ban size={13} /> : <span>{score}</span>}
1515
</Badge>
1616
)

app/components/Statements/StatementComments.jsx

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { withTranslation } from 'react-i18next'
44
import { connect } from 'react-redux'
55

66
import { Badge } from '@/components/ui/badge'
7+
import { cn } from '@/lib/css-utils'
78

89
import { classifyComments } from '../../state/video_debate/comments/selectors'
910
import { CommentsList } from '../Comments/CommentsList'
@@ -43,7 +44,7 @@ export default class StatementComments extends React.PureComponent {
4344
const hasSpeakerComments = speakerComments.size > 0
4445

4546
return !hasCommunityComments ? null : (
46-
<React.Fragment>
47+
<div className="bg-[#fefefe]">
4748
{hasSpeakerComments && (
4849
<div className="bg-neutral-100 text-center flex justify-center items-center gap-2 p-1">
4950
<Users size={14} />
@@ -53,16 +54,16 @@ export default class StatementComments extends React.PureComponent {
5354
<Separator />
5455
{hasSourcedComments && this.renderSourcedComments()}
5556
{hasRegularComments && this.renderRegularComments()}
56-
</React.Fragment>
57+
</div>
5758
)
5859
}
5960

6061
renderSourcedComments() {
6162
const { approvingFacts, refutingFacts, setReplyToComment } = this.props
6263
return (
63-
<div className="flex flex-wrap">
64+
<div className="flex flex-wrap shadow-[0_5px_5px_-5px_#bdbdbd] mb-2">
6465
<CommentsList
65-
className="w-full md:w-1/2 flex-grow basis-[450px] flex-col"
66+
className="w-full md:w-1/2 flex-grow basis-[450px] flex-col bg-red-100/5 pb-2"
6667
comments={refutingFacts}
6768
setReplyToComment={setReplyToComment}
6869
header={this.renderCommentsListHeader(
@@ -73,8 +74,11 @@ export default class StatementComments extends React.PureComponent {
7374
statementID={this.props.statement.id}
7475
commentType="refute"
7576
/>
77+
<div className="hidden md:flex items-stretch self-stretch my-2">
78+
<Separator orientation="vertical" className="bg-neutral-100" />
79+
</div>
7680
<CommentsList
77-
className="w-full md:w-1/2 flex-grow basis-[450px] flex-col"
81+
className="w-full md:w-1/2 flex-grow basis-[450px] flex-col bg-green-100/5 pb-2"
7882
comments={approvingFacts}
7983
setReplyToComment={setReplyToComment}
8084
header={this.renderCommentsListHeader(
@@ -92,7 +96,7 @@ export default class StatementComments extends React.PureComponent {
9296
renderRegularComments() {
9397
const { comments, setReplyToComment } = this.props
9498
return (
95-
<div className="p-3">
99+
<div className="px-3">
96100
<CommentsList
97101
comments={comments}
98102
setReplyToComment={setReplyToComment}
@@ -104,9 +108,13 @@ export default class StatementComments extends React.PureComponent {
104108
}
105109

106110
renderCommentsListHeader(label, variant, score = null) {
111+
const separatorClassName = cn(
112+
'flex-1 mx-2',
113+
variant === 'destructive' ? 'bg-red-800/30' : variant === 'success' ? 'bg-green-700/30' : '',
114+
)
107115
return (
108116
<div className="flex mt-2 mb-3 items-center">
109-
<Separator className="flex-1 mx-2" />
117+
<Separator className={separatorClassName} />
110118
<div className="flex items-center gap-2 font-bold">
111119
<span>{this.props.t(label)}</span>
112120
{score !== null && (
@@ -115,7 +123,7 @@ export default class StatementComments extends React.PureComponent {
115123
</Badge>
116124
)}
117125
</div>
118-
<Separator className="flex-1 mx-2" />
126+
<Separator className={separatorClassName} />
119127
</div>
120128
)
121129
}

app/components/Users/UserPicture.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const UserPicture = ({
3232
<Avatar
3333
data-cy="user-picture"
3434
className={cn(
35+
'border',
3536
size === USER_PICTURE_SMALL
3637
? 'w-6 h-6'
3738
: size === USER_PICTURE_LARGE

0 commit comments

Comments
 (0)