Skip to content

Commit

Permalink
Merge branch 'r2024.08.26'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Possommi
Possommi committed Aug 26, 2024
2 parents fbee4bc + 1f2701c commit b3098a5
Show file tree
Hide file tree
Showing 52 changed files with 335 additions and 980 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 2024.08.26
- [#608](https://github.com/ThULB/ThUniBib/issues/608) Simplified embedding of web fonts (#609)
- [FSU040THUL-4181](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-4181) [#610](https://github.com/ThULB/ThUniBib/issues/610) Support search by publisher in extended search.xed (#611)
- [FSU040THUL-4246](https://servicedesk.uni-jena.de/plugins/servlet/desk/portal/140/FSU040THUL-4246) [#612](https://github.com/ThULB/ThUniBib/issues/612) Fixed calculation of max value of y-axis (#613)
---

## 2024.08.13
- [#572](https://github.com/ThULB/ThUniBib/issues/572) Added solr fields accessrights and peerreviewed to UBO.Export.Fields (#573)
- [#574](https://github.com/ThULB/ThUniBib/issues/574) Overwrite i18n ubo.person.connected.sup for Ilmenau and Jena (#575)
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>de.uni-jena.thulb.ubo</groupId>
<artifactId>ThUniBib</artifactId>
<version>2024.08.13</version>
<version>2024.08.26</version>
</parent>

<artifactId>thunibib-common</artifactId>
Expand Down
289 changes: 10 additions & 279 deletions common/src/main/resources/META-INF/resources/css/fonts.css
View file
Original file line number Diff line number Diff line change
@@ -1,300 +1,31 @@
/*family=Droid+Sans|Droid+Sans+Mono:300,400*/
/* latin */
@font-face {
font-family: 'Droid Sans';
font-style: normal;
font-display: swap;
font-weight: 400;
src: url(../fonts/droid-sans/04424400fbb91d3a161a6446db55baf5.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src: url(../fonts/droid-sans/droid-sans.woff2) format('woff2');
}

/* latin */
@font-face {
font-family: 'Droid Sans Mono';
font-style: normal;
font-display: swap;
font-weight: 400;
src: url(../fonts/droid-sans-mono/242c3e1fc5794bf33e44dcb29ea7c1de.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
src: url(../fonts/droid-sans-mono/droid-sans-mono.woff2) format('woff2');
}

/*family=Roboto:300,400*/
/* cyrillic-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/d56abfe33954cd800a45676b0684577b.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
font-display: swap;
font-weight: 300-800;
src: url(../fonts/Roboto/Roboto-Regular.woff2) format('woff2');
}

/* cyrillic */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/7475b4fcc13a8f8811f0dccf5cb117db.woff2) format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}

/* greek-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/e17f875fd99daf85e1e61ba3fa115428.woff2) format('woff2');
unicode-range: U+1F00-1FFF;
}

/* greek */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/1ef6327eabe2217ef4968c5f090ade10.woff2) format('woff2');
unicode-range: U+0370-03FF;
}

/* vietnamese */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/97ae156a75f200cc70d7ded594a414aa.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
}

/* latin-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/ca7e2d880e6a0b9d167c615e6ea3ea54.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}

/* latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto/9da96513b09058c705906f432f79a3b8.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/* cyrillic-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/46b998b515eb4933754801479c6f6195.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}

/* cyrillic */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/1757262c111d884cf1b2b4568ee43750.woff2) format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}

/* greek-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/7c62c3b3bc43860531136c583262a342.woff2) format('woff2');
unicode-range: U+1F00-1FFF;
}

/* greek */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/f27d864775c4f8c6abc61ba427da2d26.woff2) format('woff2');
unicode-range: U+0370-03FF;
}

/* vietnamese */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/12ce6f2df54cb6c6adec3f42d0cd175b.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
}

/* latin-ext */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/46fda89a03c06fbf09a0492219e2734d.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}

/* latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto/a6adaab7bfa86cb86712df4c60fe8f77.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/*family=Roboto+Condensed:300,400*/
/* cyrillic-ext */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/9b9a1787d74d1d66dddc7db52b1913a3.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}

/* cyrillic */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/ca9ac453a3618125fb1e55b2ef3b370f.woff2) format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}

/* greek-ext */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/beb2b82b14a42073c1a53cde8d0be38e.woff2) format('woff2');
unicode-range: U+1F00-1FFF;
}

/* greek */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/805c9e1b91cc5980efb18b94e89cb517.woff2) format('woff2');
unicode-range: U+0370-03FF;
}

/* vietnamese */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/c184c47dd68c6946eb862c5b4bf2848a.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
}

/* latin-ext */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/fe516c16ddc5e870c407dbacd7759b63.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}

/* latin */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
src: url(../fonts/Roboto_Condensed/f139fb22672e2f08f5433582f29e3fff.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/* cyrillic-ext */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/63e8233a49094fcf6e46cef4439190f8.woff2) format('woff2');
unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
}

