Skip to content

Commit 47c005e

Browse files
committed
update csLink to v2, closes #450
1 parent e5da932 commit 47c005e

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

modules/app.xqm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,8 @@ declare
16821682
attribute data-selection-when {"before-after"},
16831683
attribute data-selection-span {"median-before-after"},
16841684
attribute data-result-max {"4"},
1685-
attribute data-exclude-edition {"#WEGA"}
1685+
attribute data-exclude-edition {"#" || config:get-option('cmifID')},
1686+
attribute data-language {$lang}
16861687
}
16871688
};
16881689

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"bootstrap-hover-dropdown": "^2.2.1",
1717
"bootstrap-remote-data": "peterstadler/bootstrap-remote-data#master",
1818
"bravura": "https://github.com/steinbergmedia/bravura",
19-
"csLink": "correspSearch/csLink",
19+
"csLink": "correspSearch/csLink#v2.0.0",
2020
"datatables.net": "^1.11.3",
2121
"datatables.net-bs4": "^1.11.3",
2222
"datatables.net-buttons": "^2.1.1",
@@ -53,6 +53,7 @@
5353
"bootstrap/{build,dist,js,scss}",
5454
"bravura",
5555
"csLink/dist",
56+
"csLink/static",
5657
"datatables.net",
5758
"datatables.net-bs4",
5859
"datatables.net-buttons",

resources/sass/components/_csLink.scss

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77
}
88

9-
.popover[id*='BV_popover'] {
9+
.popover[id*='bv_popover_3'] {
1010
table {
1111
font-size:unset;
1212
}
@@ -15,25 +15,18 @@
1515
padding-right: 2em;
1616
}
1717

18-
.popover-body [id*="_BVID_"].tabs {
19-
max-height:400px;
20-
padding: 10px;
21-
.tab-content {
22-
overflow-y:auto;
23-
font-size:smaller;
24-
p {
25-
margin-bottom:unset;
26-
}
27-
}
18+
19+
.tab-content {
20+
padding: 0.5rem 0.75rem;
2821
}
2922

3023
.popover-header:empty {
3124
display:none;
3225
}
3326

3427
.nav {
35-
margin:4px 0 4px 0;
3628
flex-wrap:nowrap;
29+
background-color: #F5F5F5;
3730
}
3831

3932
.nav-tabs li {
@@ -50,6 +43,7 @@
5043
color:gray;
5144
&.active {
5245
border-bottom: 4px solid #0064bb;
46+
background-color: #F5F5F5;
5347
}
5448
}
5549
}
@@ -58,4 +52,4 @@
5852
hr {
5953
margin: 4px 0 4px 0;
6054
}
61-
}
55+
}

templates/document.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h2>
101101
<div id="kontext" class="panel-collapse collapse borderBox">
102102
<div data-template="app-shared:if-matches" data-template-key="docType" data-template-value="letters">
103103
<div data-template="app:csLink"/>
104-
<script type="text/javascript" src="$resources/lib/csLink/dist/static/js/cslink.js"/>
104+
<script type="text/javascript" src="$resources/lib/csLink/dist/csLink.js"/>
105105
</div>
106106
<div id="relatedItems" data-template="app-shared:if-exists" data-template-key="context-relatedItems">
107107
<h3 data-template="lang:translate">relatedItems</h3>

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ core-util-is@~1.0.0:
458458
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
459459
integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
460460

461-
csLink@correspSearch/csLink:
461+
csLink@correspSearch/csLink#v2.0.0:
462462
version "1.1.1"
463463
resolved "https://codeload.github.com/correspSearch/csLink/tar.gz/c13112498a99f402248cce97164056687b72ae83"
464464
dependencies:

0 commit comments

Comments
 (0)