merge HEAD

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
This commit is contained in:
Simon L'nu 2012-10-15 22:48:25 -04:00
parent 80513e4332
commit 2c15bdd99e
2 changed files with 5 additions and 0 deletions

View file

@ -549,4 +549,5 @@ footer{display:block;clear:both;text-align:center;}
#sidebar-page-list ul{padding:0;margin:5px 0;} #sidebar-page-list ul{padding:0;margin:5px 0;}
#sidebar-page-list li{list-style:none;} #sidebar-page-list li{list-style:none;}
#jappix_mini{margin-left:130px;position:fixed;bottom:0;right:175px !important;z-index:999;} #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;}} @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;}}

View file

@ -3230,4 +3230,8 @@ footer {
z-index: 999; z-index: 999;
} }
#fancybox-content {
color: #111;
}
@import "../css/media"; @import "../css/media";