/* cyrillic */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/0db989e1400eb987b7877eaa94908ff8.woff2) format('woff2');
unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
}

/* greek-ext */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/6c865e85b582a7c2c81ac881dba77558.woff2) format('woff2');
unicode-range: U+1F00-1FFF;
}

/* greek */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/26c4907074899657caa5bb6ab5a2f68a.woff2) format('woff2');
unicode-range: U+0370-03FF;
}

/* vietnamese */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/f8c6295cb4c13912da5c032c12dfec11.woff2) format('woff2');
unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
}

/* latin-ext */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/21bf24465b3d5ac66ad684b79d52a8a1.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}

/* latin */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
src: url(../fonts/Roboto_Condensed/1fe01eb7154fb93b7cafacb67954a5ac.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}

/*family=Amiri:300,400*/
/* arabic */
@font-face {
font-family: 'Amiri';
font-style: normal;
font-weight: 400;
src: url(../fonts/Amiri/5f2308e5c933aef9f4980603fcbd3c56.woff2) format('woff2');
unicode-range: U+0600-06FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF, U+FE80-FEFC;
}

/* latin-ext */
@font-face {
font-family: 'Amiri';
font-style: normal;
font-weight: 400;
src: url(../fonts/Amiri/4cab594dafa21a3c8a4109baf4f434b7.woff2) format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}

/* latin */
@font-face {
font-family: 'Amiri';
font-style: normal;
font-weight: 400;
src: url(../fonts/Amiri/bf819e66d5033945655dd0efcdd3faa9.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
font-display: swap;
font-weight: 300-800;
src: url(../fonts/Roboto_Condensed/RobotoCondensed-VariableFont_wght.woff2) format('woff2');
}
Binary file removed .../src/main/resources/META-INF/resources/fonts/Amiri/4cab594dafa21a3c8a4109baf4f434b7.woff2
View file
Binary file not shown.
Binary file removed .../src/main/resources/META-INF/resources/fonts/Amiri/5f2308e5c933aef9f4980603fcbd3c56.woff2
View file
Binary file not shown.
Binary file removed .../src/main/resources/META-INF/resources/fonts/Amiri/bf819e66d5033945655dd0efcdd3faa9.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/12ce6f2df54cb6c6adec3f42d0cd175b.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/1757262c111d884cf1b2b4568ee43750.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/1ef6327eabe2217ef4968c5f090ade10.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/46b998b515eb4933754801479c6f6195.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/46fda89a03c06fbf09a0492219e2734d.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/7475b4fcc13a8f8811f0dccf5cb117db.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/7c62c3b3bc43860531136c583262a342.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/97ae156a75f200cc70d7ded594a414aa.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/9da96513b09058c705906f432f79a3b8.woff2
View file
Binary file not shown.
Binary file added common/src/main/resources/META-INF/resources/fonts/Roboto/Roboto-Regular.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/a6adaab7bfa86cb86712df4c60fe8f77.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/ca7e2d880e6a0b9d167c615e6ea3ea54.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/d56abfe33954cd800a45676b0684577b.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/e17f875fd99daf85e1e61ba3fa115428.woff2
View file
Binary file not shown.
Binary file removed ...src/main/resources/META-INF/resources/fonts/Roboto/f27d864775c4f8c6abc61ba427da2d26.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/0db989e1400eb987b7877eaa94908ff8.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/1fe01eb7154fb93b7cafacb67954a5ac.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/21bf24465b3d5ac66ad684b79d52a8a1.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/26c4907074899657caa5bb6ab5a2f68a.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/63e8233a49094fcf6e46cef4439190f8.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/6c865e85b582a7c2c81ac881dba77558.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/805c9e1b91cc5980efb18b94e89cb517.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/9b9a1787d74d1d66dddc7db52b1913a3.woff2
View file
Binary file not shown.
Binary file added ...sources/META-INF/resources/fonts/Roboto_Condensed/RobotoCondensed-VariableFont_wght.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/beb2b82b14a42073c1a53cde8d0be38e.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/c184c47dd68c6946eb862c5b4bf2848a.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/ca9ac453a3618125fb1e55b2ef3b370f.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/f139fb22672e2f08f5433582f29e3fff.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/f8c6295cb4c13912da5c032c12dfec11.woff2
View file
Binary file not shown.
Binary file removed ...esources/META-INF/resources/fonts/Roboto_Condensed/fe516c16ddc5e870c407dbacd7759b63.woff2
View file
Binary file not shown.
0 ...no/242c3e1fc5794bf33e44dcb29ea7c1de.woff2 → ...nts/droid-sans-mono/droid-sans-mono.woff2
View file
File renamed without changes.
0 ...ns/04424400fbb91d3a161a6446db55baf5.woff2 → ...sources/fonts/droid-sans/droid-sans.woff2
View file
File renamed without changes.
Loading

0 comments on commit b3098a5

Please sign in to comment.