Sync with original branch phoible#2

conventions/index.html

@@ -16,11 +16,7 @@ <h1 class="title">PHOIBLE notational conventions</h1>
 <section id="similar-looking-glyphs">
 <h2>Similar-looking glyphs</h2>
 <p>There are a number of IPA symbols that resemble ordinary keyboard glyphs. In all cases the data in PHOIBLE use the codepoints for the official glyphs. The most common of these are summarized here:</p>
-<<<<<<< HEAD
-<table class="table table-bordered order-column compact stripe datatable no-footer table-nonfluid">
-=======
 <table>
->>>>>>> c734df92ea15fd150ee2812c50a20143cb5e5a8e
 <colgroup>
 <col style="width: 37%" />
 <col style="width: 46%" />
@@ -45,11 +41,7 @@ <h2>Similar-looking glyphs</h2>
 <td><p><span class="ipa">ǀ</span> <span class="codept">01C0 LATIN LETTER DENTAL CLICK</span></p></td>
 <td><p>dental click</p></td>
 </tr>
-<<<<<<< HEAD
-<tr><td><p><span class="ipa">‘</span> <span class="codept">0027 APOSTROPHE</span></p></td>
-=======
 <tr><td><p><span class="ipa">'</span> <span class="codept">0027 APOSTROPHE</span></p></td>
->>>>>>> c734df92ea15fd150ee2812c50a20143cb5e5a8e
 <td><p><span class="ipa">ʼ</span> <span class="codept">02BC MODIFIER LETTER APOSTROPHE</span></p></td>
 <td><p>ejective</p></td>
 </tr>
@@ -90,11 +82,7 @@ <h3>Glottalization</h3>
 </section>
 <section id="summary-table-of-phoible-symbols-not-in-the-ipa">
 <h3>Summary table of PHOIBLE symbols not in the IPA</h3>
-<<<<<<< HEAD
-<table class="table table-bordered order-column compact stripe datatable no-footer table-nonfluid">
-=======
 <table>
->>>>>>> c734df92ea15fd150ee2812c50a20143cb5e5a8e
 <colgroup>
 <col style="width: 11%" />
 <col style="width: 17%" />
@@ -234,11 +222,7 @@ <h4>Hasselt dialect</h4>
 <h4>Maastricht dialect</h4>
 <p>Accent 1: no underlying tone. Accent 2: high tone. Gussenhoven 1999, p.162 (emphasis added):</p>
 <blockquote>
-<<<<<<< HEAD
-<p>… the fundamental frequency of syllables with Accent 2 differs from those with Accent 1. In view of its effect in utterances with Accent 2 as compared with equivalent utterances with Accent 1, <strong>it is reasonable to assume that Accent 2 is a H-tone</strong> occurring in or immediately after the stressed syllable.</p>
-=======
 <p>... the fundamental frequency of syllables with Accent 2 differs from those with Accent 1. In view of its effect in utterances with Accent 2 as compared with equivalent utterances with Accent 1, <strong>it is reasonable to assume that Accent 2 is a H-tone</strong> occurring in or immediately after the stressed syllable.</p>
->>>>>>> c734df92ea15fd150ee2812c50a20143cb5e5a8e
 </blockquote>
 </section>
 </section>

css/conventions.css

@@ -1,19 +1,10 @@
 /* IPA glyphs and diacritics */
 .ipa, .dia {
     font-size: larger;
-<<<<<<< HEAD
-    font-family: CharisSILW, sans-serif;
-    background-color: #e0e0e0;
-    padding: 0.1rem 0.2rem;
-    border-radius: 0.2rem;
-    /* To fix glyphs overlapping*/
-    line-height: normal;
-=======
     font-family: "charis";
     background-color: #e0e0e0;
     padding: 0.1rem 0.2rem;
     border-radius: 0.2rem;
->>>>>>> c734df92ea15fd150ee2812c50a20143cb5e5a8e
 }
 
 .dia {