Skip to content

Commit 6ada1c2

Browse files
peterstadlerpeterstadler
authored
Merge pull request #457 from Edirom/improve-figures
Improve figures
2 parents 1e6c575 + fcec658 commit 6ada1c2

40 files changed

+249
-195
lines changed

‎resources/sass/base/_helpers.scss

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,6 @@
3737
background-color: $gray-dark;
3838
}
3939

40-
.float-left img {
41-
float:left;
42-
margin: 0px 2em 1em 0px;
43-
padding: .5em 1em;
44-
max-width: 100%;
45-
}
46-
47-
.float-right img {
48-
float:right;
49-
margin: 0px 0px 1em 2em;
50-
padding: .5em 1em;
51-
max-width: 100%;
52-
}
53-
5440
.inline {
5541
display:inline !important;
5642
margin: 0px 1em;

‎resources/sass/components/_text.scss

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,43 @@ div.table-wrapper {
5151
margin: $line-height-computed auto;
5252
}
5353

54+
figure {
55+
&.align-horizontally {
56+
text-align:center;
57+
}
58+
&.float-left,
59+
&.float-right {
60+
max-width: 50%;
61+
img {
62+
padding: .5em 1em;
63+
max-width: 100%;
64+
}
65+
}
66+
}
67+
68+
@include media-breakpoint-down(md) {
69+
figure {
70+
&.float-left,
71+
&.float-right {
72+
text-align:center;
73+
max-width: 100%;
74+
width: 100%;
75+
}
76+
}
77+
}
78+
79+
/* caption text below images */
80+
figcaption {
81+
font-style: italic;
82+
text-align: center;
83+
font-size: smaller;
84+
margin: auto;
85+
max-width:75%;
86+
.tei_hi_italic, .tei_hi_latintype {
87+
font-style:normal;
88+
}
89+
}
90+
5491
/*
5592
* Animated highlighting, used e.g. for historic footnotes (see https://github.com/Edirom/WeGA-WebApp/issues/226)
5693
*/
@@ -81,13 +118,14 @@ div.table-wrapper {
81118
padding-left:2em;
82119
}
83120

84-
.tei_notatedMusic {
121+
/* NB: notatedMusic/@rend="maxSize" are converted to figure elements */
122+
span.tei_notatedMusic {
85123
display:block;
86124
margin: 1ex auto;
87125
width: 95%;
88126
text-align:center;
89127
}
90-
.tei_notatedMusic img {
128+
span.tei_notatedMusic img {
91129
margin: 0px;
92130
max-width:100%;
93131
height: auto;

‎testing/expected-results/documents/A100379.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,9 +1315,9 @@ <h3 class="media-heading">
13151315

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

13221322

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

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

1333-
<div class="collapse" id="source_189b5d0c5a2b0d4b3e50b20a0b7d0d33">
1333+
<div class="collapse" id="source_9803f42c58ad9b4642bd1fda33130587">
13341334

13351335
</div>
13361336
</div>
@@ -1478,7 +1478,7 @@ <h2>XML</h2>
14781478
<div class="row permaLink">
14791479
<div class="col-md-9">
14801480
<h4>Empfohlene Zitierweise</h4>
1481-
<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>)
1481+
<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>)
14821482
<br />
14831483
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
14841484
</p>

‎testing/expected-results/letters/A040162.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,9 @@ <h3 class="media-heading">
445445

446446
<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>
447447
<span>
448-
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_f770f8bea1e5e2e1cb8b5bb656f0bf20"></a>
448+
<a data-toggle="collapse" aria-expanded="false" title="Details" class="collapseMarker collapsed" role="button" href="#source_97874880afb446f261eea0a11221a04e"></a>
449449
</span>
450-
<div class="collapse apparatus-details" id="source_f770f8bea1e5e2e1cb8b5bb656f0bf20">
450+
<div class="collapse apparatus-details" id="source_97874880afb446f261eea0a11221a04e">
451451
<h4 class="media-heading">Quellenbeschreibung</h4>
452452
<ul>
453453
<li>1 Bl. (2 b. S.)</li>
@@ -518,7 +518,7 @@ <h2>XML</h2>
518518
<div class="row permaLink">
519519
<div class="col-md-9">
520520
<h4>Empfohlene Zitierweise</h4>
521-
<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>)
521+
<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>)
522522
<br />
523523
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
524524
</p>

‎testing/expected-results/letters/A040291.html

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@ <h2>
358358
</h2>
359359
<div id="kontext" class="panel-collapse collapse borderBox">
360360

361-
362-
363-
364361

365362
<div>
366363

@@ -595,9 +592,9 @@ <h3 class="media-heading">
595592

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

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

624-
<div class="collapse" id="source_b78c23fd06e661df728a8917acb22866">
621+
<div class="collapse" id="source_82a9f9e9ecf8d495e59815196eb3e759">
625622

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

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

634-
<div class="collapse" id="source_6e6a926871d80a0709c6476f70353a17">
631+
<div class="collapse" id="source_dbd506abecbf192ff4691c9d4ca5f6b2">
635632

636633
</div>
637634
</div>
@@ -775,7 +772,7 @@ <h2>XML</h2>
775772
<div class="row permaLink">
776773
<div class="col-md-9">
777774
<h4>Empfohlene Zitierweise</h4>
778-
<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>)
775+
<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>)
779776
<br />
780777
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
781778
</p>

‎testing/expected-results/letters/A040304.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@ <h2>
358358
</h2>
359359
<div id="kontext" class="panel-collapse collapse borderBox">
360360

361-
362-
363-
364361

365362
<div>
366363

@@ -771,9 +768,9 @@ <h3 class="media-heading">
771768

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

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

793-
<div class="collapse" id="source_97dc73fd3aa25aa5a02c811e55cb7df8">
790+
<div class="collapse" id="source_f3b8a457603b135f08c1e71522421d63">
794791

795792
</div>
796793
</div>
@@ -1092,7 +1089,7 @@ <h2>XML</h2>
10921089
<div class="row permaLink">
10931090
<div class="col-md-9">
10941091
<h4>Empfohlene Zitierweise</h4>
1095-
<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>)
1092+
<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>)
10961093
<br />
10971094
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
10981095
</p>

‎testing/expected-results/letters/A040603.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,6 @@ <h2>
357357
</h2>
358358
<div id="kontext" class="panel-collapse collapse borderBox">
359359

360-
361-
362-
363360

364361
<div>
365362

@@ -1089,9 +1086,9 @@ <h3 class="media-heading">
10891086

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

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

1114-
<div class="collapse" id="source_509e99c60e981a590d38002e7253dd79">
1111+
<div class="collapse" id="source_08983d9eee132dd7b347447b71ccfea8">
11151112

11161113
</div>
11171114
</div>
@@ -1327,7 +1324,7 @@ <h2>XML</h2>
13271324
<div class="row permaLink">
13281325
<div class="col-md-9">
13291326
<h4>Empfohlene Zitierweise</h4>
1330-
<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>)
1327+
<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>)
13311328
<br />
13321329
<span>Letzte Änderung dieses Dokuments am %1 durch %2</span>
13331330
</p>

0 commit comments

Comments
 (0)