Skip to content

Commit 4cde530

Browse files
authored
PODCAT-1603: QA Round2 (#487)
* qa round 2 * fixed dataset detail page display issue
1 parent ded6766 commit 4cde530

File tree

10 files changed

+61
-31
lines changed

10 files changed

+61
-31
lines changed

src/assets/img/DataResource.svg

Lines changed: 1 addition & 1 deletion
Loading

src/pages/contributePage/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const ContributeContainer = styled.div`
143143
.contributeContentHeader1 {
144144
padding-bottom: 10px;
145145
/* color: #2dc799; */
146-
color: #00a272;
146+
color: #0052B3;
147147
font-weight: 300;
148148
font-family: Inter;
149149
font-size: 33px;

src/pages/datasetDetailPage/datasetDetailPage.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ ul.breadcrumb li a:hover {
5151
background: linear-gradient(.25turn, #0c3561, 66%, #1b83d2);
5252
/* border-bottom: 1px solid lightgray; */
5353
position: relative;
54+
margin-bottom: 23px;
5455
}
5556

5657
.leftContainer {
@@ -69,7 +70,7 @@ ul.breadcrumb li a:hover {
6970
}
7071

7172
.datasetDetailHeaderLabel {
72-
padding: 0px 0px 60px 26px;
73+
padding: 0px 0px 19px 26px;
7374
color: white;
7475
font-size: 34px;
7576
font-weight: medium;
@@ -133,7 +134,7 @@ ul.breadcrumb li a:hover {
133134
font-size: 17px;
134135
font-weight: bold;
135136
font-family: Lato;
136-
width: 80%;
137+
/* width: 80%; */
137138
display: -webkit-inline-box;
138139
}
139140

@@ -342,7 +343,7 @@ ul.breadcrumb li a:hover {
342343
}
343344

344345
.dataElementContentPublished {
345-
color: #0B835F;
346+
color: #00875E;
346347
font-family: Lato;
347348
font-weight: normal;
348349
max-height: 200px;
@@ -370,15 +371,15 @@ ul.breadcrumb li a:hover {
370371

371372
.additionalDataLinks {
372373
margin-top: 10px;
373-
color: #0B835F;
374+
color: #00875E;
374375
/* color: black; */
375376
text-transform: none;
376377
max-width: 95%;
377378
word-break: break-all;
378379
}
379380

380381
.additionalDataLinks:hover {
381-
color: #0B835F;
382+
color: #00875E;
382383
}
383384

384385
.additionalDataContent {

src/pages/documentSearchPage/DocumentSearchPage.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,14 @@ const SearchContent = styled.div`
140140

141141
const SearchSummary = styled.div`
142142
width: 100%;
143-
color: #004187;
144-
font-size: 30px;
145143
padding: 20px;
144+
color: #686868;
145+
font-family: Lato;
146+
font-size: 20px;
147+
font-style: normal;
148+
font-weight: 400;
149+
line-height: 150%; /* 30px */
150+
text-transform: uppercase;
146151
`;
147152

148153
const useQuery = () => {

src/pages/documentSearchPage/SearchResult/SearchResult.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const DocumentCard = styled.div`
2020
padding: 0 20px 40px 20px;
2121
2222
b {
23-
color: #00A272;
23+
color: #00875E;
2424
}
2525
`;
2626

@@ -31,7 +31,9 @@ const DocumentHeader = styled.div`
3131
font-size: 25px;
3232
3333
a {
34-
color: #00A272;
34+
color: #00875E;
35+
text-underline-offset: 3px;
36+
text-decoration-thickness: 1px;
3537
}
3638
`;
3739

@@ -53,8 +55,9 @@ const DocumentLink = styled.div`
5355
font-size: 19px;
5456
5557
a {
56-
color: #00A272;
57-
text-decoration: none;
58+
color: #00875E;
59+
text-underline-offset: 3px;
60+
text-decoration-thickness: 1px;
5861
}
5962
`;
6063

src/pages/glossaryPage/glossaryPageView.js

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,13 @@ const GlossaryContainer = styled.div`
9393
}
9494
9595
.glossaryItemHeader {
96-
color: #008059;
96+
color: #0052B3;
9797
font-family: Inter;
98-
font-weight: 600;
98+
font-size: 33px;
99+
font-style: normal;
100+
font-weight: 300;
101+
line-height: 120%; /* 39.6px */
102+
letter-spacing: -0.165px;
99103
margin-bottom: 0px;
100104
}
101105
@@ -115,15 +119,23 @@ const GlossaryContainer = styled.div`
115119
.glossaryItemLink {
116120
margin-top: -10px;
117121
color: #00875E;
122+
font-family: Lato;
123+
font-size: 17px;
124+
font-style: normal;
125+
font-weight: 500;
126+
line-height: 150%; /* 25.5px */
118127
}
119128
120129
.glossaryItemLink a {
121130
margin-top: -10px;
122-
font-weight: 500;
131+
color: #00875E;
123132
font-family: Lato;
124133
font-size: 17px;
125-
color: #00875E;
126-
text-decoration: none;
134+
font-style: normal;
135+
font-weight: 500;
136+
line-height: 150%; /* 25.5px */
137+
text-underline-offset: 3px;
138+
text-decoration-thickness: 1px;
127139
}
128140
`;
129141

src/pages/participatingResourceDetailPage/ParticipatingResourceDetail.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ const DataLink = styled.li`
9696
text-decoration: none;
9797
list-style-type: none;
9898
display: inline;
99+
100+
a {
101+
text-underline-offset: 3px;
102+
text-decoration-thickness: 1px;
103+
}
99104
`;
100105

101106
const ExternalLink = styled.li`
@@ -469,7 +474,7 @@ const ParticipatingResourceDetail = ({
469474
</DatasetTitle>
470475
</DatasetHeader>
471476
<DatasetDesc>
472-
{ds.case_disease_diagnosis ? <div className="summaryDataElementLabel">Case Disease Diagnosis</div> : null}
477+
{ds.case_disease_diagnosis ? <div className="summaryDataElementLabel">Case Disease Diagnosis:</div> : null}
473478
<div className="summaryDataElementContent">
474479
{
475480
ds.case_disease_diagnosis
@@ -495,7 +500,7 @@ const ParticipatingResourceDetail = ({
495500
: null
496501
}
497502
{ds.case_id
498-
? <div className="summaryDataElementLabel">Number of Cases</div>
503+
? <div className="summaryDataElementLabel">Number of Cases:</div>
499504
: null}
500505
{
501506
ds.case_id
@@ -508,7 +513,7 @@ const ParticipatingResourceDetail = ({
508513
: null
509514
}
510515
{ds.case_sex
511-
? <div className="summaryDataElementLabel">Case Sex</div>
516+
? <div className="summaryDataElementLabel">Case Sex:</div>
512517
: null}
513518
<div className="summaryDataElementContent">
514519
{
@@ -534,7 +539,7 @@ const ParticipatingResourceDetail = ({
534539
: null
535540
}
536541
{ds.case_age_at_diagnosis
537-
? <div className="summaryDataElementLabel">Case Age At Diagnosis</div>
542+
? <div className="summaryDataElementLabel">Case Age At Diagnosis:</div>
538543
: null}
539544
<div className="summaryDataElementContent">
540545
{
@@ -559,7 +564,7 @@ const ParticipatingResourceDetail = ({
559564
? <br />
560565
: null
561566
}
562-
{ds.published_in ? <div className="summaryDataElementLabel">Published In</div> : null}
567+
{ds.published_in ? <div className="summaryDataElementLabel">Published In:</div> : null}
563568
{
564569
ds.published_in && ds.published_in.split(";").map((link, linkidx) => {
565570
const newlink = link.trim();

src/pages/participatingResourceDetailPage/participatingResourceDetailPage.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/* padding: 0px 0 20px 20px; */
1010
padding: 16px 0 10px 0px;
1111
width: 100%;
12-
background: linear-gradient(to right, #05296b,#79291b,#e78709);
12+
background: linear-gradient(to right, #05296b,#79291b,#AE640A);
1313
/* border-bottom: 1px solid lightgray; */
1414
position: relative;
1515
}

src/pages/participatingResourcesPage/SearchResult/SearchResult.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,9 @@ const POCInfo = styled.div`
9696
9797
a {
9898
margin-left: 5px;
99-
text-decoration: none;
100-
color: #008059;
99+
color: #00875E;
100+
text-underline-offset: 3px;
101+
text-decoration-thickness: 1px;
101102
font-weight: 500;
102103
}
103104
`;
@@ -108,8 +109,9 @@ const SiteInfo = styled.div`
108109
margin-bottom: 10px;
109110
110111
a {
111-
text-decoration: none;
112112
color: #00875E;
113+
text-underline-offset: 3px;
114+
text-decoration-thickness: 1px;
113115
font-weight: 500;
114116
}
115117
`;

src/pages/searchCatalogPage/SearchResult/SearchResult.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ const SearchResultContainer = styled.div`
209209
.bodyRow .sampleCountHighlight {
210210
font-family: 'Inter';
211211
font-weight: 600;
212-
color: #0D826C;
212+
color: #0C79CC;
213213
}
214214
215215
.bodyRow .itemContinued {
@@ -700,9 +700,11 @@ const SearchResult = ({
700700
</div>
701701
<div className="row align-items-start subHeaderRow">
702702
<div className="col-sm">
703-
<img src={dataResourceIcon} alt="data-resource" />
704-
&nbsp;
705-
<Link to={`/resource/${rst.content.data_resource_id}`}>{rst.highlight && rst.highlight.data_resource_name ? ReactHtmlParser(rst.highlight.data_resource_name[0]) : rst.content.data_resource_id}</Link>
703+
<Link to={`/resource/${rst.content.data_resource_id}`}>
704+
<img src={dataResourceIcon} alt="data-resource" />
705+
&nbsp;
706+
{rst.highlight && rst.highlight.data_resource_name ? ReactHtmlParser(rst.highlight.data_resource_name[0]) : rst.content.data_resource_id}
707+
</Link>
706708
</div>
707709
</div>
708710
{

0 commit comments

Comments
 (0)