Skip to content

Commit 5abbdad

Browse files
committed
Add working border color
1 parent a67dbc5 commit 5abbdad

File tree

3 files changed

+51
-31
lines changed

3 files changed

+51
-31
lines changed

elm-git.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"git-dependencies": {
33
"direct": {
4-
"https://github.com/unisonweb/ui-core": "339edb84a64211bbbfb7f9d2ce99e07ab9fb184a"
4+
"https://github.com/unisonweb/ui-core": "aadadbff496feb5031541c64ed32469bc2418851"
55
},
66
"indirect": {}
77
}

src/UnisonShare/Page/ProjectContributionOverviewPage.elm

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -250,13 +250,6 @@ viewContribution session project updateStatus contribution mergeStatus =
250250
canMaintain =
251251
Project.canMaintain project
252252

253-
className =
254-
if updateStatus == UpdatingStatus then
255-
"contribution-description contribution-description_updating"
256-
257-
else
258-
"contribution-description"
259-
260253
description =
261254
contribution.description
262255
|> Maybe.map Markdown.view
@@ -372,12 +365,24 @@ viewContribution session project updateStatus contribution mergeStatus =
372365

373366
else
374367
div [ class "actions" ] actions
368+
369+
actionsClassName =
370+
if updateStatus == UpdatingStatus then
371+
"contribution-actions contribution-actions_updating"
372+
373+
else
374+
"contribution-actions contribution-actions_updating"
375375
in
376-
Card.card
377-
[ description, actions_ ]
378-
|> Card.asContained
379-
|> Card.withClassName className
380-
|> Card.view
376+
div [ class "contribution-overview_main-cards" ]
377+
[ Card.card [ description ]
378+
|> Card.withClassName "contribution-description"
379+
|> Card.asContained
380+
|> Card.view
381+
, Card.card [ actions_ ]
382+
|> Card.withClassName actionsClassName
383+
|> Card.asContained
384+
|> Card.view
385+
]
381386

382387

383388
viewStatusChangeEvent : DateTimeContext a -> ContributionEvent.StatusChangeDetails -> List (Html Msg)

src/css/unison-share/page/project-contribution-overview-page.css

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,73 @@
33
flex-direction: column;
44
gap: 1.5rem;
55

6-
& pre {
6+
pre {
77
overflow: auto;
88
}
99

10-
& .contribution-description {
10+
.contribution-overview_main-cards {
11+
display: flex;
12+
flex-direction: column;
13+
gap: 0.5rem;
14+
}
15+
16+
.contribution-description {
1117
z-index: 1;
1218
container-name: doc-container;
1319
container-type: inline-size;
1420
width: 100%;
1521

16-
& .no-description {
22+
.no-description {
1723
font-size: var(--font-size-medium);
1824
color: var(--u-color_text_subdued);
1925
}
26+
}
27+
28+
.contribution-actions {
29+
z-index: 1;
30+
container-name: doc-container;
31+
container-type: inline-size;
32+
width: 100%;
33+
34+
&.contribution-actions_updating {
35+
background: var(--u-color_working_element_subdued);
36+
border: 1px solid var(--u-color_working_border_subdued);
37+
}
2038

21-
& .actions {
22-
border-top: 1px solid var(--u-color_border_subdued);
23-
padding: 1.5rem 1.5rem 0;
24-
margin: 0.5rem -1.5rem 0;
39+
.actions {
2540
display: flex;
2641
flex: 1;
27-
width: calc(100% + 3rem);
42+
width: 100%;
2843
flex-direction: row;
2944
flex-wrap: wrap;
3045
gap: 0.5rem;
3146
justify-content: space-between;
3247

33-
& .left-actions {
48+
.left-actions {
3449
position: relative;
3550
display: flex;
3651
flex-direction: row;
3752
align-items: center;
3853
gap: 0.5rem;
3954

40-
& .tooltip {
55+
.tooltip {
4156
left: 0;
4257
}
4358
}
4459

45-
& .right-actions {
60+
.right-actions {
4661
position: relative;
4762
display: flex;
4863
flex-direction: row;
4964
gap: 0.5rem;
5065

51-
& .tooltip {
66+
.tooltip {
5267
right: 0;
5368
}
5469
}
5570

56-
& .tooltip {
57-
& .tooltip-bubble {
71+
.tooltip {
72+
.tooltip-bubble {
5873
top: 2.5rem;
5974
white-space: pre-wrap;
6075
min-width: 16rem;
@@ -64,26 +79,26 @@
6479
}
6580
}
6681

67-
& .new-comment_form {
82+
.new-comment_form {
6883
position: relative;
6984
margin-top: 1rem;
7085
display: flex;
7186
flex-direction: column;
7287
gap: 0.5rem;
7388
padding: 0 1.5rem;
7489

75-
& .divider {
90+
.divider {
7691
background: var(--u-color_border_subdued);
7792
margin-bottom: 1rem;
7893
}
7994

80-
& .comment-actions {
95+
.comment-actions {
8196
display: flex;
8297
flex-direction: row;
8398
justify-content: flex-end;
8499
position: relative;
85100

86-
& .status-banner {
101+
.status-banner {
87102
position: absolute;
88103
left: 0;
89104
z-index: 1;

0 commit comments

Comments
 (0)