Commit 72d2961a authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'release/4.8.0'

parents 70cd21cc 185753b7
Pipeline #103419 passed with stages
in 14 minutes and 37 seconds
project.name=http://textgrid.de/exist/fontane-develop
project.version=4.7.0
project.version=4.8.0
project.abbrev=fontane
project.title=[Fontane] SADE-Project
project.processorversion=4.7.0
......
......@@ -14,10 +14,18 @@ place them in the alphanumeric order of the signatures
background: whitesmoke;
}
#A07 #s5v .quartercircle-upper-right {
width: 18px;
}
#A07 #s27r div.zone div.line span.mod.subst span.addWrapper {
position: relative;
top: -0.65cm;
}
#A07 #ssouter_back_cover .surface.teilabel.Signaturen-Klebchenfragment_Friedrich_Fontane.nested {
background-color: rgba(155,155,155,0.4);
line-height: 100% !important;
}
#A08 #s29r .line.brown_ink .add .caret_half-bow_pos-left {
margin-left: -0.1cm;
top: -0.1cm;
......@@ -359,6 +367,11 @@ left: -0.1cm;
#C08_7r_2 {
transform: scaleX(0.3) !important;
}
#C14 #s45r .retraceHover span:last-child::after {
content: "unentziffert"
}
#D01 #sinner_back_cover #sBeilage_1r.surface.teiadditional.Visitenkarte.nested {
display: none;
}
......@@ -425,6 +438,32 @@ left: -0.1cm;
left: initial !important;
}
#D09 #s51r .above.semicircle.right {
margin-left: 50px;
position: absolute;
}
#D09 #s51r .above.semicircle.right > span {
margin-left: -45px;
}
#E06 #s3r .seg.underline > .seg.underline {
border-bottom: 1px solid;
}
#E06 #s6rar .rend-pipe {
color: red;
}
#E06 #s16r .add .semicircle.right {
bottom: -8px;
}
#E06 #s16r .add .semicircle.right > * {
top: -19px;
}
#E06 #s62r .above.semicircle.right {
bottom: -10px;
}
#E06 #s62r .add .semicircle.right > * {
top: -25px;
}
/* older correction, unclear notebook relation
TODO: look in the git history for when they were added and put an identifier in
......
......@@ -294,7 +294,7 @@ span.metamark.teicaret.f {
/* rotation changed: https://projects.gwdg.de/issues/20803 */
.metamark.deletion {
background:
linear-gradient(45deg,
linear-gradient(to left bottom,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(47,79,79,1) 50%,
......@@ -302,7 +302,6 @@ span.metamark.teicaret.f {
display: inline-block;
}
.metamark.deletion.medium.blue_pencil {
background:
linear-gradient(to bottom left,
......@@ -316,6 +315,9 @@ span.metamark.teicaret.f {
.metamark.deletion.noBackground {
background: none;
}
.metamark.deletion.underline-style.semicircle {
background: none;
}
svg.deletion-points, svg.connect-points {
position:absolute;
......@@ -377,8 +379,8 @@ svg.deletion-points, svg.connect-points {
color: #6666FF;
}
.modmedium_pencil > .add > span {
color: darkslategrey;
.modmedium_pencil .add .blue_pencil.Fontane.Latf.standard {
color: darkslategray;
}
.handShiftnew {
......@@ -441,7 +443,7 @@ medium{
line-height: 1cm;
transform-origin: center center 0;
}
}
.hoverTop {
position: absolute;
top: -100%;
......@@ -511,6 +513,12 @@ medium{
font-style: normal !important;
font-family: Fontine;
}
.mod .mod .modHover.italic.hoverTop {
margin-top: 2px;
}
.mod .expan.italic {
margin-top: 2px;
}
.modSeq1.text-decoration.underline.modSeq2 {
/* only when a modSeq2 is available */
......@@ -625,7 +633,8 @@ svg {
.above + svg.quartercircle-upper-right {
position: absolute;
right: 0;
bottom: -11px;
bottom: 0;
/* edition.html?id=/xml/data/1zzdv.xml&page=14v */
}
.above + svg.quartercircle-upper-left {
position: absolute;
......@@ -717,7 +726,7 @@ svg {
border-width: medium 1px 1px;
position: relative !important;
}
.above.looped_arc {
.above.looped_arc, .below.looped_arc > * {
border-width: 0px 1px 1px 1px;
border-style: solid;
border-color: darkslategray;
......@@ -949,6 +958,20 @@ svg {
border-image-source: url('/public/img/underline-style:bracket_top.svg');
}
.seg.text-decoration.underline.underline-style.x::after {
display: inline-block;
position: absolute;
left: 0;
content: " ";
background: linear-gradient(to left bottom, transparent 50%, black 55%, transparent 45%), linear-gradient(to right bottom, transparent 50%, black 55%, transparent 45%);
width: 100%;
height: 7px;
bottom: -7px;
}
.seg.text-decoration.underline.underline-style.x {
border-bottom: 0;
}
.underline-medium_blue_pencil {
border-color: #42b4e6;
}
......@@ -958,6 +981,10 @@ svg {
.underline.underline-medium_blue_pencil {
text-decoration-color: #42b4e6;
}
.underline.underline-medium_red_pencil {
border-color: red !important;
}
.modSeq1.text-decoration.underline.underline-medium_blue_pencil.modSeq2.pencil {
text-decoration-color: #42b4e6;
border-color: darkslategrey;
......@@ -996,6 +1023,22 @@ svg {
.noLineThrough {
text-decoration: none !important;
}
.line-through-style.triple.brown_ink {
background: linear-gradient(
0deg,
transparent,
transparent calc(40% - 1px),
sienna,
transparent 40%,
transparent calc(60% - 1px),
sienna,
transparent 60%,
transparent calc(80% - 1px),
sienna,
transparent 80%);
text-decoration: none !important;
}
.line-through-style.triple.black_ink {
background:
linear-gradient(
......@@ -1011,6 +1054,7 @@ svg {
transparent 75%);
text-decoration: none;
}
.line-through-style.triple.violet_pencil {
background:
linear-gradient(
......@@ -1073,9 +1117,14 @@ svg {
}
.line-through.double, .seg.line-through .seg.line-through {
background-image: url('/public/img/line-through-style:double.svg');
background-repeat: repeat-x;
background-size: 100% 100%;
background-image: linear-gradient(
transparent,
transparent calc(60% - 1px),
black,
transparent 60%,
transparent calc(80% - 1px),
black,
transparent 80%);
text-decoration: none;
}
.seg.line-through .seg.line-through.brown_ink {
......@@ -1295,12 +1344,12 @@ svg {
}
.line-through-style.x, .line-through-style.x.line-through-medium_pencil {
background:
linear-gradient(45deg,
linear-gradient(to left bottom,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(47,79,79,1) 50%,
rgba(0,0,0,0) calc(50% + 1px)),
linear-gradient(135deg,
linear-gradient(to right bottom,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(47,79,79,1) 50%,
......@@ -1309,12 +1358,12 @@ svg {
.line-through-style.x.line-through-medium_blue_pencil {
background:
linear-gradient(45deg,
linear-gradient(to left bottom,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(66,180,230,1) 50%,
rgba(0,0,0,0) calc(50% + 1px)),
linear-gradient(135deg,
linear-gradient(to right bottom,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(66,180,230,1) 50%,
......@@ -1469,7 +1518,10 @@ svg {
content: '|';
}
.cancelRight::after {
content: '|';
content: "|";
position: relative;
margin-left: 100%;
top: -15px;
}
/* hash encoded within tei:del/@rend */
......@@ -1606,6 +1658,17 @@ svg {
.padding-right.d05cm {
padding-right: 0.5cm;
}
.zone.margin-top.d05cm.margin-left.minus-07cm {
top: 50% !important;
position: relative !important;
right: -0.7cm !important;
left: auto !important;
}
.zone.margin-left.minus-17cm.margin-top.d07cm {
top: 50% !important;
position: relative !important;
left: -1.7cm !important;
}
.border-right.dashed {
border-right-width: 1px;
border-right-style: dashed;
......@@ -1704,6 +1767,10 @@ svg {
.restore:hover .restoreHover {
display: block;
}
.del .restore .del .text-decoration.line-through {
/* zurückgenommene gültige durchsterichung */
text-decoration: line-through;
}
.gap.illegible:after {
content: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
display: inline-block;
......@@ -1747,6 +1814,13 @@ svg {
.gap.illegible.mm79:after { max-width: 79mm;}
.gap.illegible.mm9:after { max-width: 9mm;}
.gap.illegible.words1:after {
content: "x---x";
}
.italic .gap.illegible {
display: none;
}
/* characters */
/* no case */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment