Merge pull request #13 from nathan-pmt/master

Allow both http and https sites to pull fonts without mixed content warnings
This commit is contained in:
Tsachi Shlidor
2015-08-06 17:13:36 +03:00
2 changed files with 2 additions and 2 deletions

View File

@@ -2,7 +2,7 @@
@import url(../../../stylesheets/application.css);
// Open Sans
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800);
@import url(//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800);
$gray-dark: #202020;
$gray-text: #484848;

View File

@@ -1,5 +1,5 @@
@import url(../../../stylesheets/application.css);
@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800);
@import url(//fonts.googleapis.com/css?family=Open+Sans:400,300,600,700,800);
/* load the default Redmine stylesheet */
.input_tiny {
width: 50px;