merge HEAD

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>

diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 5cb9ee205d2fc52c696b9a8565e452abea7a0576..efb00776a2ab3ae165a27a78459b2b5c68f68916 100644 (file)
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -549,4 +549,5 @@ footer{display:block;clear:both;text-align:center;}
 #sidebar-page-list ul{padding:0;margin:5px 0;}
 #sidebar-page-list li{list-style:none;}
 #jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;}
+#fancybox-content{color:#111;}
 @media handheld and screen{body{font-size:15pt;}}@media only screen and (min-device-width:320px) and (max-device-width:480px){body{font-size:12pt;}}@media only screen and (min-width:321px){body{font-size:12pt;}}@media only screen and (max-width:320px){body{font-size:12pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:landscape){body{font-size:14pt;}}@media only screen and (min-device-width:768px) and (max-device-width:1024px) and (orientation:portrait){body{font-size:14pt;}}@media only screen and (min-width:1024px){body{font-size:14pt;}}@media only screen and (min-width:1520px){body{font-size:16pt;}}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min-device-pixel-ratio:1.5){body{font-size:14pt;}}

diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index d7becbedb8dc691beacb9922c3715276fc532a15..9d17abdd15201176ca247c077c0ebffc8d98d656 100644 (file)
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -3230,4 +3230,8 @@ footer {
     z-index: 999;
 }
 
+#fancybox-content {
+       color: #111;
+}
+
 @import "../css/media";