Merge branch 'master' of https://github.com/mumuy/relationship

index.html

@@ -231,8 +231,8 @@
 								<p><span>本程序算法已开源，使用请尊重版权保留出处信息</span></p>
 								<p><span>程序持续更新，如发现错漏可在此</span><a class="text-red" href="https://github.com/mumuy/relationship/issues" rel="nofollow" target="_blank">反馈问题</a></p>
 								<p class="buttons">
-									<a class="github-button" href="https://github.com/mumuy" data-style="mega" data-count-href="/mumuy/followers" data-count-api="/users/mumuy#followers" data-count-aria-label="# followers on GitHub" aria-label="Follow @mumuy on GitHub" rel="nofollow">Follow @mumuy</a>
+									<a class="github-button" href="https://github.com/mumuy" data-color-scheme="no-preference: light; light: light; dark: dark;" data-size="large" aria-label="Follow @mumuy on GitHub">Follow @mumuy</a>
-									<a class="github-button" href="https://github.com/mumuy/relationship" data-style="mega" data-count-href="/mumuy/relationship/stargazers" data-count-api="/repos/mumuy/relationship#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star mumuy/relationship on GitHub" rel="nofollow">Star</a>
+									<a class="github-button" href="https://github.com/mumuy/relationship" data-color-scheme="no-preference: light; light: light; dark: dark;" data-icon="octicon-star" data-size="large" data-show-count="true" aria-label="Star mumuy/relationship on GitHub">Star</a>
 								</p>
 								<p>&copy; <a href="http://passer-by.com">passer-by.com</a></p>
 							</div>

script/relationship.js

@@ -449,12 +449,12 @@
         'f,f,m,xs,d,d':['从母姑表姑母'],
         'f,f,m,xs,d,d,h':['从母姑表姑父'],
         // 从父*
-        'f,f,ob':['伯公','伯祖','伯翁','伯爷','伯祖父','伯老爷','大爷爷','大爷','堂祖父','伯爷爷'],
+        'f,f,ob':['伯公','伯祖','伯翁','伯爷','伯祖父','伯老爷','大爷爷','大爷','大公','堂祖父','伯爷爷'],
         'f,f,ob,w':['伯婆','伯祖母','伯奶奶','大奶奶','堂祖母','姆婆'],
         'f,f,lb':['叔公','叔祖','叔翁','叔爷','叔祖父','叔老爷','小爷爷','堂祖父','叔爷爷','叔奶爷'],
         'f,f,lb,w':['叔婆','叔祖母','叔奶奶','小奶奶','堂祖母','婶婆'],
-        'f,f,xb':['堂祖父','从祖祖父','从祖父','x爷爷','x大爷'],
+        'f,f,xb':['堂祖父','从祖祖父','从祖父','x爷爷','x大爷','x爷','x公'],
-        'f,f,xb,w':['堂祖母','从祖祖母','从祖母','x奶奶','x大娘'],
+        'f,f,xb,w':['堂祖母','从祖祖母','从祖母','x奶奶','x大娘','x奶','x婆'],
         // 再从父
         'f,f,xb,s&o':['堂伯','堂伯父','从父伯父','叔伯伯'],
         'f,f,xb,s&o,w':['堂伯母','从父伯母'],
@@ -548,7 +548,7 @@
         'f,f,xs,d,d,d,h':['堂姑表表甥婿','姑表姑表甥婿'],
         // 奶奶
         'f,m':['奶奶','祖母','阿嫲','阿嬷','嫲嫲'],
-        'f,m,f':['曾外祖父','太外公','太姥爷'],
+        'f,m,f':['曾外祖父','太外公','太姥爷','老外公'],
         'f,m,f,f':['曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'],
         'f,m,f,m':['曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'],
         // 从父*
@@ -595,7 +595,7 @@
         'f,m,f,xs,d,s&l,w':['姑表姨表叔母'],
         'f,m,f,xs,d,d':['姑表姨表姑母'],
         'f,m,f,xs,d,d,h':['姑表姨表姑父'],
-        'f,m,m':['曾外祖母','太外婆','太姥姥'],
+        'f,m,m':['曾外祖母','太外婆','太姥姥','老外婆','老外奶'],
         'f,m,m,f':['曾外曾外祖父','祖太姥爷','祖太公','高王父'],
         'f,m,m,m':['曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'],
         // 舅表*
@@ -642,7 +642,7 @@
         'f,m,m,xs,d,d,h':['再从母姑父'],
         // 舅表*
         'f,m,xb':['舅公','舅祖父','舅老爷','舅爷爷','舅爷','舅祖','舅奶爷','舅爹','太舅父','x舅老爷','x舅公'],
-        'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','妗奶','太舅母'],
+        'f,m,xb,w':['舅婆','舅祖母','舅奶奶','舅奶','妗婆','妗奶','太舅母','x舅婆'],
         // 舅表叔表
         'f,m,xb,s&o':['舅表伯父','舅表伯'],
         'f,m,xb,s&o,w':['舅表伯母'],
