Skip to content

Commit 0cd2c50

Browse files
chremanchreman
authored
Merge pull request #610 from OpenKnowledgeMaps/dev
Biweekly release (21-12-22)
2 parents 74ba940 + e1518fe commit 0cd2c50

5 files changed

Lines changed: 46 additions & 61 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 2021-12-22
4+
5+
### Changes
6+
7+
- unified HTML & CSS of various paper tags (access tags, dataset tag, custom tags)
8+
39
## 2021-12-09
410

511
### New features

‎vis/js/templates/listentry/AccessIcons.jsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ const AccessIcons = ({ isOpenAccess, isFreeAccess, isDataset, tags }) => {
77
// html template starts here
88
<div id="oa">
99
{!!isOpenAccess && (
10-
<span id="open-access-logo_list">
11-
<span className="access_icon outlink_symbol">&#61596;</span>
12-
<Highlight>open access</Highlight>
10+
<span className="paper-tag open-access-tag">
11+
<span className="access_icon outlink_symbol">&#61596;</span>
12+
<Highlight>open access</Highlight>
1313
</span>
1414
)}
1515
{!!isFreeAccess && (
16-
<span id="free-access-logo_list" className="access_icon free-access-logo">
17-
<span className="outlink_symbol">&#61596;</span>
18-
<Highlight>free access </Highlight>
16+
<span className="paper-tag free-access-tag">
17+
<span className="access_icon outlink_symbol">&#61596;</span>
18+
<Highlight>free access</Highlight>
1919
</span>
2020
)}
2121
{!!isDataset && (
22-
<span id="dataset-icon_list" className="access_icon dataset-tag">
23-
<span className="fa fa-database"></span>
24-
<Highlight>dataset </Highlight>
22+
<span className="paper-tag dataset-tag">
23+
<span className="fa fa-database access_icon"></span>
24+
<Highlight>dataset</Highlight>
2525
</span>
2626
)}
2727
{tags}

‎vis/js/templates/listentry/Tags.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import Highlight from "../../components/Highlight";
55
const Tags = ({ values }) => {
66
return (
77
// html template starts here
8-
<div id="list_tags" className="tags" style={{ display: "inline-block" }}>
8+
<div className="tags">
99
{values.map((tag) => (
10-
<div className="tag" key={tag}>
10+
<div className="paper-tag" key={tag}>
1111
<Highlight>{tag}</Highlight>
1212
</div>
1313
))}

‎vis/stylesheets/modules/list/_entry.scss‎

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -22,54 +22,37 @@
2222
margin-bottom: 6px;
2323
}
2424

25-
#open-access-logo_list, #free-access-logo_list {
26-
background-color: white;
27-
color: $open-access;
28-
border: 1px solid $open-access;
29-
padding: 2px 4px;
30-
border-radius: 14px;
31-
-webkit-border-radius: 14px;
32-
-moz-border-radius: 14px;
33-
font-size: 10px;
34-
font-weight: $fontweight400;
25+
.tags {
3526
display: inline-block;
36-
width: 100px;
37-
text-align: center;
3827
}
3928

40-
.tag {
29+
.paper-tag {
30+
display: inline-block;
31+
padding: 2px 4px;
32+
width: 100px;
4133
background-color: white;
42-
display: inline;
34+
4335
color: $medium-blue;
44-
border: 1px solid $medium-blue;
45-
padding: 2px 4px;
46-
border-radius: 5px;
47-
-webkit-border-radius: 5px;
48-
-moz-border-radius: 5px;
36+
text-align: center;
4937
font-size: 10px;
5038
font-weight: $fontweight400;
39+
40+
border: 1px solid $medium-blue;
41+
border-radius: 14px;
42+
-webkit-border-radius: 14px;
43+
-moz-border-radius: 14px;
44+
5145
margin-right: 3px;
5246
}
5347

54-
.tags {
55-
display: inline;
48+
.open-access-tag, .free-access-tag {
49+
color: $open-access;
50+
border-color: $open-access;
5651
}
5752

5853
.dataset-tag {
5954
color: $dataset;
60-
border: 1px solid $dataset;
61-
background-color: white;
62-
padding: 2px 4px;
63-
border-radius: 14px;
64-
-webkit-border-radius: 14px;
65-
-moz-border-radius: 14px;
66-
width: 100px;
67-
text-align: center;
68-
margin-left: 6px;
69-
}
70-
71-
.fa-database {
72-
margin-right: 3px;
55+
border-color: $dataset;
7356
}
7457

7558
.resulttype-dataset {
@@ -865,7 +848,7 @@ img#preview_page {
865848

866849
@if $skin == "covis" {
867850

868-
#open-access-logo_list {
851+
.open-access-tag {
869852
font-size: 10px;
870853
vertical-align: top;
871854
font-weight: $fontweight400;
@@ -937,10 +920,6 @@ img#preview_page {
937920
margin-bottom: 5px;
938921
}
939922

940-
#free-access-logo_list, #open-access-logo_list {
941-
margin-right: 3px;
942-
}
943-
944923
#list_keywords {
945924

946925
.keyword_tag {

‎vis/test/snapshot/__snapshots__/list-base.test.js.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-in, p
288288
id="oa"
289289
>
290290
<span
291-
id="open-access-logo_list"
291+
className="paper-tag open-access-tag"
292292
>
293293
<span
294294
className="access_icon outlink_symbol"
@@ -1204,7 +1204,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
12041204
id="oa"
12051205
>
12061206
<span
1207-
id="open-access-logo_list"
1207+
className="paper-tag open-access-tag"
12081208
>
12091209
<span
12101210
className="access_icon outlink_symbol"
@@ -2082,7 +2082,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
20822082
id="oa"
20832083
>
20842084
<span
2085-
id="open-access-logo_list"
2085+
className="paper-tag open-access-tag"
20862086
>
20872087
<span
20882088
className="access_icon outlink_symbol"
@@ -2259,7 +2259,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
22592259
id="oa"
22602260
>
22612261
<span
2262-
id="open-access-logo_list"
2262+
className="paper-tag open-access-tag"
22632263
>
22642264
<span
22652265
className="access_icon outlink_symbol"
@@ -2489,7 +2489,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
24892489
id="oa"
24902490
>
24912491
<span
2492-
id="open-access-logo_list"
2492+
className="paper-tag open-access-tag"
24932493
>
24942494
<span
24952495
className="access_icon outlink_symbol"
@@ -2692,7 +2692,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
26922692
id="oa"
26932693
>
26942694
<span
2695-
id="open-access-logo_list"
2695+
className="paper-tag open-access-tag"
26962696
>
26972697
<span
26982698
className="access_icon outlink_symbol"
@@ -3096,7 +3096,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
30963096
id="oa"
30973097
>
30983098
<span
3099-
id="open-access-logo_list"
3099+
className="paper-tag open-access-tag"
31003100
>
31013101
<span
31023102
className="access_icon outlink_symbol"
@@ -3611,7 +3611,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
36113611
id="oa"
36123612
>
36133613
<span
3614-
id="open-access-logo_list"
3614+
className="paper-tag open-access-tag"
36153615
>
36163616
<span
36173617
className="access_icon outlink_symbol"
@@ -3962,7 +3962,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
39623962
id="oa"
39633963
>
39643964
<span
3965-
id="open-access-logo_list"
3965+
className="paper-tag open-access-tag"
39663966
>
39673967
<span
39683968
className="access_icon outlink_symbol"
@@ -4139,7 +4139,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
41394139
id="oa"
41404140
>
41414141
<span
4142-
id="open-access-logo_list"
4142+
className="paper-tag open-access-tag"
41434143
>
41444144
<span
41454145
className="access_icon outlink_symbol"
@@ -4445,7 +4445,7 @@ exports[`List entries component snapshot (BASE) matches a snapshot (zoomed-out)
44454445
id="oa"
44464446
>
44474447
<span
4448-
id="open-access-logo_list"
4448+
className="paper-tag open-access-tag"
44494449
>
44504450
<span
44514451
className="access_icon outlink_symbol"

0 commit comments

Comments
 (0)