style changes, sound comparisons for 0, "lon" in 6

pages/tokipona/0.md

@@ -10,13 +10,26 @@ These are: a,e,i,j,k,l,m,n,o,p,s,t,u,w.
 You might have noticed that all these letters are lowercase. This is because all
 toki pona words are spelled in lowercase, even at the start of sentences.
 
-The consonants use the same sounds as those in English, with the exception of
+The consonants (j,k,l,m,n,p,s,t,w) use the same sounds as those in English, with
-"j", which instead sounds like the English "y".
+the exception of "j", which instead sounds like the English "y".
 
-The vowels are a bit more complicated (or more simple, depending on your view).
+The vowels (a,e,i,o,u) are a bit more complicated to explain (but simpler to
-Unlike English, every vowel uses the same sound in all words. If you know how
+pronounce). Unlike English, every vowel uses the same sound in all words. If you
-to pronounce the vowel sounds in Spanish, Japanese or Esperanto, then you can
+know how to pronounce the vowel sounds in Spanish, Japanese or Esperanto, then
-pronounce them the same way in toki pona.
+you can pronounce them the same way in toki pona.
+
+For examples of English words with corresponding pronunciations:
+
+* **a** sounds like the "a" in the word "far" or (in some dialects of English) 
+  the "u" in "up" or the "a" in "bath".
+
+* **e** sounds like the "e" in the word "bet".
+
+* **i** sounds like the "i" in the word "bit" or "ee" in "wee".
+
+* **o** sounds like the "o" in the word "or". 
+
+* **u** sounds like the "oo" in "oops" or "moon".
 
 > %info%
 > The "International Phonetic Alphabet" (IPA) is a common way to write
@@ -27,24 +40,11 @@ pronounce them the same way in toki pona.
 > /ˈlæŋɡwɪd͡ʒ/, but in toki pona, every single letter's pronunciation _is_ its
 > IPA symbol! So "toki pona" is pronounced /toki pona/.
 
-For examples of English words with corresponding pronunciations:
-
-* **a** sounds like the "u" in the word "up" or (in some variants of English)
-  the "a" in "bath".
-
-* **e** sounds like the "e" in the word "bet".
-
-* **i** sounds like the "i" in the word "win".
-
-* **o** sounds like the "o" in the word "long".
-
-* **u** sounds like the "oo" in "oops" or "moon".
-
 Since there are so few sounds, the way they can be pronounced can be very
 flexible. For example, some might substitute the sounds "p,t,k" with "b,d,g".
 Such a shift would cause a lot of ambiguity or confusion in other languages, but
-toki pona's sounds were chosen to be easy to distinguish, regardless of one's
+toki pona's sounds were chosen to be common to many languages and easy to
-native tongue.
+distinguish.
 
 All toki pona words are pronounced with stress on their first syllable.
 

pages/tokipona/6.md

@@ -62,11 +62,11 @@ regular words:
 
 > tomo tawa mi li pona. -- My car ("moving house/structure") is good.
 
-> mi tawa lon tomo moku. -- I am going to the restaurant ("house of food").
+> mi tawa tomo moku. -- I am going to the restaurant ("house of food").
 
 The word "tawa" can also express perspective.
 
-> sina li pona tawa mi. -- I like you. ("You are good for me.")
+> sina pona tawa mi. -- I like you. ("You are good for me.")
 
 > %warning%
 > Since "tawa" can be both an adjective and a preposition, certain phrases can

pages/tokipona/ru_0.md

@@ -41,4 +41,15 @@
 
 Все слова в токи пона произносятся с ударением на первый слог.
 
+Вот несколько слов токи пона, которые звучат, как русские слова:
+
+| слово     | звучит как        |
+|-----------|-------------------|
+| jaki      | яки               |
+| jelo      | ело               |
+| kon       | кон               |
+| lupa      | лупа              |
+| meli      | мели              |
+| pali      | пали              |
+
 [Следующая страница](ru_1.html) [Заглавная страница](ru_index.html)

static/style.css.h

