anki-geo · ohare93 · Jul 29, 2019 · Aug 4, 2019 · Aug 4, 2019 · Aug 12, 2019
diff --git a/src/data.csv b/src/data.csv
@@ -54,7 +54,7 @@ fGeuUP`?$F,Ukraine,Ukraine,,,Kiev,Kiew,,,,,"<img src=""ug-flag-ukraine.svg"" />"
 kW{?TY+Qy@,"Vatican City",Vatikanstadt,,,"Vatican City",Vatikanstadt,,,,,"<img src=""ug-flag-vatican_city.svg"" />",,,"<img src=""ug-map-vatican_city.png"" />","UG::Europe UG::Sovereign_State"
 aoo{E3^%kC,Armenia,Armenien,,,Yerevan,Jerewan,,,,,"<img src=""ug-flag-armenia.svg"" />",,,"<img src=""ug-map-armenia.png"" />","UG::Europe UG::Sovereign_State"
 iWJ];?5|N/,Cyprus,"Republik Zypern",,,Nicosia,Nikosia,,,,,"<img src=""ug-flag-cyprus.svg"" />",,,"<img src=""ug-map-cyprus.png"" />","UG::Asia UG::European_Union UG::Middle_East UG::Mediterranean UG::Sovereign_State"
-gMdH0b17|`,Kazakhstan,Kasachstan,,,Nur-Sultan,Nursultan,"Formerly known as Astana until March 2019.","Auch Nur-Sultan. Früher Astana.",,,"<img src=""ug-flag-kazakhstan.svg"" />",,,"<img src=""ug-map-kazakhstan.png"" />",UG::Asia UG::Sovereign_State
+gMdH0b17|`,Kazakhstan,Kasachstan,,,Nur-Sultan,Nursultan,"Formerly known as Astana until March 2019.","Auch Nur-Sultan. Früher Astana.",,,"<img src=""ug-flag-kazakhstan.svg"" />",,,"<img src=""ug-map-kazakhstan.png"" />","UG::Asia UG::Sovereign_State"
 hmmcO+mVAb,Egypt,Ägypten,,,Cairo,Kairo,,,,,"<img src=""ug-flag-egypt.svg"" />","Iraq (text instead of emblem), Syria (two stars instead of emblem) and Yemen (no emblem)","Irak (Text anstatt Emblem), Syrien (zwei Sterne anstelle Emblem) und Jemen (kein Emblem)","<img src=""ug-map-egypt.png"" />","UG::Africa UG::Middle_East UG::Mediterranean UG::Sovereign_State"
 ~PH%PYbY:P,Algeria,Algerien,,,Algiers,Algier,,,,,"<img src=""ug-flag-algeria.svg"" />",,,"<img src=""ug-map-algeria.png"" />","UG::Africa UG::Mediterranean UG::Sovereign_State"
 mZ-*)8}IxB,Angola,Angola,,,Luanda,Luanda,,,,,"<img src=""ug-flag-angola.svg"" />",,,"<img src=""ug-map-angola.png"" />","UG::Africa UG::Sovereign_State"

diff --git a/src/style.css b/src/style.css
@@ -7,25 +7,44 @@
   text-align: center;
 }
 
-.type {
-  color: #333;
-  font-size: 70%;
+.country {
+  color: #BB0000;
+  font-size: 90%;
+  font-weight: bold;
+  margin-bottom: .25em;
+  text-transform: uppercase;
+}
+
+.nightMode .country {
+  color: #BB0000;
+}
+
+.capital {
+  color: #0000BB;
+  font-size: 60%;
   font-weight: bold;
   margin-bottom: .25em;
   text-transform: uppercase;
 }
 
-.type--top {
-  margin-top: 1em;
+.nightMode .capital {
+  color: #0000BB;
 }
 
 .value {
   font-size: 150%;
 }
 
-.type + .flag,
-.type + .map {
-  margin-top: .5em
+.mnemonic {
+  font-size: 50%;
+}
+
+.nightMode .mnemonic {
+ color: yellow;
+}
+
+.italic {
+  font-style: italic;
 }
 
 .flag img {
@@ -44,6 +63,14 @@
   margin-top: -.375em;
 }
 
-#answer {
-  margin: 1.5em 0;
+.nightMode .info {
+ color: yellow;
+}
+
+.hint{
+  font-size: 30%
+}
+
+.map {
+  margin-top: .5em
 }
diff --git a/src/templates/Capital - Country.html b/src/templates/Capital - Country.html
@@ -1,15 +1,24 @@
 {{#Capital}}
-  <div class="type type--top">Capital</div>
+  <div class="country">Country</div>
+  <div class="value">???</div>
+
+  <br><hr><br>
+
+  <div class="capital">Capital</div>
   <div class="value">{{Capital}}</div>
-  {{#Capital hint}}<div class="info">Hint: {{Capital hint}}</div>{{/Capital hint}}
+  {{#Capital hint}}<div class="info">{{Capital hint}}</div>{{/Capital hint}}
 {{/Capital}}
 
 --
 
-{{FrontSide}}
-
-<hr id=answer>
-
-<div class="type">Country</div>
+<div class="country">Country</div>
 <div class="value">{{Country}}</div>
 {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
+
+<br><hr><br>
+
+<div class="capital">Capital</div>
+<div class="value">{{Capital}}</div>
+{{#Capital hint}}<div class="info">{{Capital hint}}</div>{{/Capital hint}}
+
+{{#Capital info}}<div class="info">{{Capital info}}</div>{{/Capital info}}
diff --git a/src/templates/Country - Capital EXT.html b/src/templates/Country - Capital EXT.html
@@ -1,16 +1,23 @@
 {{#Capital}}
-  <div class="type type--top">Country</div>
+  <div class="country">Country</div>
   <div class="value">{{Country}}</div>
-  {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
 
-  <hr id=answer>
+  <br><hr id=answer><br>
 
-  <div class="type">Capital</div>
+  <div class="capital">Capital</div>
+  <div class="value">???</div>
 {{/Capital}}
 
 --
 
-{{FrontSide}}
+<div class="country">Country</div>
+<div class="value">{{Country}}</div>
+{{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
 
+<br><hr id=answer><br>
+
+<div class="capital">Capital</div>
 <div class="value">{{Capital}}</div>
+{{#Capital hint}}<div class="info">{{Capital hint}}</div>{{/Capital hint}}
+
 {{#Capital info}}<div class="info">{{Capital info}}</div>{{/Capital info}}
diff --git a/src/templates/Country - Capital.html b/src/templates/Country - Capital.html
@@ -1,15 +1,23 @@
 {{#Capital}}
-  <div class="type type--top">Country</div>
+  <div class="country">Country</div>
   <div class="value">{{Country}}</div>
-  {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
+
+  <br><hr id=answer><br>
+
+  <div class="capital">Capital</div>
+  <div class="value">???</div>
 {{/Capital}}
 
 --
 
-{{FrontSide}}
+<div class="country">Country</div>
+<div class="value">{{Country}}</div>
+{{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
 
-<hr id=answer>
+<br><hr id=answer><br>
 
-<div class="type">Capital</div>
+<div class="capital">Capital</div>
 <div class="value">{{Capital}}</div>
+{{#Capital hint}}<div class="info">{{Capital hint}}</div>{{/Capital hint}}
+
 {{#Capital info}}<div class="info">{{Capital info}}</div>{{/Capital info}}
diff --git a/src/templates/Country - Flag EXT.html b/src/templates/Country - Flag EXT.html
@@ -1,16 +1,21 @@
 {{#Flag}}
-  <div class="type type--top">Country</div>
-  <div class="value">{{Country}}</div>
-  {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
+  <div class="capital">Flag</div>
+  <div class="value">???</div>
 
-  <hr id=answer>
+  <br><hr><br>
 
-  <div class="type">Flag</div>
+  <div class="country">Country</div>
+  <div class="value">{{Country}}</div>
 {{/Flag}}
 
 --
 
-{{FrontSide}}
-
+<div class="capital">Flag</div>
 <div class="flag">{{Flag}}</div>
 {{#Flag similarity}}<div class="info">Flag similar to {{Flag similarity}}.</div>{{/Flag similarity}}
+
+<br><hr><br>
+
+<div class="country">Country</div>
+<div class="value">{{Country}}</div>
+{{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
diff --git a/src/templates/Country - Map EXT.html b/src/templates/Country - Map EXT.html
@@ -1,14 +1,20 @@
 {{#Map}}
-  <div class="value">{{Country}}</div>
-  {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
+  <div class="capital">Location</div>
+  <div class="value">???</div>
 
-  <hr id=answer>
+  <br><hr><br>
 
-  <div class="type">Location</div>
+  <div class="country">Country</div>
+  <div class="value">{{Country}}</div>
 {{/Map}}
 
 --
 
-{{FrontSide}}
-
+<div class="capital">Location</div>
 <div class="map">{{Map}}</div>
+
+<br><hr><br>
+
+<div class="country">Country</div>
+<div class="value">{{Country}}</div>
+{{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
diff --git a/src/templates/Flag - Country.html b/src/templates/Flag - Country.html
@@ -1,13 +1,21 @@
 {{#Flag}}
+  <div class="capital">Flag</div>
   <div class="flag">{{Flag}}</div>
+
+  <br><hr id=answer><br>
+
+  <div class="country">Country</div>
+  <div class="value">???</div>
 {{/Flag}}
 
 --
 
-{{FrontSide}}
+<div class="capital">Flag</div>
+<div class="flag">{{Flag}}</div>
+{{#Flag similarity}}<div class="info">Flag similar to {{Flag similarity}}.</div>{{/Flag similarity}}
 
-<hr id=answer>
+<br><hr id=answer><br>
 
+<div class="country">Country</div>
 <div class="value">{{Country}}</div>
 {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}
-{{#Flag similarity}}<div class="info">Flag similar to {{Flag similarity}}.</div>{{/Flag similarity}}
diff --git a/src/templates/Map - Country.html b/src/templates/Map - Country.html
@@ -1,12 +1,20 @@
 {{#Map}}
+  <div class="capital">Location</div>
   <div class="map">{{Map}}</div>
+
+  <br><hr id=answer><br>
+
+  <div class="country">Country</div>
+  <div class="value">???</div>
 {{/Map}}
 
 --
 
-{{FrontSide}}
+<div class="capital">Location</div>
+<div class="map">{{Map}}</div>
 
-<hr id=answer>
+<br><hr id=answer><br>
 
+<div class="country">Country</div>
 <div class="value">{{Country}}</div>
 {{#Country info}}<div class="info">{{Country info}}</div>{{/Country info}}