Skip to content
GitLab
Commit 05cf7385 authored by mrodzis's avatar mrodzis 💪
Browse files

Merge branch 'develop' into feature/edited-text-misc

parents bcc9a013 783ea4ff
Pipeline #103539 passed with stages
in 15 minutes and 50 seconds
Hide whitespace changes
Inline Side-by-side
build.properties
View file @ 05cf7385
project.name=http://textgrid.de/exist/fontane-develop
project.version=4.6.0
project.version=4.8.0
project.abbrev=fontane
project.title=[Fontane] SADE-Project
project.processorversion=4.7.0
......
sade-projects/textgrid/templates/tmpl1/css/specific.css
View file @ 05cf7385
......@@ -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;
}
......@@ -408,6 +421,10 @@ left: -0.1cm;
background-image: url('public/img/caret_umschlungener-bogen.svg');
}
#D07 #s53r .retraceHover::before {
content: "unter-"
}
#D08 #s68r.surface div.zone.illustration.figure div.zone:nth-child(14) div.line:nth-child(3) {
font-size: 0.85em;
}
......@@ -425,6 +442,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
......
sade-projects/textgrid/templates/tmpl1/css/transcription.css
View file @ 05cf7385
......@@ -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%;
......@@ -487,6 +489,11 @@ medium{
line-height: 100%;
font-size: medium;
}
.zone > .mod {
display: none;
}
.mod .modHover {display:none;}
.mod:hover .modHover {
......@@ -504,6 +511,13 @@ medium{
}
.modHover.italic > span {
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 {
......@@ -619,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;
......@@ -711,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;
......@@ -773,6 +788,10 @@ svg {
.underline.double, .seg.underline > .seg.underline {
border-bottom: 3px double;
}
.underline .underline .underline {
border-bottom: 1px solid darkslategrey;
padding-bottom: 2px;
}
.underline.wavy, .Abgrenzungslinie.wavy {
border-image-repeat: repeat repeat;
border-image-slice: 12 12 12 12;
......@@ -922,6 +941,11 @@ svg {
border-image: url('https://fontane-nb.dariah.eu/public/img/underline-style:zigzag.svg') 0 0 40 0 / 0 0px 10px 0px / 0px 0px 6px 0px;
}
.zigzag_retrace {
border-bottom: 2px solid darkslategrey;
padding: 7px;
}
.underline.underline-style.half-s-shapedupper-left > .underline.underline-style.half-s-shapedupper-left {
border-image-outset: 5px 0px;
}
......@@ -934,12 +958,33 @@ 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;
}
.mod.modunderline-medium_red_pencil {
text-decoration-color: red !important;
}
.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;
......@@ -978,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(
......@@ -993,6 +1054,7 @@ svg {
transparent 75%);
text-decoration: none;
}
.line-through-style.triple.violet_pencil {
background:
linear-gradient(
......@@ -1055,7 +1117,18 @@ svg {
}
.line-through.double, .seg.line-through .seg.line-through {
background-image: url('/public/img/line-through-style:double.svg');
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 {
background-image: url('/public/img/line-through-style:double-brown_ink.svg');
background-repeat: repeat-x;
background-size: 100% 100%;
text-decoration: none;
......@@ -1141,7 +1214,21 @@ svg {
transparent 75%);
text-decoration: none;
}
.line-through.triple_oblique45deg.brown_ink {
background:
linear-gradient(45deg,
transparent,
transparent calc(35% - 2px),
sienna,
transparent 35%,
transparent calc(55% - 2px),
sienna,
transparent 55%,
transparent calc(75% - 2px),
sienna,
transparent 75%);
text-decoration: none;
}
.line-through-style.double_oblique45deg::before {
border-top-color: inherit;
border-top-style: solid;
......@@ -1257,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%,
......@@ -1271,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%,
......@@ -1431,7 +1518,10 @@ svg {
content: '|';
}
.cancelRight::after {
content: '|';
content: "|";
position: relative;
margin-left: 100%;
top: -15px;
}
/* hash encoded within tei:del/@rend */
......@@ -1568,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;
......@@ -1661,29 +1762,65 @@ svg {
.del.instant {display:inline-block;}
.restore {
text-decoration: underline dotted;
border-bottom: 1px dotted black;
}
.restore:hover .restoreHover {
display: block;
}
.gap.illegible.mm4:after {
content: 'xxxxxx';
max-width: 4mm;
.del .restore .del .text-decoration.line-through {
/* zurückgenommene gültige durchsterichung */
text-decoration: line-through;
}
.gap.illegible:after {
content: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
display: inline-block;
/* position: absolute; */
overflow:hidden;
height:100%;
font-style: italic;
}
.gap.illegible.mm19::after {
content: 'xxxxxxxx';
display: table-cell;
font-style: italic;
max-width: 19mm;
overflow: hidden;
.gap.illegible.mm1:after { max-width: 1mm;}
.gap.illegible.mm10:after { max-width: 10mm;}
.gap.illegible.mm11:after { max-width: 11mm;}
.gap.illegible.mm12:after { max-width: 12mm;}
.gap.illegible.mm13:after { max-width: 13mm;}
.gap.illegible.mm14:after { max-width: 14mm;}
.gap.illegible.mm16:after { max-width: 16mm;}
.gap.illegible.mm17:after { max-width: 17mm;}
.gap.illegible.mm18:after { max-width: 18mm;}
.gap.illegible.mm19:after { max-width: 19mm;}
.gap.illegible.mm2:after { max-width: 2mm;}
.gap.illegible.mm20:after { max-width: 20mm;}
.gap.illegible.mm21:after { max-width: 21mm;}
.gap.illegible.mm22:after { max-width: 22mm;}
.gap.illegible.mm24:after { max-width: 24mm;}
.gap.illegible.mm25:after { max-width: 25mm;}
.gap.illegible.mm26:after { max-width: 26mm;}
.gap.illegible.mm28:after { max-width: 28mm;}
.gap.illegible.mm29:after { max-width: 29mm;}
.gap.illegible.mm3:after { max-width: 3mm;}
.gap.illegible.mm35:after { max-width: 35mm;}
.gap.illegible.mm38:after { max-width: 38mm;}
.gap.illegible.mm4:after { max-width: 4mm;}
.gap.illegible.mm40:after { max-width: 40mm;}
.gap.illegible.mm41:after { max-width: 41mm;}
.gap.illegible.mm42:after { max-width: 42mm;}
.gap.illegible.mm45:after { max-width: 45mm;}
.gap.illegible.mm5:after { max-width: 5mm;}
.gap.illegible.mm50:after { max-width: 50mm;}
.gap.illegible.mm6:after { max-width: 6mm;}
.gap.illegible.mm61:after { max-width: 61mm;}
.gap.illegible.mm7:after { max-width: 7mm;}
.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 */
......@@ -1815,6 +1952,20 @@ hr.Schlusslinie.slightly_wavy.brown_ink {
border-top: 0 none;
border-bottom-width:3px;
}
hr.Schlusslinie.slightly_wavy.black_ink {
border-image-repeat: repeat repeat;
border-image-slice: 12 12 12 12;
border-image-source: url('/public/img/border-slightly_wavy.png');
border-left: 0 none;
border-right: 0 none;
border-style: none none solid;
border-top: 0 none;
border-bottom-width:3px;
}
hr.Seitenzahlabgrenzungslinie {
margin: 0;
border: 0.5px solid black;
}
.hrHover {
display: none;
......
Supports Markdown
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