Commit adcf614a authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'release/4.4.0'

parents f5b98e74 df6e762b
Pipeline #98171 passed with stages
in 12 minutes and 59 seconds
project.version=4.3.0
project.version=4.4.0
project.name=http://textgrid.de/exist/fontane-develop
project.abbrev=fontane
project.title=[Fontane] SADE-Project
......
......@@ -37,6 +37,10 @@
</target>
<target name="test" depends="xar">
<delete dir="${build.dir}">
<include name="eXist-db-*.tar.bz2"/>
<exclude name="eXist-db-${project.processorversion}.tar.bz2"/>
</delete>
<get src="https://bintray.com/existdb/releases/download_file?file_path=eXist-db-${project.processorversion}.tar.bz2" dest="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" skipexisting="true" />
<untar src="${build.dir}/eXist-db-${project.processorversion}.tar.bz2" dest="${test.dir}" compression="bzip2" />
......
......@@ -61,6 +61,13 @@ place them in the alphanumeric order of the signatures
#A19 #s53r div.zone div.line span:nth-child(3) span.addWrapper span.add.above {
left: -0.1cm;
}
#A20_50r_8 {
z-index: 1000;
}
#A20 #s42v span.mod.subst div.modHover.italic span:first-child {
display: none;
}
#A21 #s5r .line-through-style.single_oblique45deg {
background: linear-gradient(5deg,
rgba(0,0,0,0) 0%,
......@@ -188,18 +195,6 @@ left: -0.1cm;
#B11 #s26r div.zone:nth-child(8) {
left: -0.6cm !important;
}
#B12 #s14r > div:nth-child(1) > div:nth-child(8) {
margin-top: 6px;
}
#B13 #s32v > div:nth-child(3) > div:nth-child(4) > span.mod.subst > span.addWrapper {position: relative;}
#B13 #s32v > div:nth-child(3) > div:nth-child(4) > span.mod.subst > span.addWrapper > span {left: -1.2cm !important;}
#B13_2r_m {
position: relative;
display: inline;
}
#B11 #s14r > div:nth-child(2) > div.zone.text-decoration.line-through.line-through-style.single_oblique45deg.line-through-medium_brown_ink::after {
border-left-color: inherit;
border-left-style: solid;
......@@ -238,10 +233,21 @@ left: -0.1cm;
left: -130%;
}
#B11 #B11_49v_2.zone > div.zone.highlighted.border-left.double{
#B11_49v_2.zone > div.zone.highlighted.border-left.double{
border:none !important;
}
#B12 #s14r > div:nth-child(1) > div:nth-child(8) {
margin-top: 6px;
}
#B13 #s32v > div:nth-child(3) > div:nth-child(4) > span.mod.subst > span.addWrapper {position: relative;}
#B13 #s32v > div:nth-child(3) > div:nth-child(4) > span.mod.subst > span.addWrapper > span {left: -1.2cm !important;}
#B13_2r_m {
position: relative;
display: inline;
}
#B14 #s26v > .zone:nth-child(2) {
display: none;
}
......@@ -263,6 +269,16 @@ left: -0.1cm;
left: 0.1cm;
}
#C02 #s9r .add {
z-index: 1000;
}
#C02_14r_1 .line:nth-child(14) .modHover span:first-child::before {
content: "aus";
}
#C02_14r_1 .line:nth-child(15) .modHover span:first-child::before {
content: "aus";
}
#C03 #s73v div.zone:nth-child(2) {
z-index:1000;
}
......@@ -286,6 +302,13 @@ left: -0.1cm;
background-color: ghostwhite;
}
#D02_15r_a.hi span.seg.text-decoration.underline span.mod.subst.addSesquipedalian div.modHover.italic.hoverTop span:first-child::before {
content: "ge-";
}
#D02 #s26r .caret_bow_pos-left {
left: -0.6cm !important;
}
#D08 #s68r.surface div.zone.illustration.figure div.zone:nth-child(14) div.line:nth-child(3) {
font-size: 0.85em;
}
......
......@@ -750,7 +750,7 @@ svg {
.underline.double, .seg.underline > .seg.underline {
border-bottom: 3px double;
}
.underline.wavy {
.underline.wavy, .Abgrenzungslinie.wavy {
border-image-repeat: repeat repeat;
border-image-slice: 12 12 12 12;
border-image-source: url('/public/img/border.png');
......@@ -925,6 +925,9 @@ svg {
border-color: sienna;
border-bottom-width: 1px;
}
.underline-medium_pencil {
border-color: darkslategrey;
}
.underline-weight.bold {
border-bottom-width: 3px;
}
......@@ -1389,7 +1392,14 @@ svg {
-o-border-image: url('/public/img/border-wavy.png') 27 27 26 repeat;
border-image: url('/public/img/border-wavy.png') 27 27 26 fill repeat;
}
.border-bottom-style.wavy{
border-style: solid;
border-width: 0 0 7px 0;
-moz-border-image: url('/public/img/border-wavy.png') 27 27 26 repeat;
-webkit-border-image: url('/public/img/border-wavy.png') 27 27 26 repeat;
-o-border-image: url('/public/img/border-wavy.png') 27 27 26 repeat;
border-image: url('/public/img/border-wavy.png') 27 27 26 fill repeat;
}
.border-left-style.wavy {
border-left-style: solid;
border-width: 0 0 0 7px;
......@@ -1662,7 +1672,6 @@ svg {
/* Absatzlinie */
hr.Absatzlinie, hr.Summenstrich, hr.Differenzstrich {
border-color: inherit;
color: black;
margin: 0;
padding: 10px;
position: relative;
......
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