@@ -1,17 +1,27 @@
-#define C_WHITE #eeeeec
+#define C_PAGEBG #9a93b7
-#define C_GRAY1 #d3d7cf
+#define C_HEADERBG #221f31
-#define C_GRAY2 #babdb6
+#define C_BODYBG #fefefe
-#define C_GRAY3 #888a85
+#define C_FOOTERBG #404a68
-#define C_BLACK #2e3436
+
-#define C_BLACK2 #555753
+#define C_HEADERFG #fefefe
-#define C_RED1 #cc0000
+#define C_BODYFG #050403
-#define C_RED2 #a40000
+#define C_FOOTERFG #9a93b7
-#define C_GRN1 #73d216
+#define C_BLEAKFG #9a93b7
-#define C_GRN2 #4e9a06
+
-#define C_YEL1 #edd400
+#define C_DLINK #221f31
-#define C_YEL2 #c4a000
+#define C_LINK #404a68
-#define C_BLU1 #3465a4
+#define C_VISLINK #678fcb
-#define C_BLU2 #204a87 
+#define C_FOOTLINK #9a93b7
+
+#define C_DBORDER #404a68
+#define C_LBORDER #9a93b7
+
+#define C_DERR #a14d3f
+#define C_LERR #ea9182
+#define C_DINF #221f31
+#define C_LINF #8be1e0
+#define C_DWRN #9b6e2d
+#define C_LWRN #f5ee9b
 
 @font-face {
 	font-family: "Xolonium";
@@ -23,24 +33,17 @@ html {
 }
 
 body {
-	background: C_WHITE;
+	background: C_BODYBG;
-	color:C_BLACK;
+	color:C_BODYFG;
 	min-height: 100%;
 	margin: 0;
 }
 
-body a, body a:visited {
-	color: C_BLU2;
-}
-
-body a:visited {
-	color: C_BLU1;
-}
 
 blockquote {
 	margin: 6pt;
 	padding-inline: 1em;
-	border-inline-start: 4px solid C_GRAY2;
+	border-inline-start: 4px solid C_LBORDER;
 }
 
 p {
@@ -49,18 +52,18 @@ p {
 
 table {
 	background: #fefefe;
-	border: 2px solid C_GRAY2;
+	border: 2px solid C_LBORDER;
 	border-collapse: collapse;
 }
 
 th, td {
-    border: 1px solid C_GRAY1;
+    border: 1px solid C_DBORDER;
     padding: 4pt;
 }
 
 .header {
-	background: C_BLACK2;
+	background: C_HEADERBG;
-	color: C_WHITE;
+	color: C_HEADERFG;
 	font-family: sans-serif;
 	min-height: 1px;
 	padding-block: 1em;
@@ -68,7 +71,7 @@ th, td {
 }
 
 .header a, .header a:visited {
-	color: C_WHITE;
+	color: C_HEADERFG;
 }
 
 .header h2, .header h3 {
@@ -76,8 +79,8 @@ th, td {
 }
 
 .footer {
-	background: C_GRAY3;
+	background: C_FOOTERBG;
-	color: C_BLACK;
+	color: C_FOOTERFG;
 	text-align: center;
 	font-family: sans-serif;
 	font-size: 0.8em;
@@ -85,15 +88,23 @@ th, td {
 }
 
 .footer a, .footer a:visited {
-	color: C_BLACK2;
+	color: C_FOOTLINK;
 }
 
 .content {
 	margin: 0 6pt;
-	color: C_BLACK;
+	color: C_BODYFG;
 	font-family: serif;
 }
 
+.content a, .content a:visited {
+	color: C_LINK;
+}
+
+.content a:focus, .content a:hover {
+	color: C_DLINK;
+}
+
 .info, .warning, .error {
 	margin: 6pt;
 	padding-inline-start: 0.5em;
@@ -120,24 +131,26 @@ th, td {
 }
 
 .info {
-	border-inline-start: 4px solid C_GRN1;
+	border-inline-start: 4px solid C_DINF;
-	color: C_GRN2;
+	background: C_LINF;
+	color: C_DINF;
 }
 
 .warning {
-	border-inline-start: 4px solid C_YEL1;
+	border-inline-start: 4px solid C_DWRN;
-	color: C_YEL2;
+	background: C_LWRN;
+	color: C_DWRN;
 }
 
 .error {
-	border-inline-start: 4px solid C_RED1;
+	border-inline-start: 4px solid C_DERR;
-	color: C_RED2;
+	background: C_LERR;
+	color: C_DERR;
 }
 
 .spoiler {
-	border-inline-start: 4px solid C_BLACK2;
+	border-inline-start: 4px solid C_DBORDER;
-	background: C_GRAY2;
+	color:;
-	color:C_BLACK2;
 	visibility: hidden;
 }
 
@@ -158,10 +171,10 @@ th, td {
 
 @media screen and (min-width:720pt) {
 	html {
-		background:C_GRAY1;
+		background:C_PAGEBG;
 	}
 	body {
-		box-shadow: 0 0 0 1px C_GRAY2;
+		box-shadow: 0 0 0 1px C_LBORDER;
 		max-width: 720pt;
 		margin: auto;
 	}