#5 small adjustment

ethantw · Dec 5, 2013 · 45b267a · 45b267a
1 parent b22a178
commit 45b267a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/css/han.css b/css/han.css
@@ -2152,7 +2152,13 @@ hruby {
     top: auto;
     margin-left: -0.3em;
     line-height: 1; }
-  hruby[generic="sans-serif"] rb[yin]:before {
+  hruby[generic] rb[yin]:after {
+    font-family: "Zhuyin Kaiti", cursive, serif; }
+  hruby[generic="sans-serif"] rb[yin]:before,
+  hruby[generic="sans-serif"] rb[diao^="ㆴ"]:after,
+  hruby[generic="sans-serif"] rb[diao^="ㆵ"]:after,
+  hruby[generic="sans-serif"] rb[diao^="ㆶ"]:after,
+  hruby[generic="sans-serif"] rb[diao^="ㆷ"]:after {
     font-family: "Zhuyin Heiti", sans-serif; }
   hruby[generic="serif"] rb[yin]:before {
     font-family: "Zhuyin Kaiti", cursive, serif; }
@@ -2195,8 +2201,7 @@ hruby {
     hruby rb[zhuyin][diao]:after {
       right: -0.6em;
       width: 1em;
-      content: attr(diao);
-      font-family: "Zhuyin Kaiti", cursive, serif !important; }
+      content: attr(diao); }
     hruby rb[zhuyin][length="1"]:before {
       margin-top: 0.25em; }
     hruby rb[zhuyin][length="1"]:after {

diff --git a/sass/han/_hruby.sass b/sass/han/_hruby.sass
@@ -119,8 +119,18 @@ hruby
 	   Define Zhuyin font according to
 	   its parental generic family */
 
-	&[generic="sans-serif"] rb[yin]:before 
-		font-family: 'Zhuyin Heiti', sans-serif
+	&[generic] 
+		rb[yin]:after
+			//// 非入聲韻調號強制使用「Zhuyin Kaiti」以利定位
+			font-family: 'Zhuyin Kaiti', cursive, serif
+
+	&[generic="sans-serif"]
+		rb[yin]:before, 
+		rb[diao^="ㆴ"]:after,
+		rb[diao^="ㆵ"]:after,
+		rb[diao^="ㆶ"]:after,
+		rb[diao^="ㆷ"]:after
+			font-family: 'Zhuyin Heiti', sans-serif
 
 	&[generic="serif"] rb[yin]:before 
 		font-family: 'Zhuyin Kaiti', cursive, serif
@@ -175,8 +185,6 @@ hruby
 
 			// typo
 			content: attr(diao)
-			//// 調號強制使用「Zhuyin Kaiti」以利定位
-			font-family: 'Zhuyin Kaiti', cursive, serif !important
 
 
 		/*
@@ -250,3 +258,4 @@ hruby
 
 
 
+