From 0434228997e9fc767fe7af81874369efb7210104 Mon Sep 17 00:00:00 2001 From: Rahul Bajaj Date: Oct 21 2016 09:58:59 +0000 Subject: [PATCH 1/2] Fix mixed content blocked --- diff --git a/doc/_static/fonts.css b/doc/_static/fonts.css new file mode 100644 index 0000000..e96b0f3 --- /dev/null +++ b/doc/_static/fonts.css @@ -0,0 +1,40 @@ +h1 { + font-family: Helvetica Neue; + font-size: 24px; + font-style: normal; + font-variant: normal; + font-weight: 700; + line-height: 38.4px; +} +h3 { + font-family: Helvetica Neue; + font-size: 14px; + font-style: normal; + font-variant: normal; + font-weight: 700; + line-height: 22.4px; +} +p { + font-family: Cantarell, Arial; + font-size: 15px; + font-style: normal; + font-variant: normal; + font-weight: 400; + line-height: 18px; +} +blockquote { + font-family: sans-serif; + font-size: 21px; + font-style: normal; + font-variant: normal; + font-weight: 400; + line-height: 25.2px; +} +pre { + font-family: Helvetica Neue; + font-size: 14px; + font-style: normal; + font-variant: normal; + font-weight: 400; + line-height: 16.8px; +} diff --git a/doc/_static/site.css b/doc/_static/site.css index 44dc318..1cc5397 100644 --- a/doc/_static/site.css +++ b/doc/_static/site.css @@ -1,5 +1,5 @@ @import url("cloud.css"); -@import url("http://fonts.googleapis.com/css?family=Comfortaa"); +@import url("fonts.css"); .pagure-logo span { background: url("pagure.png") no-repeat scroll 50% 0 transparent; diff --git a/doc/conf.py b/doc/conf.py index 52be776..1eac5b4 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -155,6 +155,8 @@ html_theme_options = { "codetrimcolor": "#79db32", # First Green "footerbgcolor": "#FEFEFE", + + "fontcssurl": "{% _static 'site.css' %}", } # Add any paths that contain custom themes here, relative to this directory. #html_theme_path = [] From d2458214c36fecf0185a5dbc468ff81c2684b881 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Oct 21 2016 09:58:59 +0000 Subject: [PATCH 2/2] Fix pointing to the site.css for the fonts --- diff --git a/doc/conf.py b/doc/conf.py index 1eac5b4..9af8e95 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -156,7 +156,7 @@ html_theme_options = { "footerbgcolor": "#FEFEFE", - "fontcssurl": "{% _static 'site.css' %}", + "fontcssurl": "_static/site.css" } # Add any paths that contain custom themes here, relative to this directory. #html_theme_path = []