@@ -982,7 +982,7 @@
         'm,f,lb':['外叔公','叔外祖父','外叔祖父','叔姥爷','外叔祖','叔外祖','小外公','小姥爷','小外爷'],
         'm,f,lb,w':['外叔婆','叔外祖母','外叔祖母','叔姥姥','外婶婆','小外婆','小姥姥','小姥奶'],
         'm,f,xb':['x外公','x姥爷','x外爷'],
-        'm,f,xb,w':['x外婆','x姥姥','x姥奶'],
+        'm,f,xb,w':['x外婆','x姥姥','x姥奶','x外奶','x姥'],
         // 从父舅表
         'm,f,xb,s':['堂舅','堂舅爸','堂舅父','堂舅舅','从父舅父','叔伯舅父','叔伯舅'],
         'm,f,xb,s,w':['堂舅妈','堂舅母','从父舅母','叔伯舅母'],
@@ -1063,8 +1063,8 @@
         'm,f,xs,d,d,d':['姑表姨表甥女'],
         'm,f,xs,d,d,d,h':['姑表姨表甥婿'],
         // 外婆
-        'm,m':['外婆','外祖母','外王母','阿婆','姥姥','客婆','毑母','毑毑'],
+        'm,m':['外婆','外祖母','外王母','阿婆','外奶','姥姥','姥娘','客婆','毑母','毑毑'],
-        'm,m,f':['外曾外祖父','外太外公','外太姥爷','外太外翁'],
+        'm,m,f':['外曾外祖父','外太外公','外太姥爷','外太外翁','老姥爷'],
         'm,m,f,f':['外曾外曾祖父','祖太爷','祖太爷爷','祖太公','高王父'],
         'm,m,f,m':['外曾外曾祖母','祖太太','祖太奶奶','祖太婆','高王母'],
         // 从父*
@@ -1103,7 +1103,7 @@
         'm,m,f,xs,d,s,w':['姑表姨表舅母'],
         'm,m,f,xs,d,d':['姑表姨表姨母'],
         'm,m,f,xs,d,d,h':['姑表姨表姨父'],
-        'm,m,m':['外曾外祖母','外太外婆','外太姥姥','外太外姆'],
+        'm,m,m':['外曾外祖母','外太外婆','外太姥姥','外太外姆','老姥娘'],
         'm,m,m,f':['外曾外曾外祖父','祖太姥爷','祖太公','高王父'],
         'm,m,m,m':['外曾外曾外祖母','祖太姥姥','祖太姥娘','祖太婆','高王母'],
         // 舅表*
@@ -1149,8 +1149,8 @@
         'm,m,m,xs,d,d,d&l':['三从母妹'],
         'm,m,m,xs,d,d,d&l,h':['三从母妹夫'],
         // 舅表*
-        'm,m,xb':['外舅公','外舅祖父','外太舅父','舅外祖父','外祖舅父','舅姥爷','舅爹','舅外公','舅公','x舅姥爷'],
+        'm,m,xb':['外舅公','外舅祖父','外太舅父','舅外祖父','外祖舅父','舅外公','舅外爷','舅姥爷','舅爹','舅公','x舅姥爷'],
-        'm,m,xb,w':['外舅婆','外舅祖母','外太舅母','舅外祖母','外祖舅母','舅姥姥','舅婆','外妗婆'],
+        'm,m,xb,w':['外舅婆','外舅祖母','外太舅母','舅外祖母','外祖舅母','舅外婆','舅外奶','舅姥姥','舅姥','舅婆','妗姥姥','妗姥娘','妗姥','外妗婆','x舅姥姥'],
         // 舅表舅表
         'm,m,xb,s':['舅表舅父','舅表舅爸','舅表舅','舅表舅舅'],
         'm,m,xb,s,w':['舅表舅母','舅表舅妈'],
@@ -1190,8 +1190,8 @@
         'm,m,xb,d,d,d':['舅表姨表甥女'],
         'm,m,xb,d,d,d,h':['舅表姨表甥婿'],
         // 从母*
-        'm,m,xs':['外姨婆','姨外祖母','姨姥姥','外姨祖母','从母姨外祖母'],
+        'm,m,xs':['外姨婆','姨外祖母','姨外婆','姨外奶','姨姥姥','姨姥','外姨祖母','从母姨外祖母'],
-        'm,m,xs,h':['外姨公','姨外祖父','姨姥爷','外姨祖父','从母姨外祖父'],
+        'm,m,xs,h':['外姨公','姨外祖父','姨外公','姨外公','姨姥爷','外姨祖父','从母姨外祖父'],
         // 从母舅表
         'm,m,xs,s':['姨舅父','姨舅爸','姨舅','从母舅父'],
         'm,m,xs,s,w':['姨舅母','从母舅母'],
@@ -2272,8 +2272,8 @@
         's,w,f&o':['男眷兄','息眷兄'],
         's,w,f&l':['男眷弟','息眷弟'],
         's,w,f,f':['男眷父','太姻翁'],
