Skip to content

E
edx-ora2
Commit a06315c3 by Will Daly
Options

Merge pull request #238 from edx/will/protocol-neutral-font-url 

Make Google font URLs work under HTTPS
parents cbcb83bc ecd1023d
Showing with 2 additions and 2 deletions
apps/openassessment/xblock/static/css/openassessment.css
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700);
@import url(//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700);
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
......
apps/openassessment/xblock/static/sass/themes/edx/_assets.scss
......@@ -8,7 +8,7 @@
// --------------------
// font: Open Sans - http://www.google.com/fonts/specimen/Open+Sans
// --------------------
@import url(http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700);
@import url(//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,400,300,600,700);
// --------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment