Skip to content

Commit

Permalink
Merge pull request #457 from Edirom/improve-figures
Browse files Browse the repository at this point in the history 
Improve figures
  • Loading branch information
@peterstadler
peterstadler authored Apr 24, 2024
2 parents 1e6c575 + fcec658 commit 6ada1c2
Show file tree
Hide file tree
Showing 40 changed files with 249 additions and 195 deletions.
14 changes: 0 additions & 14 deletions resources/sass/base/_helpers.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,6 @@
background-color: $gray-dark;
}

.float-left img {
float:left;
margin: 0px 2em 1em 0px;
padding: .5em 1em;
max-width: 100%;
}

.float-right img {
float:right;
margin: 0px 0px 1em 2em;
padding: .5em 1em;
max-width: 100%;
}

.inline {
display:inline !important;
margin: 0px 1em;
Expand Down
42 changes: 40 additions & 2 deletions resources/sass/components/_text.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,43 @@ div.table-wrapper {
margin: $line-height-computed auto;
}

figure {
&.align-horizontally {
text-align:center;
}
&.float-left,
&.float-right {
max-width: 50%;
img {
padding: .5em 1em;
max-width: 100%;
}
}
}

@include media-breakpoint-down(md) {
figure {
&.float-left,
&.float-right {
text-align:center;
max-width: 100%;
width: 100%;
}
}
}

/* caption text below images */
figcaption {
font-style: italic;
text-align: center;
font-size: smaller;
margin: auto;
max-width:75%;
.tei_hi_italic, .tei_hi_latintype {
font-style:normal;
}
}

/*
* Animated highlighting, used e.g. for historic footnotes (see https://github.com/Edirom/WeGA-WebApp/issues/226)
*/
Expand Down Expand Up @@ -81,13 +118,14 @@ div.table-wrapper {
padding-left:2em;
}

.tei_notatedMusic {
/* NB: notatedMusic/@rend="maxSize" are converted to figure elements */
span.tei_notatedMusic {
display:block;
margin: 1ex auto;
width: 95%;
text-align:center;
}
.tei_notatedMusic img {
span.tei_notatedMusic img {
margin: 0px;
max-width:100%;
height: auto;
Expand Down
8 changes: 4 additions & 4 deletions testing/expected-results/documents/A100379.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1315,9 +1315,9 @@ <h3 class="media-heading">

<span>Original: Verbleib unbekannt</span>
<span>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_62085b588b69199a0050bd5c9e22a8a6"></a>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_e76806d4772e41c1e12b6a6818161b06"></a>
</span>
<div class="collapse apparatus-details" id="source_62085b588b69199a0050bd5c9e22a8a6">
<div class="collapse apparatus-details" id="source_e76806d4772e41c1e12b6a6818161b06">


<div>
Expand All @@ -1330,7 +1330,7 @@ <h4 class="media-heading">Dazugehörige Textwiedergaben</h4>

<span>EV: Hell (Schriften), Bd. 3, S. 158–172</span>

<div class="collapse" id="source_189b5d0c5a2b0d4b3e50b20a0b7d0d33">
<div class="collapse" id="source_9803f42c58ad9b4642bd1fda33130587">

</div>
</div>
Expand Down Expand Up @@ -1478,7 +1478,7 @@ <h2>XML</h2>
<div class="row permaLink">
<div class="col-md-9">
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A100379</span> (<a href="">Version 4.8.0-alpha vom 19. Februar 2023</a>)
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A100379</span> (<a href="">Version 4.10.0-alpha vom 5. Februar 2024</a>)
<br />
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
</p>
Expand Down
6 changes: 3 additions & 3 deletions testing/expected-results/letters/A040162.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,9 @@ <h3 class="media-heading">

<span>Berlin (D), Staatsbibliothek zu Berlin – Preußischer Kulturbesitz, Musikabteilung (D-B)<br /><i>Signatur</i>: Weberiana Cl. V (Mappe IA), Abt. 2, Nr. 10</span>
<span>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_f770f8bea1e5e2e1cb8b5bb656f0bf20"></a>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_97874880afb446f261eea0a11221a04e"></a>
</span>
<div class="collapse apparatus-details" id="source_f770f8bea1e5e2e1cb8b5bb656f0bf20">
<div class="collapse apparatus-details" id="source_97874880afb446f261eea0a11221a04e">
<h4 class="media-heading">Quellenbeschreibung</h4>
<ul>
<li>1 Bl. (2 b. S.)</li>
Expand Down Expand Up @@ -518,7 +518,7 @@ <h2>XML</h2>
<div class="row permaLink">
<div class="col-md-9">
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040162</span> (<a href="">Version 4.8.0-alpha vom 19. Februar 2023</a>)
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040162</span> (<a href="">Version 4.10.0-alpha vom 5. Februar 2024</a>)
<br />
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
</p>
Expand Down
13 changes: 5 additions & 8 deletions testing/expected-results/letters/A040291.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@ <h2>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">





<div>

Expand Down Expand Up @@ -595,9 +592,9 @@ <h3 class="media-heading">

<span>New Haven (US), Yale University, Beinecke Rare Book and Manuscript Library (US-NHub)<br /><i>Signatur</i>: Frederick R. Koch Foundation</span>
<span>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_b450d086be2826ee6ab195bda19777eb"></a>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_a11ca9b0e784c33cebe283780068df1d"></a>
</span>
<div class="collapse apparatus-details" id="source_b450d086be2826ee6ab195bda19777eb">
<div class="collapse apparatus-details" id="source_a11ca9b0e784c33cebe283780068df1d">
<h4 class="media-heading">Quellenbeschreibung</h4>
<ul>
<li>1 DBl. (4 b. S. einschl. Adr.)</li>
Expand All @@ -621,7 +618,7 @@ <h4 class="media-heading">Dazugehörige Textwiedergaben</h4>

<span>Caecilia Bd.15 (1833), S.37–39</span>

<div class="collapse" id="source_b78c23fd06e661df728a8917acb22866">
<div class="collapse" id="source_82a9f9e9ecf8d495e59815196eb3e759">

</div>
</div>
Expand All @@ -631,7 +628,7 @@ <h4 class="media-heading">Dazugehörige Textwiedergaben</h4>

<span>Bollert/Lemke 1972, S.11</span>

<div class="collapse" id="source_6e6a926871d80a0709c6476f70353a17">
<div class="collapse" id="source_dbd506abecbf192ff4691c9d4ca5f6b2">

</div>
</div>
Expand Down Expand Up @@ -775,7 +772,7 @@ <h2>XML</h2>
<div class="row permaLink">
<div class="col-md-9">
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040291</span> (<a href="">Version 4.8.0-alpha vom 19. Februar 2023</a>)
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040291</span> (<a href="">Version 4.10.0-alpha vom 5. Februar 2024</a>)
<br />
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
</p>
Expand Down
11 changes: 4 additions & 7 deletions testing/expected-results/letters/A040304.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@ <h2>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">





<div>

Expand Down Expand Up @@ -771,9 +768,9 @@ <h3 class="media-heading">

<span>Wien (A), Gesellschaft der Musikfreunde in Wien, Bibliothek (A-Wgm)<br /><i>Signatur</i>: Weber an Gänsbacher 3</span>
<span>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_0dd5b43d64381c41f2ec30884997211f"></a>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_0b4f7ce387ec79be6cb06e35a4cf6609"></a>
</span>
<div class="collapse apparatus-details" id="source_0dd5b43d64381c41f2ec30884997211f">
<div class="collapse apparatus-details" id="source_0b4f7ce387ec79be6cb06e35a4cf6609">
<h4 class="media-heading">Quellenbeschreibung</h4>
<ul>
<li>1 DBl. (4 b. S. o. Adr.)</li>
Expand All @@ -790,7 +787,7 @@ <h4 class="media-heading">Dazugehörige Textwiedergaben</h4>

<span>Nohl 1867, S. 180–185</span>

<div class="collapse" id="source_97dc73fd3aa25aa5a02c811e55cb7df8">
<div class="collapse" id="source_f3b8a457603b135f08c1e71522421d63">

</div>
</div>
Expand Down Expand Up @@ -1092,7 +1089,7 @@ <h2>XML</h2>
<div class="row permaLink">
<div class="col-md-9">
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040304</span> (<a href="">Version 4.8.0-alpha vom 19. Februar 2023</a>)
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040304</span> (<a href="">Version 4.10.0-alpha vom 5. Februar 2024</a>)
<br />
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
</p>
Expand Down
11 changes: 4 additions & 7 deletions testing/expected-results/letters/A040603.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,6 @@ <h2>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">





<div>

Expand Down Expand Up @@ -1089,9 +1086,9 @@ <h3 class="media-heading">

<span>New Haven (US), Yale University, Beinecke Rare Book and Manuscript Library (US-NHub), Frederick R. Koch Foundation</span>
<span>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_a7bd370aacdd1d7b59f235f96bcbd856"></a>
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_31956b2e46b2703b313db89fdfe69da7"></a>
</span>
<div class="collapse apparatus-details" id="source_a7bd370aacdd1d7b59f235f96bcbd856">
<div class="collapse apparatus-details" id="source_31956b2e46b2703b313db89fdfe69da7">
<h4 class="media-heading">Quellenbeschreibung</h4>
<ul>
<li>1 DBl. (4 b. S.) u. 1 Bl. (6 b. S. o. Adr.)</li>
Expand All @@ -1111,7 +1108,7 @@ <h4 class="media-heading">Dazugehörige Textwiedergaben</h4>

<span>Bollert/Lemke 1972, S. 51–56</span>

<div class="collapse" id="source_509e99c60e981a590d38002e7253dd79">
<div class="collapse" id="source_08983d9eee132dd7b347447b71ccfea8">

</div>
</div>
Expand Down Expand Up @@ -1327,7 +1324,7 @@ <h2>XML</h2>
<div class="row permaLink">
<div class="col-md-9">
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040603</span> (<a href="">Version 4.8.0-alpha vom 19. Februar 2023</a>)
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span>https://weber-gesamtausgabe.de/exist/apps/WeGA-WebApp/A040603</span> (<a href="">Version 4.10.0-alpha vom 5. Februar 2024</a>)
<br />
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
</p>
Expand Down
Loading

0 comments on commit 6ada1c2

Please sign in to comment.