Merge pull request #3 from yaymining/master

Unmix http/https content
pull/6/head
fancoder 2014-08-13 13:12:12 +04:00
commit cd9527aec7
2 changed files with 3 additions and 3 deletions

View File

@ -1,5 +1,5 @@
@import url(http://fonts.googleapis.com/css?family=Roboto+Condensed:400,700);
@import url(http://fonts.googleapis.com/css?family=Roboto:400,300,500);
@import url(//fonts.googleapis.com/css?family=Roboto+Condensed:400,700);
@import url(//fonts.googleapis.com/css?family=Roboto:400,300,500);
/* Insert your pool's unique css here */
.marketRate {
display: none;

View File

@ -16,7 +16,7 @@
<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
<link href="//fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet" type="text/css">
<script src="config.js"></script>
<script src="custom.js"></script>