-        's,w,f,f,f':['老太姻翁'],
+        's,w,f,f,f':['男眷祖父','老太姻翁'],
-        's,w,f,f,m':['老太姻姆'],
+        's,w,f,f,m':['男眷祖母','老太姻姆'],
         's,w,f,f,ob':['男眷伯父','男姻伯翁'],
         's,w,f,f,ob,w':['男眷伯母','男姻伯姆'],
         's,w,f,f,lb':['男眷叔父','男姻叔翁'],
@@ -2291,8 +2291,8 @@
         's,w,f,f,xb,d,s':['男眷甥男'],
         's,w,f,f,xb,d,d':['男眷甥女'],
         's,w,f,m':['男眷母','太姻姆'],
-        's,w,f,m,f':['老太姻翁'],
+        's,w,f,m,f':['男眷外祖父','老太姻翁'],
-        's,w,f,m,m':['老太姻姆'],
+        's,w,f,m,m':['男眷外祖母','老太姻姆'],
         's,w,f,ob':['男眷叔兄'],
         's,w,f,ob,w':['男眷叔兄妇'],
         's,w,f,lb':['男眷叔弟'],
@@ -2338,8 +2338,8 @@
         'd,h,f&o':['女姻兄','息姻兄'],
         'd,h,f&l':['女姻弟','息姻弟'],
         'd,h,f,f':['女姻父','太姻翁'],
-        'd,h,f,f,f':['老太姻翁'],
+        'd,h,f,f,f':['女姻祖父','老太姻翁'],
-        'd,h,f,f,m':['老太姻姆'],
+        'd,h,f,f,m':['女姻祖母','老太姻姆'],
         'd,h,f,f,ob':['女姻伯父','女姻伯翁'],
         'd,h,f,f,ob,w':['女姻伯母','女姻伯姆'],
         'd,h,f,f,lb':['女姻叔父','女姻叔翁'],
@@ -2357,8 +2357,8 @@
         'd,h,f,f,xb,d,s':['女姻甥男'],
         'd,h,f,f,xb,d,d':['女姻甥女'],
         'd,h,f,m':['女姻母','太姻姆'],
-        'd,h,f,m,f':['老太姻翁'],
+        'd,h,f,m,f':['女姻外祖父','老太姻翁'],
-        'd,h,f,m,m':['老太姻姆'],
+        'd,h,f,m,m':['女姻外祖母','老太姻姆'],
         'd,h,f,ob':['女姻叔兄'],
         'd,h,f,ob,w':['女姻叔兄妇'],
         'd,h,f,lb':['女姻叔弟'],

style/index.css

@@ -34,7 +34,7 @@ a:hover{
 }
 
 .mod-head .hd,.mod-head .bd{
-    max-width: 500px;
+    max-width: 540px;
     padding: 0 10px;
 	margin:0 auto;
 }
@@ -95,8 +95,9 @@ a:hover{
 }
 .mod-panel h1{
 	line-height: 32px;
-	font-size: 24px;
+    font-weight: 500;
-	color:#212121;
+    font-size: 22px;
+    color:#333;
 }
 .mod-panel h2{
     line-height: 30px;
@@ -105,7 +106,7 @@ a:hover{
     font-size: 18px;
 }
 .mod-panel .hd,.mod-panel .bd{
-    max-width: 500px;
+    max-width: 540px;
 	margin:0 auto;
 }
 .mod-panel .hd{
@@ -178,7 +179,7 @@ a:hover{
 	display: inline-block;
     width: 100%;
     height: 30px;
-    background: #f8f8f8;
+    background: #fafafa;
     border: 1px solid #e8e8e8;
     padding: 5px 10px;
 	box-sizing: border-box;
@@ -196,7 +197,7 @@ a:hover{
     border: medium none;
     line-height: 30px;
     vertical-align: middle;
-    font-size: 16px;
+    font-size: 15px;
     color: #333333;
     cursor: pointer;
     outline: none;
@@ -239,8 +240,8 @@ a:hover{
 	width: 100%;
 	height: 120px;
 	padding:5px 10px;
-	background: #f8f8f8;
+	background: #fafafa;
-	border: 1px solid #e8e8e8;
+	border: 1px solid #e9e9e9;
 	box-sizing: border-box;
 	border-radius: 5px;
 	resize: none;
@@ -285,28 +286,28 @@ a:hover{
 .mod-panel .intro,.mod-panel .article{
     padding:  10px 20px;
     margin: 10px 0;
-    background: #f5f5f6;
+    background: rgb(246, 248, 250);
     border-radius: 6px;
+    color: rgb(110, 119, 129);
 }
 .mod-panel .intro h3{
     margin-bottom: 10px;
     font-size: 16px;
     font-weight: bold;
+    color: rgba(36, 41, 47, 0.8);
 }
 .mod-panel .intro p{
     line-height: 22px;
 }
-.mod-panel .intro p.q{
-    margin-top: 10px;
-    font-weight: bold;
-}
-.mod-panel .intro p.a{
-    color: #666;
-}
 .mod-panel .article p{
     line-height: 22px;
     text-indent: 2em;
 }
+.mod-panel .intro p.q{
+    margin-top: 10px;
+    font-weight: bold;
+    color: rgba(36, 41, 47, 0.8);
+}
 .mod-panel .table-inner{
     overflow-x: auto;
 }